You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/12/09 04:13:22 UTC
[01/28] juddi git commit: NOJIRA adding jUDDI logos by Kim Wood
Repository: juddi
Updated Branches:
refs/heads/master 63d53d086 -> 4429dadd5
NOJIRA adding jUDDI logos by Kim Wood
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/fd1ac2c0
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/fd1ac2c0
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/fd1ac2c0
Branch: refs/heads/master
Commit: fd1ac2c002e28fb94119c43634df30c3e4c303dc
Parents: 197e1d1
Author: alexoree <al...@apache.org>
Authored: Thu Nov 13 20:39:07 2014 -0500
Committer: alexoree <al...@apache.org>
Committed: Thu Nov 13 20:39:07 2014 -0500
----------------------------------------------------------------------
misc/jUDDI by Kim Wood 300x300ish.png | Bin 0 -> 63647 bytes
misc/jUDDI by Kim Wood.png | Bin 0 -> 264196 bytes
misc/jUDDI_for black bkgd by Kim Wood.png | Bin 0 -> 248617 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/fd1ac2c0/misc/jUDDI by Kim Wood 300x300ish.png
----------------------------------------------------------------------
diff --git a/misc/jUDDI by Kim Wood 300x300ish.png b/misc/jUDDI by Kim Wood 300x300ish.png
new file mode 100644
index 0000000..1439a76
Binary files /dev/null and b/misc/jUDDI by Kim Wood 300x300ish.png differ
http://git-wip-us.apache.org/repos/asf/juddi/blob/fd1ac2c0/misc/jUDDI by Kim Wood.png
----------------------------------------------------------------------
diff --git a/misc/jUDDI by Kim Wood.png b/misc/jUDDI by Kim Wood.png
new file mode 100644
index 0000000..ee097e2
Binary files /dev/null and b/misc/jUDDI by Kim Wood.png differ
http://git-wip-us.apache.org/repos/asf/juddi/blob/fd1ac2c0/misc/jUDDI_for black bkgd by Kim Wood.png
----------------------------------------------------------------------
diff --git a/misc/jUDDI_for black bkgd by Kim Wood.png b/misc/jUDDI_for black bkgd by Kim Wood.png
new file mode 100644
index 0000000..6e34ba6
Binary files /dev/null and b/misc/jUDDI_for black bkgd by Kim Wood.png differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[13/28] juddi git commit: JUDDI-241 juddi-tomcat now build's two
tomcat servers,
one configured as "node2" and one as "node1". additional features for the CLI
client to help make setting up the replication config easier
Posted by al...@apache.org.
JUDDI-241 juddi-tomcat now build's two tomcat servers, one configured as "node2" and one as "node1". additional features for the CLI client to help make setting up the replication config easier
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/03dce361
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/03dce361
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/03dce361
Branch: refs/heads/master
Commit: 03dce361e8c06a036cd1a5534a1f0a105e615b3d
Parents: a975954
Author: Alex <al...@apache.org>
Authored: Sun Nov 16 13:16:11 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sun Nov 16 13:16:11 2014 -0500
----------------------------------------------------------------------
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 12 +-
.../juddi/replication/ReplicationNotifier.java | 1 +
.../org/apache/juddi/samples/EntryPoint.java | 5 +
.../apache/juddi/samples/JuddiAdminService.java | 143 ++++++++++++++++++-
juddi-tomcat/build.xml | 11 +-
juddi-tomcat/juddiv3Node2.xml | 4 +-
juddi-tomcat/pom.xml | 4 +-
.../WEB-INF/classes/META-INF/persistence.xml | 91 ++++++------
.../WEB-INF/classes/META-INF/persistence.xml | 90 ++++++------
.../WEB-INF/classes/META-INF/persistence.xml | 91 ++++++------
.../WEB-INF/classes/META-INF/persistence.xml | 4 -
juddiv3-war/src/main/webapp/index.jsp | 27 +++-
12 files changed, 329 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index e2b9dc5..268616e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -1335,9 +1335,9 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
sql.toString();
Query qry = em.createQuery(sql.toString());
qry.setMaxResults(1);
+
org.apache.juddi.model.ReplicationConfiguration resultList = (org.apache.juddi.model.ReplicationConfiguration) qry.getSingleResult();
MappingModelToApi.mapReplicationConfiguration(resultList, r);
-
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
@@ -1347,7 +1347,15 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
QueryStatus.FAILED, procTime);
throw drfm;
- } finally {
+ } catch (Exception ex){
+ //possible that there is no config to return
+ r.setCommunicationGraph(null);
+ logger.warn("Error caught, is there a replication config is avaiable?", ex);
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(JUDDIQuery.GET_REPLICATION_NODES,
+ QueryStatus.FAILED, procTime);
+
+ }finally {
if (tx.isActive()) {
tx.rollback();
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
index 15b16ab..e2e11ca 100644
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
@@ -168,6 +168,7 @@ public class ReplicationNotifier extends TimerTask {
if (queue == null) {
queue = new ConcurrentLinkedQueue();
}
+ //TODO check for replication config changes
while (!queue.isEmpty()) {
//for each change at this node
log.info("Replication, Notifying nodes of new change records. " + queue.size() + " remaining");
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
index d9a86cf..2f9f032 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
@@ -72,6 +72,7 @@ public class EntryPoint {
System.out.println("34) View all registered remote nodes on a jUDDI server");
System.out.println("35) View all registered nodes for this client");
System.out.println("36) UnRegister a node on a jUDDI server");
+ System.out.println("37) Fetch the replication config from a jUDDI server");
System.out.println("q) quit");
System.out.print("Selection: ");
@@ -408,8 +409,12 @@ public class EntryPoint {
}
if (input.equals("36")) {
+ new JuddiAdminService().viewRemoveRemoteNode(authtoken);
//System.out.println("35) UnRegister a node on a jUDDI server");
}
+ if (input.equals("37")){
+ new JuddiAdminService().viewReplicationConfig(authtoken);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
index 2ffa170..f87c637 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
@@ -19,6 +19,7 @@ import java.rmi.RemoteException;
import java.util.List;
import javax.xml.bind.JAXB;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.api_v3.DeleteNode;
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.api_v3.NodeDetail;
import org.apache.juddi.api_v3.NodeList;
@@ -32,7 +33,10 @@ import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetAuthToken;
+import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -110,7 +114,7 @@ public class JuddiAdminService {
List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
System.out.println();
- System.out.println("Select a node");
+ System.out.println("Select a node (from *this config)");
for (int i = 0; i < uddiNodeList.size(); i++) {
System.out.print(i + 1);
System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
@@ -150,7 +154,7 @@ public class JuddiAdminService {
}
void registerLocalNodeToRemoteNode(String authtoken, Node cfg, Node publishTo) throws Exception {
-
+
Transport transport = clerkManager.getTransport(publishTo.getName());
JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
@@ -162,4 +166,139 @@ public class JuddiAdminService {
System.out.println("Success.");
}
+
+ void viewReplicationConfig(String authtoken) throws Exception {
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+ System.out.println("Select a node (from *this config)");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.print(i + 1);
+ System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ String node = uddiNodeList.get(index).getName();
+ Transport transport = clerkManager.getTransport(node);
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+ ReplicationConfiguration replicationNodes = juddiApiService.getReplicationNodes(authtoken);
+
+ System.out.println("Current Config:");
+ JAXB.marshal(replicationNodes, System.out);
+
+ }
+
+ void setReplicationConfig(String authtoken) throws Exception {
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+ System.out.println("Select a node (from *this config)");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.print(i + 1);
+ System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ String node = uddiNodeList.get(index).getName();
+ Transport transport = clerkManager.getTransport(node);
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+
+ ReplicationConfiguration replicationNodes = juddiApiService.getReplicationNodes(authtoken);
+
+ String input = "";
+ while (!"d".equalsIgnoreCase(input) && !"q".equalsIgnoreCase(input)) {
+ System.out.println("Current Config:");
+ JAXB.marshal(replicationNodes, System.out);
+ System.out.println("1) Remove a replication node");
+ System.out.println("2) Add a replication node");
+ System.out.println("3) Remove an Edge");
+ System.out.println("4) Add an Edge");
+ System.out.println("5) Set Registry Contact");
+ System.out.println("6) Add Operator info");
+ System.out.println("7) Remove Operator info");
+ input = System.console().readLine();
+ if (input.equalsIgnoreCase("1")) {
+ menu_RemoveReplicationNode(replicationNodes);
+ } else if (input.equalsIgnoreCase("2")) {
+ menu_AddReplicationNode(replicationNodes, juddiApiService, authtoken);
+ }
+
+ }
+ if (input.equalsIgnoreCase("d")) {
+ //save the changes
+ DispositionReport setReplicationNodes = juddiApiService.setReplicationNodes(authtoken, replicationNodes);
+ System.out.println("Saved!, dumping config from the server");
+ replicationNodes = juddiApiService.getReplicationNodes(authtoken);
+ JAXB.marshal(replicationNodes, System.out);
+
+ } else {
+ //quit this sub menu
+ System.out.println("aborting!");
+ }
+
+ }
+
+ void viewRemoveRemoteNode(String authtoken) throws Exception {
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+ System.out.println("Select a node (from *this config)");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.print(i + 1);
+ System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ String node = uddiNodeList.get(index).getName();
+ Transport transport = clerkManager.getTransport(node);
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+
+ NodeList allNodes = juddiApiService.getAllNodes(authtoken);
+ if (allNodes == null || allNodes.getNode().isEmpty()) {
+ System.out.println("No nodes registered!");
+ } else {
+ for (int i = 0; i < allNodes.getNode().size(); i++) {
+ System.out.println("_______________________________________________________________________________");
+ System.out.println("(" + i + ") Name :" + allNodes.getNode().get(i).getName());
+ System.out.println("(" + i + ") Inquiry :" + allNodes.getNode().get(i).getInquiryUrl());
+
+ }
+
+ System.out.println("Node to remove from : ");
+ int nodenum = Integer.parseInt(System.console().readLine());
+ juddiApiService.deleteNode(new DeleteNode(authtoken, allNodes.getNode().get(nodenum).getName()));
+
+ }
+ }
+
+ private void menu_RemoveReplicationNode(ReplicationConfiguration replicationNodes) {
+ if (replicationNodes.getCommunicationGraph() == null) {
+ replicationNodes.setCommunicationGraph(new CommunicationGraph());
+ }
+ for (int i = 0; i < replicationNodes.getCommunicationGraph().getNode().size(); i++) {
+ System.out.println((i + 1) + ") " + replicationNodes.getCommunicationGraph().getNode().get(i));
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ replicationNodes.getCommunicationGraph().getNode().remove(index);
+
+ }
+
+ private void menu_AddReplicationNode(ReplicationConfiguration replicationNodes, JUDDIApiPortType juddiApiService, String authtoken) throws Exception {
+
+ NodeList allNodes = juddiApiService.getAllNodes(authtoken);
+ if (allNodes == null || allNodes.getNode().isEmpty()) {
+ System.out.println("No nodes registered!");
+ } else {
+ for (int i = 0; i < allNodes.getNode().size(); i++) {
+ System.out.println((i + 1) + ") Name :" + allNodes.getNode().get(i).getName());
+ System.out.println((i + 1) + ") Replication :" + allNodes.getNode().get(i).getReplicationUrl());
+
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ replicationNodes.getCommunicationGraph().getNode().add(allNodes.getNode().get(index).getName());
+ }
+
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-tomcat/build.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index 1f23d6f..836f808 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -54,8 +54,8 @@
<target name="unzip-tomcat2">
<mkdir dir="${basedir}/target/tomcat2"/>
<unzip dest="${basedir}/target/tomcat2" src="${dependency.tomcat.zip}"/>
- <unzip dest="${webapps.dir}/juddiv3" src="${dependency.juddiv3.war}"/>
- <unzip dest="${webapps.dir}/juddi-gui" src="${dependency.juddi-gui.war}"/>
+ <unzip dest="${webapps2.dir}/juddiv3" src="${dependency.juddiv3.war}"/>
+ <unzip dest="${webapps2.dir}/juddi-gui" src="${dependency.juddi-gui.war}"/>
</target>
<target name="copy-resources2" depends="unzip-tomcat2">
@@ -71,6 +71,11 @@
<copy file="${basedir}/juddiv3Node2.xml" tofile="${webapps2.dir}/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true"/>
+ <copy file="${basedir}/juddi_install_data_node2/root_BusinessEntity.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+<copy file="${basedir}/juddi_install_data_node2/root_Publisher.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+<copy file="${basedir}/juddi_install_data_node2/root_tModelKeyGen.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+
+
<copy file="${basedir}/uddiNode2.xml" tofile="${webapps2.dir}/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true"/>
<copy file="${basedir}/serverNode2.xml" tofile="${conf2.dir}/server.xml" overwrite="true"/>
@@ -96,4 +101,6 @@
</chmod>
</target>
+ <target name="twonode" depends="package-tomcat,package-tomcat2"/>
+
</project>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-tomcat/juddiv3Node2.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddiv3Node2.xml b/juddi-tomcat/juddiv3Node2.xml
index 988eb81..ceaa7e7 100644
--- a/juddi-tomcat/juddiv3Node2.xml
+++ b/juddi-tomcat/juddiv3Node2.xml
@@ -26,7 +26,7 @@
<!-- this is the 'root' username, or owner of the node -->
<publisher>root</publisher>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
- <businessId>uddi:another.juddi.apache.org:node2</businessId>
+ <businessId>uddi:another.juddi.apache.org:businesses-asf</businessId>
<partition>uddi:another.juddi.apache.org</partition>
</root>
<seed>
@@ -197,4 +197,4 @@
<logInquirySearchPayloads>false</logInquirySearchPayloads>
</logging>
</juddi>
-</config>
\ No newline at end of file
+</config>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddi-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml
index cf23952..2bdda07 100644
--- a/juddi-tomcat/pom.xml
+++ b/juddi-tomcat/pom.xml
@@ -138,8 +138,8 @@
<property name="dependency.jaxws.jar" value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}" />
<ant antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
- <target name="package-tomcat" />
- <target name="package-tomcat2" />
+ <target name="twonode" />
+
</ant>
</tasks>
</configuration>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/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 35d980d..b8cde50 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
@@ -6,47 +6,47 @@
<persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<non-jta-data-source>java:/DefaultDS</non-jta-data-source>
- <!-- entity classes -->
- <class>org.apache.juddi.model.Address</class>
- <class>org.apache.juddi.model.AddressLine</class>
- <class>org.apache.juddi.model.AuthToken</class>
- <class>org.apache.juddi.model.BindingCategoryBag</class>
- <class>org.apache.juddi.model.BindingDescr</class>
- <class>org.apache.juddi.model.BindingTemplate</class>
- <class>org.apache.juddi.model.BusinessCategoryBag</class>
- <class>org.apache.juddi.model.BusinessDescr</class>
- <class>org.apache.juddi.model.BusinessEntity</class>
- <class>org.apache.juddi.model.BusinessIdentifier</class>
- <class>org.apache.juddi.model.BusinessName</class>
- <class>org.apache.juddi.model.BusinessService</class>
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
<class>org.apache.juddi.model.CanonicalizationMethod</class>
<class>org.apache.juddi.model.CategoryBag</class>
<class>org.apache.juddi.model.Clerk</class>
- <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
- <class>org.apache.juddi.model.Contact</class>
- <class>org.apache.juddi.model.ContactDescr</class>
- <class>org.apache.juddi.model.DiscoveryUrl</class>
- <class>org.apache.juddi.model.Email</class>
- <class>org.apache.juddi.model.InstanceDetailsDescr</class>
- <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
- <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
<class>org.apache.juddi.model.KeyedReferenceGroup</class>
<class>org.apache.juddi.model.KeyDataValue</class>
<class>org.apache.juddi.model.KeyInfo</class>
- <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.Node</class>
<class>org.apache.juddi.model.ObjectType</class>
<class>org.apache.juddi.model.ObjectTypeContent</class>
- <class>org.apache.juddi.model.OverviewDoc</class>
- <class>org.apache.juddi.model.OverviewDocDescr</class>
- <class>org.apache.juddi.model.PersonName</class>
- <class>org.apache.juddi.model.Phone</class>
- <class>org.apache.juddi.model.Publisher</class>
- <class>org.apache.juddi.model.PublisherAssertion</class>
- <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
<class>org.apache.juddi.model.Reference</class>
- <class>org.apache.juddi.model.ServiceCategoryBag</class>
- <class>org.apache.juddi.model.ServiceDescr</class>
- <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
<class>org.apache.juddi.model.ServiceProjection</class>
<class>org.apache.juddi.model.ServiceProjectionId</class>
<class>org.apache.juddi.model.Signature</class>
@@ -56,30 +56,27 @@
<class>org.apache.juddi.model.SignatureValue</class>
<class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
- <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
- <class>org.apache.juddi.model.TempKeyPK</class>
- <class>org.apache.juddi.model.Tmodel</class>
- <class>org.apache.juddi.model.TmodelCategoryBag</class>
- <class>org.apache.juddi.model.TmodelDescr</class>
- <class>org.apache.juddi.model.TmodelIdentifier</class>
- <class>org.apache.juddi.model.TmodelInstanceInfo</class>
- <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
- <class>org.apache.juddi.model.TransferToken</class>
- <class>org.apache.juddi.model.TransferTokenKey</class>
- <class>org.apache.juddi.model.UddiEntity</class>
- <class>org.apache.juddi.model.UddiEntityPublisher</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
<class>org.apache.juddi.model.ValueSetValues</class>
<class>org.apache.juddi.model.ChangeRecord</class>
- <class>org.apache.juddi.model.CommunicationGraph</class>
<class>org.apache.juddi.model.Operator</class>
<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.ReplicationMessage</class>
-
<properties>
<property name="hibernate.archive.autodetection" value="class"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/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 0033ed2..70cde98 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
@@ -7,47 +7,47 @@
<persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
- <!-- entity classes -->
- <class>org.apache.juddi.model.Address</class>
- <class>org.apache.juddi.model.AddressLine</class>
- <class>org.apache.juddi.model.AuthToken</class>
- <class>org.apache.juddi.model.BindingCategoryBag</class>
- <class>org.apache.juddi.model.BindingDescr</class>
- <class>org.apache.juddi.model.BindingTemplate</class>
- <class>org.apache.juddi.model.BusinessCategoryBag</class>
- <class>org.apache.juddi.model.BusinessDescr</class>
- <class>org.apache.juddi.model.BusinessEntity</class>
- <class>org.apache.juddi.model.BusinessIdentifier</class>
- <class>org.apache.juddi.model.BusinessName</class>
- <class>org.apache.juddi.model.BusinessService</class>
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
<class>org.apache.juddi.model.CanonicalizationMethod</class>
<class>org.apache.juddi.model.CategoryBag</class>
<class>org.apache.juddi.model.Clerk</class>
- <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
- <class>org.apache.juddi.model.Contact</class>
- <class>org.apache.juddi.model.ContactDescr</class>
- <class>org.apache.juddi.model.DiscoveryUrl</class>
- <class>org.apache.juddi.model.Email</class>
- <class>org.apache.juddi.model.InstanceDetailsDescr</class>
- <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
- <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
<class>org.apache.juddi.model.KeyedReferenceGroup</class>
<class>org.apache.juddi.model.KeyDataValue</class>
<class>org.apache.juddi.model.KeyInfo</class>
- <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.Node</class>
<class>org.apache.juddi.model.ObjectType</class>
<class>org.apache.juddi.model.ObjectTypeContent</class>
- <class>org.apache.juddi.model.OverviewDoc</class>
- <class>org.apache.juddi.model.OverviewDocDescr</class>
- <class>org.apache.juddi.model.PersonName</class>
- <class>org.apache.juddi.model.Phone</class>
- <class>org.apache.juddi.model.Publisher</class>
- <class>org.apache.juddi.model.PublisherAssertion</class>
- <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
<class>org.apache.juddi.model.Reference</class>
- <class>org.apache.juddi.model.ServiceCategoryBag</class>
- <class>org.apache.juddi.model.ServiceDescr</class>
- <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
<class>org.apache.juddi.model.ServiceProjection</class>
<class>org.apache.juddi.model.ServiceProjectionId</class>
<class>org.apache.juddi.model.Signature</class>
@@ -57,29 +57,27 @@
<class>org.apache.juddi.model.SignatureValue</class>
<class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
- <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
- <class>org.apache.juddi.model.TempKeyPK</class>
- <class>org.apache.juddi.model.Tmodel</class>
- <class>org.apache.juddi.model.TmodelCategoryBag</class>
- <class>org.apache.juddi.model.TmodelDescr</class>
- <class>org.apache.juddi.model.TmodelIdentifier</class>
- <class>org.apache.juddi.model.TmodelInstanceInfo</class>
- <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
- <class>org.apache.juddi.model.TransferToken</class>
- <class>org.apache.juddi.model.TransferTokenKey</class>
- <class>org.apache.juddi.model.UddiEntity</class>
- <class>org.apache.juddi.model.UddiEntityPublisher</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
<class>org.apache.juddi.model.ValueSetValues</class>
<class>org.apache.juddi.model.ChangeRecord</class>
- <class>org.apache.juddi.model.CommunicationGraph</class>
<class>org.apache.juddi.model.Operator</class>
<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.ReplicationMessage</class>
<properties>
<property name="hibernate.archive.autodetection" value="class"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/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 24b8a0a..e762ef9 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
@@ -6,47 +6,47 @@
<persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>java:comp/env/jdbc/JuddiDS</jta-data-source>
- <!-- entity classes -->
- <class>org.apache.juddi.model.Address</class>
- <class>org.apache.juddi.model.AddressLine</class>
- <class>org.apache.juddi.model.AuthToken</class>
- <class>org.apache.juddi.model.BindingCategoryBag</class>
- <class>org.apache.juddi.model.BindingDescr</class>
- <class>org.apache.juddi.model.BindingTemplate</class>
- <class>org.apache.juddi.model.BusinessCategoryBag</class>
- <class>org.apache.juddi.model.BusinessDescr</class>
- <class>org.apache.juddi.model.BusinessEntity</class>
- <class>org.apache.juddi.model.BusinessIdentifier</class>
- <class>org.apache.juddi.model.BusinessName</class>
- <class>org.apache.juddi.model.BusinessService</class>
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
<class>org.apache.juddi.model.CanonicalizationMethod</class>
<class>org.apache.juddi.model.CategoryBag</class>
<class>org.apache.juddi.model.Clerk</class>
- <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
- <class>org.apache.juddi.model.Contact</class>
- <class>org.apache.juddi.model.ContactDescr</class>
- <class>org.apache.juddi.model.DiscoveryUrl</class>
- <class>org.apache.juddi.model.Email</class>
- <class>org.apache.juddi.model.InstanceDetailsDescr</class>
- <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
- <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
<class>org.apache.juddi.model.KeyedReferenceGroup</class>
<class>org.apache.juddi.model.KeyDataValue</class>
<class>org.apache.juddi.model.KeyInfo</class>
- <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.Node</class>
<class>org.apache.juddi.model.ObjectType</class>
<class>org.apache.juddi.model.ObjectTypeContent</class>
- <class>org.apache.juddi.model.OverviewDoc</class>
- <class>org.apache.juddi.model.OverviewDocDescr</class>
- <class>org.apache.juddi.model.PersonName</class>
- <class>org.apache.juddi.model.Phone</class>
- <class>org.apache.juddi.model.Publisher</class>
- <class>org.apache.juddi.model.PublisherAssertion</class>
- <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
<class>org.apache.juddi.model.Reference</class>
- <class>org.apache.juddi.model.ServiceCategoryBag</class>
- <class>org.apache.juddi.model.ServiceDescr</class>
- <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
<class>org.apache.juddi.model.ServiceProjection</class>
<class>org.apache.juddi.model.ServiceProjectionId</class>
<class>org.apache.juddi.model.Signature</class>
@@ -56,20 +56,20 @@
<class>org.apache.juddi.model.SignatureValue</class>
<class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
- <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
- <class>org.apache.juddi.model.TempKeyPK</class>
- <class>org.apache.juddi.model.Tmodel</class>
- <class>org.apache.juddi.model.TmodelCategoryBag</class>
- <class>org.apache.juddi.model.TmodelDescr</class>
- <class>org.apache.juddi.model.TmodelIdentifier</class>
- <class>org.apache.juddi.model.TmodelInstanceInfo</class>
- <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
- <class>org.apache.juddi.model.TransferToken</class>
- <class>org.apache.juddi.model.TransferTokenKey</class>
- <class>org.apache.juddi.model.UddiEntity</class>
- <class>org.apache.juddi.model.UddiEntityPublisher</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
<class>org.apache.juddi.model.ValueSetValues</class>
<class>org.apache.juddi.model.ChangeRecord</class>
@@ -78,8 +78,7 @@
<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.ReplicationMessage</class>
-
+
<properties>
<property name="hibernate.archive.autodetection" value="class"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/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 1faa54a..c542732 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
@@ -72,14 +72,10 @@
<class>org.apache.juddi.model.UddiEntityPublisher</class>
<class>org.apache.juddi.model.ValueSetValues</class>
<class>org.apache.juddi.model.ChangeRecord</class>
- <class>org.apache.juddi.model.CommunicationGraph</class>
<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.ReplicationMessage</class>
-
-
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add')"/>
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/03dce361/juddiv3-war/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/index.jsp b/juddiv3-war/src/main/webapp/index.jsp
index 78f552a..649049b 100644
--- a/juddiv3-war/src/main/webapp/index.jsp
+++ b/juddiv3-war/src/main/webapp/index.jsp
@@ -114,7 +114,7 @@
<%
} else {
%>
- <h2>jUDDI has NOT installed correctly!</h2>
+ <h2 color="red">jUDDI has NOT installed correctly!</h2>
<p />
<h3>Error Information</h3>
<p>
@@ -125,6 +125,31 @@
<li>config/juddi/nodeId, default = uddi:juddi.apache.org:node1</li>
<li>config/juddi/rootBusinessId, default = uddi:juddi.apache.org:businesses-asf</li>
</ul>
+ Configured values:
+ <table>
+ <tr>
+ <td><b>Root Partition:</b></td>
+ <td><%= StringEscapeUtils.escapeHtml(rootPartition)%></td>
+ </tr>
+
+ <tr>
+ <td><b>Node Id:</b></td>
+ <td><%=StringEscapeUtils.escapeHtml(nodeId)%></td>
+ </tr>
+ <tr>
+ <td><b>Root Business Key:</b></td>
+ <td><%= StringEscapeUtils.escapeHtml(rootBusiness)%></td>
+ </tr>
+ <tr>
+ <td><b>Root Business Name:</b></td>
+ <td><%= StringEscapeUtils.escapeHtml(nodeName)%></td>
+ </tr>
+ <tr>
+ <td><b>Root Business Description:</b></td>
+ <td><%=StringEscapeUtils.escapeHtml(nodeDescription)%></td>
+ </tr>
+
+ </table>
<% }
%>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[03/28] juddi git commit: JUDDI-241 working change journal NOJIRA
removing a number of unnecessary TODO statements
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index 2148827..a271d7e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -16,36 +16,55 @@
*/
package org.apache.juddi.mapping;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.HashSet;
import java.util.List;
+import javax.persistence.EntityManager;
import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBElement;
import javax.xml.transform.dom.DOMResult;
-
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.JAXBMarshaller;
+import org.apache.juddi.model.Address;
import org.apache.juddi.model.BindingTemplate;
import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.CanonicalizationMethod;
+import org.apache.juddi.model.CommunicationGraph;
+import org.apache.juddi.model.Contact;
+import org.apache.juddi.model.ControlMessage;
+import org.apache.juddi.model.Edge;
+import org.apache.juddi.model.KeyDataValue;
import org.apache.juddi.model.KeyInfo;
+import org.apache.juddi.model.Node;
+import org.apache.juddi.model.Operator;
+import org.apache.juddi.model.OperatorStatusType;
import org.apache.juddi.model.Publisher;
import org.apache.juddi.model.Reference;
import org.apache.juddi.model.Signature;
import org.apache.juddi.model.SignatureMethod;
import org.apache.juddi.model.SignatureTransform;
+import org.apache.juddi.model.SignatureTransformDataValue;
import org.apache.juddi.model.SignatureValue;
import org.apache.juddi.model.SignedInfo;
import org.apache.juddi.model.Tmodel;
-import org.apache.juddi.model.KeyDataValue;
-import org.apache.juddi.model.SignatureTransformDataValue;
+import org.apache.juddi.model.UddiEntity;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.ValueNotAllowedException;
import org.uddi.api_v3.Description;
+import org.uddi.api_v3.OperationalInfo;
+import org.uddi.api_v3.SaveBinding;
+import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.sub_v3.ObjectFactory;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.w3._2000._09.xmldsig_.DSAKeyValueType;
+import org.w3._2000._09.xmldsig_.KeyInfoType;
import org.w3._2000._09.xmldsig_.KeyValueType;
import org.w3._2000._09.xmldsig_.PGPDataType;
import org.w3._2000._09.xmldsig_.RSAKeyValueType;
@@ -83,8 +102,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisher(org.apache.juddi.api_v3.Publisher apiPublisher,
- org.apache.juddi.model.Publisher modelPublisher)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Publisher modelPublisher)
+ throws DispositionReportFaultMessage {
modelPublisher.setAuthorizedName(apiPublisher.getAuthorizedName());
modelPublisher.setPublisherName(apiPublisher.getPublisherName());
modelPublisher.setEmailAddress(apiPublisher.getEmailAddress());
@@ -104,8 +123,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessEntity(org.uddi.api_v3.BusinessEntity apiBusinessEntity,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessEntity.setEntityKey(apiBusinessEntity.getBusinessKey());
@@ -120,15 +139,15 @@ public class MappingApiToModel {
}
mapBusinessServices(apiBusinessEntity.getBusinessServices(),
- modelBusinessEntity.getBusinessServices(),
- modelBusinessEntity.getServiceProjections(),
- modelBusinessEntity);
+ modelBusinessEntity.getBusinessServices(),
+ modelBusinessEntity.getServiceProjections(),
+ modelBusinessEntity);
mapBusinessSignature(apiBusinessEntity.getSignature(), modelBusinessEntity);
}
private static List<Signature> mapApiSignaturesToModelSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = new ArrayList<Signature>();
modelSignatures.clear();
for (org.w3._2000._09.xmldsig_.SignatureType signatureType : apiSignatures) {
@@ -224,7 +243,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessServiceSignature(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBusinessService(modelBusinessService);
@@ -239,7 +258,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTmodelSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, Tmodel modelTmodel)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setTmodel(modelTmodel);
@@ -254,7 +273,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplateSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBindingTemplate(modelBindingTemplate);
@@ -269,7 +288,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisherSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, Publisher modelPublisher)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setPublisher(modelPublisher);
@@ -284,8 +303,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessSignature(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBusinessEntity(modelBusinessEntity);
@@ -301,9 +320,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessNames(List<org.uddi.api_v3.Name> apiNameList,
- List<org.apache.juddi.model.BusinessName> modelNameList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessName> modelNameList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelNameList.clear();
for (org.uddi.api_v3.Name apiName : apiNameList) {
@@ -319,9 +338,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.BusinessDescr> modelDescList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessDescr> modelDescList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -337,9 +356,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapDiscoveryUrls(org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
- List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelDiscUrlList.clear();
if (apiDiscUrls != null) {
@@ -358,9 +377,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContacts(org.uddi.api_v3.Contacts apiContacts,
- List<org.apache.juddi.model.Contact> modelContactList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Contact> modelContactList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelContactList.clear();
if (apiContacts != null) {
@@ -373,7 +392,7 @@ public class MappingApiToModel {
mapContactDescriptions(apiContact.getDescription(), modelContact.getContactDescrs(), modelContact, modelBusinessEntity.getEntityKey());
mapContactEmails(apiContact.getEmail(), modelContact.getEmails(), modelContact, modelBusinessEntity.getEntityKey());
mapContactPhones(apiContact.getPhone(), modelContact.getPhones(), modelContact, modelBusinessEntity.getEntityKey());
- mapContactAddresses(apiContact.getAddress(), modelContact.getAddresses(), modelContact, modelBusinessEntity.getEntityKey());
+ mapContactAddresses(apiContact.getAddress(), modelContact.getAddresses(), modelContact);
modelContactList.add(modelContact);
}
@@ -389,10 +408,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.ContactDescr> modelDescList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ContactDescr> modelDescList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -409,10 +428,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPersonNames(List<org.uddi.api_v3.PersonName> apiPersonNameList,
- List<org.apache.juddi.model.PersonName> modelPersonNameList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.PersonName> modelPersonNameList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelPersonNameList.clear();
for (org.uddi.api_v3.PersonName apiPersonName : apiPersonNameList) {
@@ -429,10 +448,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactEmails(List<org.uddi.api_v3.Email> apiEmailList,
- List<org.apache.juddi.model.Email> modelEmailList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Email> modelEmailList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelEmailList.clear();
for (org.uddi.api_v3.Email apiEmail : apiEmailList) {
@@ -449,10 +468,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactPhones(List<org.uddi.api_v3.Phone> apiPhoneList,
- List<org.apache.juddi.model.Phone> modelPhoneList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Phone> modelPhoneList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelPhoneList.clear();
for (org.uddi.api_v3.Phone apiPhone : apiPhoneList) {
@@ -469,10 +488,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactAddresses(List<org.uddi.api_v3.Address> apiAddressList,
- List<org.apache.juddi.model.Address> modelAddressList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Address> modelAddressList,
+ org.apache.juddi.model.Contact modelContact
+ )
+ throws DispositionReportFaultMessage {
modelAddressList.clear();
for (org.uddi.api_v3.Address apiAddress : apiAddressList) {
@@ -481,7 +500,7 @@ public class MappingApiToModel {
modelAddress.setTmodelKey(apiAddress.getTModelKey());
modelAddress.setUseType(apiAddress.getUseType());
- mapAddressLines(apiAddress.getAddressLine(), modelAddress.getAddressLines(), modelAddress, businessKey, modelContact.getId());
+ mapAddressLines(apiAddress.getAddressLine(), modelAddress.getAddressLines(), modelAddress, modelContact.getId());
modelAddressList.add(modelAddress);
}
@@ -492,16 +511,15 @@ public class MappingApiToModel {
* @param apiAddressLineList
* @param modelAddressLineList
* @param modelAddress
- * @param businessKey
+ *
* @param contactId
* @throws DispositionReportFaultMessage
*/
public static void mapAddressLines(List<org.uddi.api_v3.AddressLine> apiAddressLineList,
- List<org.apache.juddi.model.AddressLine> modelAddressLineList,
- org.apache.juddi.model.Address modelAddress,
- String businessKey,
- Long contactId)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.AddressLine> modelAddressLineList,
+ org.apache.juddi.model.Address modelAddress,
+ Long contactId)
+ throws DispositionReportFaultMessage {
modelAddressLineList.clear();
for (org.uddi.api_v3.AddressLine apiAddressLine : apiAddressLineList) {
@@ -517,9 +535,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessIdentifiers(org.uddi.api_v3.IdentifierBag apiIdentifierBag,
- List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelIdentifierList.clear();
if (apiIdentifierBag != null) {
@@ -539,10 +557,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessServices(org.uddi.api_v3.BusinessServices apiBusinessServices,
- List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
- List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
+ List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessServiceList.clear();
if (apiBusinessServices != null) {
List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = apiBusinessServices.getBusinessService();
@@ -551,7 +569,7 @@ public class MappingApiToModel {
// If the parent businessEntity key and the service businessEntity key (if provided) do not match, it's a projection.
if (apiBusinessService.getBusinessKey() != null && apiBusinessService.getBusinessKey().length() > 0
- && !modelBusinessEntity.getEntityKey().equalsIgnoreCase(apiBusinessService.getBusinessKey())) {
+ && !modelBusinessEntity.getEntityKey().equalsIgnoreCase(apiBusinessService.getBusinessKey())) {
modelBusinessService.setEntityKey(apiBusinessService.getServiceKey());
org.apache.juddi.model.ServiceProjection modelServiceProjection = new org.apache.juddi.model.ServiceProjection(modelBusinessEntity, modelBusinessService);
@@ -573,9 +591,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessService(org.uddi.api_v3.BusinessService apiBusinessService,
- org.apache.juddi.model.BusinessService modelBusinessService,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessService modelBusinessService,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessService.setBusinessEntity(modelBusinessEntity);
modelBusinessService.setEntityKey(apiBusinessService.getServiceKey());
@@ -599,9 +617,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapServiceNames(List<org.uddi.api_v3.Name> apiNameList,
- List<org.apache.juddi.model.ServiceName> modelNameList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ServiceName> modelNameList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelNameList.clear();
for (org.uddi.api_v3.Name apiName : apiNameList) {
@@ -617,9 +635,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapServiceDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.ServiceDescr> modelDescList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ServiceDescr> modelDescList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -635,9 +653,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplates(org.uddi.api_v3.BindingTemplates apiBindingTemplates,
- List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelBindingTemplateList.clear();
if (apiBindingTemplates != null) {
@@ -660,9 +678,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplate(org.uddi.api_v3.BindingTemplate apiBindingTemplate,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelBindingTemplate.setBusinessService(modelBusinessService);
modelBindingTemplate.setEntityKey(apiBindingTemplate.getBindingKey());
@@ -691,9 +709,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.BindingDescr> modelDescList,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BindingDescr> modelDescList,
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
modelDescList.add(new org.apache.juddi.model.BindingDescr(modelBindingTemplate, apiDesc.getLang(), apiDesc.getValue()));
@@ -707,8 +725,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapCategoryBag(org.uddi.api_v3.CategoryBag apiCategoryBag,
- org.apache.juddi.model.CategoryBag modelCategoryBag)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.CategoryBag modelCategoryBag)
+ throws DispositionReportFaultMessage {
if (apiCategoryBag != null) {
List<org.uddi.api_v3.KeyedReference> krList = apiCategoryBag.getKeyedReference();
@@ -718,7 +736,7 @@ public class MappingApiToModel {
//modelKeyedReferences.clear();
org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference) elem;
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
- apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
List<org.uddi.api_v3.KeyedReferenceGroup> krgList = apiCategoryBag.getKeyedReferenceGroup();
@@ -746,9 +764,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapKeyedReferenceGroup(org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup,
- org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
- org.apache.juddi.model.CategoryBag modelCategoryBag)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
+ org.apache.juddi.model.CategoryBag modelCategoryBag)
+ throws DispositionReportFaultMessage {
if (apiKeyedReferenceGroup != null) {
modelKeyedReferenceGroup.setCategoryBag(modelCategoryBag);
modelKeyedReferenceGroup.setTmodelKey(apiKeyedReferenceGroup.getTModelKey());
@@ -757,7 +775,7 @@ public class MappingApiToModel {
List<org.apache.juddi.model.KeyedReference> modelKeyedReferences = modelKeyedReferenceGroup.getKeyedReferences();
for (org.uddi.api_v3.KeyedReference apiKeyedReference : apiKeyedReferenceGroup.getKeyedReference()) {
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelKeyedReferenceGroup,
- apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
@@ -773,9 +791,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails apiTModelInstDetails,
- List<org.apache.juddi.model.TmodelInstanceInfo> modelTModelInstInfoList,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelInstanceInfo> modelTModelInstInfoList,
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate)
+ throws DispositionReportFaultMessage {
modelTModelInstInfoList.clear();
if (apiTModelInstDetails != null) {
@@ -799,9 +817,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelInstanceInfoDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
- org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
+ org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -816,17 +834,17 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapInstanceDetails(org.uddi.api_v3.InstanceDetails apiInstanceDetails,
- org.apache.juddi.model.TmodelInstanceInfo modelTmodelInstInfo)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.TmodelInstanceInfo modelTmodelInstInfo)
+ throws DispositionReportFaultMessage {
modelTmodelInstInfo.getInstanceDetailsDescrs().clear();
if (apiInstanceDetails != null) {
List<org.uddi.api_v3.Description> descriptions = apiInstanceDetails.getDescription();
List<org.uddi.api_v3.OverviewDoc> overviewdocs = apiInstanceDetails.getOverviewDoc();
for (org.uddi.api_v3.Description apiDesc : descriptions) {
- org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr =
- new org.apache.juddi.model.InstanceDetailsDescr(
- modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
+ org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr
+ = new org.apache.juddi.model.InstanceDetailsDescr(
+ modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
modelTmodelInstInfo.getInstanceDetailsDescrs().add(modelInstanceDetailsDescr);
}
for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : overviewdocs) {
@@ -845,8 +863,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapOverviewDoc(org.uddi.api_v3.OverviewDoc apiOverviewDoc,
- org.apache.juddi.model.OverviewDoc modelOverviewDoc)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc)
+ throws DispositionReportFaultMessage {
if (apiOverviewDoc != null) {
List<Description> descContent = apiOverviewDoc.getDescription();
@@ -854,7 +872,7 @@ public class MappingApiToModel {
org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem;
if (description != null) {
org.apache.juddi.model.OverviewDocDescr modelOverviewDocDescr = new org.apache.juddi.model.OverviewDocDescr(
- modelOverviewDoc, description.getLang(), description.getValue());
+ modelOverviewDoc, description.getLang(), description.getValue());
modelOverviewDoc.getOverviewDocDescrs().add(modelOverviewDocDescr);
}
}
@@ -876,8 +894,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModel(org.uddi.api_v3.TModel apiTModel,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelTModel.setEntityKey(apiTModel.getTModelKey());
modelTModel.setName(apiTModel.getName().getValue());
@@ -902,9 +920,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.TmodelDescr> modelDescList,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelDescr> modelDescList,
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -920,9 +938,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelIdentifiers(org.uddi.api_v3.IdentifierBag apiIdentifierBag,
- List<org.apache.juddi.model.TmodelIdentifier> modelIdentifierList,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelIdentifier> modelIdentifierList,
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelIdentifierList.clear();
if (apiIdentifierBag != null) {
@@ -941,9 +959,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelOverviewDocs(List<org.uddi.api_v3.OverviewDoc> apiOverviewDocList,
- List<org.apache.juddi.model.OverviewDoc> modelOverviewDocList,
- org.apache.juddi.model.Tmodel modelTmodel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.OverviewDoc> modelOverviewDocList,
+ org.apache.juddi.model.Tmodel modelTmodel)
+ throws DispositionReportFaultMessage {
modelOverviewDocList.clear();
for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : apiOverviewDocList) {
@@ -960,8 +978,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisherAssertion(org.uddi.api_v3.PublisherAssertion apiPubAssertion,
- org.apache.juddi.model.PublisherAssertion modelPubAssertion)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.PublisherAssertion modelPubAssertion)
+ throws DispositionReportFaultMessage {
modelPubAssertion.setId(new org.apache.juddi.model.PublisherAssertionId(apiPubAssertion.getFromKey(), apiPubAssertion.getToKey()));
@@ -988,8 +1006,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapSubscription(org.uddi.sub_v3.Subscription apiSubscription,
- org.apache.juddi.model.Subscription modelSubscription)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Subscription modelSubscription)
+ throws DispositionReportFaultMessage {
modelSubscription.setSubscriptionKey(apiSubscription.getSubscriptionKey());
modelSubscription.setBindingKey(apiSubscription.getBindingKey());
@@ -1008,7 +1026,6 @@ public class MappingApiToModel {
modelSubscription.setBrief(Boolean.FALSE);
}
-
String rawFilter = JAXBMarshaller.marshallToString(new ObjectFactory().createSubscriptionFilter(apiSubscription.getSubscriptionFilter()), "org.uddi.sub_v3");
logger.debug("marshalled subscription filter: " + rawFilter);
modelSubscription.setSubscriptionFilter(rawFilter);
@@ -1022,8 +1039,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapClientSubscriptionInfo(org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo,
- org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo)
+ throws DispositionReportFaultMessage {
modelClientSubscriptionInfo.setLastNotified(new Date());
modelClientSubscriptionInfo.setSubscriptionKey(apiClientSubscriptionInfo.getSubscriptionKey());
@@ -1132,10 +1149,10 @@ public class MappingApiToModel {
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName instanceof String) {
modelKeyInfoValue.setKeyDataValueString((String) x509IssuerSerialOrX509SKIOrX509SubjectName);
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName instanceof X509IssuerSerialType) {
- modelKeyInfoValue.setKeyDataType(X509IssuerSerialType.class.getSimpleName());
- X509IssuerSerialType x509IssuerSerialType = (X509IssuerSerialType) x509IssuerSerialOrX509SKIOrX509SubjectName;
- modelKeyInfoValue.setKeyDataValueString(x509IssuerSerialType.getX509IssuerName());
- modelKeyInfoValue.setKeyDataValueBytes(x509IssuerSerialType.getX509SerialNumber().toByteArray());
+ modelKeyInfoValue.setKeyDataType(X509IssuerSerialType.class.getSimpleName());
+ X509IssuerSerialType x509IssuerSerialType = (X509IssuerSerialType) x509IssuerSerialOrX509SKIOrX509SubjectName;
+ modelKeyInfoValue.setKeyDataValueString(x509IssuerSerialType.getX509IssuerName());
+ modelKeyInfoValue.setKeyDataValueBytes(x509IssuerSerialType.getX509SerialNumber().toByteArray());
} else if (x509IssuerSerialOrX509SKIOrX509SubjectName != null) {
throw new RuntimeException("Unrecognized Value for Element: " + tagName + ": " + x509IssuerSerialOrX509SKIOrX509SubjectName.getClass().getCanonicalName());
}
@@ -1358,4 +1375,201 @@ public class MappingApiToModel {
String str = serializer.writeToString(xformEl);
return str;
}
+
+ public static org.apache.juddi.model.ChangeRecord mapChangeRecord(ChangeRecord rec) throws UnsupportedEncodingException {
+ org.apache.juddi.model.ChangeRecord r = new org.apache.juddi.model.ChangeRecord();
+ r.setId(rec.getChangeID().getOriginatingUSN());
+ r.setNodeID(rec.getChangeID().getNodeID());
+ StringWriter sw = new StringWriter();
+ JAXB.marshal(rec, sw);
+ r.setContents(sw.toString().getBytes("UTF8"));
+ return r;
+
+ }
+
+ public static void mapOperationalInfo(UddiEntity model, OperationalInfo operationalInfo) {
+ if (operationalInfo == null || model == null) {
+ return;
+ }
+ if (operationalInfo.getCreated() != null) {
+ model.setCreated(operationalInfo.getCreated().toGregorianCalendar().getTime());
+ }
+ model.setAuthorizedName(operationalInfo.getAuthorizedName());
+ if (operationalInfo.getModified() != null) {
+ model.setModified(operationalInfo.getModified().toGregorianCalendar().getTime());
+ }
+ if (operationalInfo.getModifiedIncludingChildren() != null) {
+ model.setModifiedIncludingChildren(operationalInfo.getModifiedIncludingChildren().toGregorianCalendar().getTime());
+ }
+ model.setNodeId(operationalInfo.getNodeID());
+
+ }
+
+ public static void mapSaveBindingToChangeRecord(SaveBinding recordIn, List<org.apache.juddi.model.ChangeRecord> recordsOut) {
+ List<org.apache.juddi.model.ChangeRecord> r = new ArrayList<org.apache.juddi.model.ChangeRecord>();
+
+ }
+
+ public static void mapReplicationConfiguration(ReplicationConfiguration replicationConfiguration, org.apache.juddi.model.ReplicationConfiguration model, EntityManager em) throws DispositionReportFaultMessage {
+
+ model.setMaximumTimeToGetChanges(replicationConfiguration.getMaximumTimeToGetChanges());
+ model.setMaximumTimeToSyncRegistry(replicationConfiguration.getMaximumTimeToSyncRegistry());
+ model.setSerialNumber(null);
+
+ //the spec doesn't specify what the format should be, however there was an example
+ //2002 03 04 1859Z
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
+ model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
+ model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact()));
+ model.setCommunicationGraph(mapCommunicationGraph(replicationConfiguration.getCommunicationGraph(), em));
+ model.setOperator(mapOperators(replicationConfiguration.getOperator()));
+ if (replicationConfiguration.getSignature() != null) {
+ model.setSignatures(mapApiSignaturesToModelSignatures(replicationConfiguration.getSignature()));
+ }
+
+ }
+
+ private static Contact mapContact(org.uddi.api_v3.Contact contact) throws DispositionReportFaultMessage {
+ Contact model = new Contact();
+ model.setAddresses(new ArrayList<Address>());
+ mapContactAddresses(contact.getAddress(), model.getAddresses(), model);
+ if (model.getAddresses().isEmpty()) {
+ model.setAddresses(null);
+ }
+ return model;
+ }
+
+ private static CommunicationGraph mapCommunicationGraph(org.uddi.repl_v3.CommunicationGraph communicationGraph, EntityManager em) throws DispositionReportFaultMessage {
+ if (communicationGraph == null) {
+ return null;
+ }
+ CommunicationGraph model = new CommunicationGraph();
+
+ /**
+ * Following the listing of nodes is the controlledMessage
+ * element that lists the set of messages over which this
+ * communication graph is intended to administer control of. If
+ * a message element local name is listed in the
+ * controlledMessage element, then such messages SHALL only be
+ * sent between nodes that are listed in the subsequent edges of
+ * the graph. In contrast, communication restrictions are not
+ * imposed on replication messages not identified in the
+ * controlledMessage element.
+ */
+ if (communicationGraph.getControlledMessage() != null) {
+ model.setControlMessage(new ArrayList<ControlMessage>());
+ for (int k = 0; k < communicationGraph.getControlledMessage().size(); k++) {
+ model.getControlMessage().add(new ControlMessage(communicationGraph.getControlledMessage().get(k)));
+ }
+ }
+ model.setNode(new ArrayList<Node>());
+ for (int i = 0; i < communicationGraph.getNode().size(); i++) {
+ Node find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getNode().get(i));
+ if (find == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getNode().get(i)));
+ }
+ model.getNode().add(find);
+ }
+ if (communicationGraph.getEdge() != null) {
+ List<Edge> ret = new ArrayList<Edge>();
+ for (int i = 0; i < communicationGraph.getEdge().size(); i++) {
+ Edge e = new Edge();
+ e.setCommunicationGraph(model);
+ Node find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageReceiver());
+ if (find == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
+ }
+ e.setMessageReceiver(find);
+ find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageSender());
+ if (find == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageSender()));
+ }
+ e.setMessageSender(find);
+
+ /**
+ * The message elements contain the local name
+ * of the Replication API message elements. They
+ * indicate that only messages of the type
+ * explicitly identified for a particular edge
+ * MAY be sent from the specified messageSender
+ * to the specified messageReceiver.
+ */
+ if (communicationGraph.getEdge().get(i).getMessage() != null) {
+ e.setMessage(new ArrayList<ControlMessage>());
+ for (int k = 0; k < communicationGraph.getEdge().get(i).getMessage().size(); k++) {
+ e.getMessages().add(new ControlMessage(communicationGraph.getEdge().get(i).getMessage().get(k)));
+ }
+ }
+ if (communicationGraph.getEdge().get(i).getMessageReceiverAlternate() != null) {
+ e.setMessageReceiverAlternate(new HashSet<Node>());
+ for (int k = 0; k < communicationGraph.getEdge().get(i).getMessageReceiverAlternate().size(); k++) {
+ find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageSender());
+ if (find == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageSender()));
+ }
+ e.getMessageReceiverAlternate().add(find);
+ }
+ }
+
+ ret.add(e);
+ }
+ model.setEdge(ret);
+ }
+
+ return model;
+
+ }
+
+ private static List<Operator> mapOperators(List<org.uddi.repl_v3.Operator> api) throws DispositionReportFaultMessage {
+ if (api == null) {
+ return null;
+ }
+ List<Operator> model = new ArrayList<Operator>();
+ for (int i = 0; i < api.size(); i++) {
+ Operator op = new Operator();
+ op.setSoapReplicationURL(api.get(i).getSoapReplicationURL());
+
+ if (!api.get(i).getContact().isEmpty()) {
+ op.setContact(new ArrayList<Contact>());
+ for (int k = 0; k < api.get(i).getContact().size(); k++) {
+ op.getContact().add(mapContact(api.get(i).getContact().get(k)));
+ }
+ }
+ op.setOperatorNodeID(api.get(i).getOperatorNodeID());
+ op.setOperatorStatus(mapOperatorStatus(api.get(i).getOperatorStatus()));
+ if (!api.get(i).getKeyInfo().isEmpty()) {
+ op.setKeyInfo(new ArrayList<KeyInfo>());
+ for (int k = 0; k < api.get(i).getKeyInfo().size(); k++) {
+ //TODO api.get(i).getKeyInfo().get(k)
+ org.apache.juddi.model.KeyInfo modelKeyInfo = new KeyInfo();
+ modelKeyInfo.setXmlID(api.get(i).getKeyInfo().get(i).getId());
+ modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
+ if (api.get(i).getKeyInfo().get(i).getContent() != null) {
+ modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
+ for (int x = 0; x < api.get(i).getKeyInfo().get(k).getContent().size(); x++) {
+ mapKeyValue((JAXBElement) api.get(i).getKeyInfo().get(k).getContent().get(x), modelKeyInfo.getKeyDataValue());
+ }
+ }
+ op.getKeyInfo().add(modelKeyInfo);
+ }
+
+ }
+ model.add(op);
+
+ }
+ return model;
+ }
+
+ private static OperatorStatusType mapOperatorStatus(org.uddi.repl_v3.OperatorStatusType operatorStatus) {
+ switch (operatorStatus) {
+ case NEW:
+ return OperatorStatusType.NEW;
+ case NORMAL:
+ return OperatorStatusType.NORMAL;
+ case RESIGNED:
+ return OperatorStatusType.RESIGNED;
+ }
+ return null;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index 868eed5..e9bf41a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -23,10 +23,15 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import org.w3._2000._09.xmldsig_.X509IssuerSerialType;
import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -53,7 +58,6 @@ import org.apache.juddi.model.UddiEntity;
import org.apache.juddi.model.KeyDataValue;
import org.apache.juddi.model.Node;
import org.apache.juddi.model.ReplicationConfiguration;
-import org.apache.juddi.model.ReplicationMessage;
import org.apache.juddi.model.SignatureTransformDataValue;
import org.apache.juddi.subscription.TypeConvertor;
import org.apache.juddi.v3.error.ErrorMessage;
@@ -62,6 +66,8 @@ import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.CompletionStatus;
import org.uddi.api_v3.Contacts;
import org.uddi.api_v3.OperationalInfo;
+import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.Operator;
import org.uddi.repl_v3.OperatorStatusType;
@@ -1219,14 +1225,16 @@ public class MappingModelToApi {
mapContacts(model.get(i).getContact(), c, new BusinessEntity());
op.getContact().addAll(c.getContact());
- for (int x = 0; x < model.get(i).getKeyInfo().size(); x++) {
- KeyInfoType apiKeyInfo = new KeyInfoType();
- KeyInfo modelKeyInfo = model.get(i).getKeyInfo().get(x);
- apiKeyInfo.setId(modelKeyInfo.getXmlID());
- List<KeyDataValue> modelKeyDataValueList = modelKeyInfo.getKeyDataValue();
- List<Object> apiX509KeyInfoList = apiKeyInfo.getContent();
- mapModelKeyDataValue(modelKeyDataValueList, apiX509KeyInfoList);
- op.getKeyInfo().add(apiKeyInfo);
+ if (model.get(i).getKeyInfo() != null) {
+ for (int x = 0; x < model.get(i).getKeyInfo().size(); x++) {
+ KeyInfoType apiKeyInfo = new KeyInfoType();
+ KeyInfo modelKeyInfo = model.get(i).getKeyInfo().get(x);
+ apiKeyInfo.setId(modelKeyInfo.getXmlID());
+ List<KeyDataValue> modelKeyDataValueList = modelKeyInfo.getKeyDataValue();
+ List<Object> apiX509KeyInfoList = apiKeyInfo.getContent();
+ mapModelKeyDataValue(modelKeyDataValueList, apiX509KeyInfoList);
+ op.getKeyInfo().add(apiKeyInfo);
+ }
}
api.add(op);
}
@@ -1252,9 +1260,10 @@ public class MappingModelToApi {
CommunicationGraph.Edge apiEdge = new CommunicationGraph.Edge();
apiEdge.setMessageReceiver(modelEdge.getMessageReceiver().getName());
apiEdge.setMessageSender(modelEdge.getMessageSender().getName());
- Iterator<ReplicationMessage> it2 = modelEdge.getMessages().iterator();
+
+ Iterator<ControlMessage> it2 = modelEdge.getMessages().iterator();
while (it2.hasNext()) {
- apiEdge.getMessage().add(it2.next().getMsg());
+ apiEdge.getMessage().add(it2.next().getMessage());
}
Iterator<Node> it3 = modelEdge.getMessageReceiverAlternate().iterator();
while (it3.hasNext()) {
@@ -1281,4 +1290,27 @@ public class MappingModelToApi {
api.add(it.next().getName());
}
}
+
+ public static ChangeRecord mapChangeRecord(org.apache.juddi.model.ChangeRecord cr) {
+ if (cr == null) {
+ return null;
+ }
+ ChangeRecord ret = new ChangeRecord();
+
+ StringReader sr = null;
+ try {
+ sr = new StringReader(new String(cr.getContents(), "UTF8"));
+ } catch (UnsupportedEncodingException ex) {
+ Logger.getLogger(MappingModelToApi.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ ret = JAXB.unmarshal(sr, ChangeRecord.class);
+ //secret sauce here, if this is -1, that means that the record originated at this node and needs to be populated with the databases record id
+ if (cr.getOriginatingUSN()==null || cr.getOriginatingUSN() == -1L) {
+ ret.setChangeID(new ChangeRecordIDType(cr.getNodeID(), cr.getId()));
+ } else {
+ ret.setChangeID(new ChangeRecordIDType(cr.getNodeID(), cr.getOriginatingUSN()));
+ }
+ return ret;
+
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/ChangeRecord.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ChangeRecord.java b/juddi-core/src/main/java/org/apache/juddi/model/ChangeRecord.java
index 0a9379d..e9113b4 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ChangeRecord.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ChangeRecord.java
@@ -19,19 +19,28 @@ package org.apache.juddi.model;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.Lob;
import javax.persistence.Table;
+import javax.persistence.TableGenerator;
@Entity
@Table(name = "j3_chg_record")
public class ChangeRecord implements Serializable {
+ private static final long serialVersionUID = 1L;
+
protected String nodeID;
protected Long originatingUSN;
-
+ private byte[] contents;
+ private RecordType e = RecordType.ChangeRecordNull;
private Long id;
+ private String entityKey;
- @Column(name="change_contents")
+ @Column(name = "change_contents")
+ @Lob
public byte[] getContents() {
return contents;
}
@@ -39,22 +48,8 @@ public class ChangeRecord implements Serializable {
public void setContents(byte[] contents) {
this.contents = contents;
}
- /*protected ChangeRecordIDType changeID;
- protected Object changeRecordNull;
- protected ChangeRecordNewData changeRecordNewData;
- protected ChangeRecordDelete changeRecordDelete;
- protected ChangeRecordPublisherAssertion changeRecordPublisherAssertion;
- protected ChangeRecordHide changeRecordHide;
- protected ChangeRecordDeleteAssertion changeRecordDeleteAssertion;
- protected ChangeRecordAcknowledgement changeRecordAcknowledgement;
- protected ChangeRecordCorrection changeRecordCorrection;
- protected ChangeRecordNewDataConditional changeRecordNewDataConditional;
- protected ChangeRecordConditionFailed changeRecordConditionFailed;
- protected boolean acknowledgementRequested;
- * */
- byte[] contents;
-
- enum RecordType {
+
+ public enum RecordType {
ChangeRecordNewData,
ChangeRecordDelete,
@@ -64,10 +59,27 @@ public class ChangeRecord implements Serializable {
ChangeRecordAcknowledgement,
ChangeRecordCorrection,
ChangeRecordNewDataConditional,
- ChangeRecordConditionFailed
+ ChangeRecordConditionFailed,
+ ChangeRecordNull
+ }
+
+ public void setRecordType(RecordType e) {
+ this.e = e;
+ }
+
+ @Column(name = "record_type")
+ public RecordType getRecordType() {
+ return e;
}
@Id
+ @GeneratedValue(strategy = GenerationType.TABLE,
+ generator = "personGen")
+ @TableGenerator(name = "personGen",
+ table = "JPAGEN_GENERATORS",
+ pkColumnName = "NAME",
+ pkColumnValue = "JPAGEN_PERSON_GEN",
+ valueColumnName = "VALUE")
public Long getId() {
return id;
}
@@ -76,7 +88,7 @@ public class ChangeRecord implements Serializable {
this.id = id;
}
- @Column(name="node_id")
+ @Column(name = "node_id")
public String getNodeID() {
return nodeID;
}
@@ -85,8 +97,16 @@ public class ChangeRecord implements Serializable {
this.nodeID = value;
}
-
- @Column(name="orginating_usn")
+ @Column(name = "entity_key")
+ public String getEntityKey() {
+ return entityKey;
+ }
+
+ public void setEntityKey(String value) {
+ this.entityKey = value;
+ }
+
+ @Column(name = "orginating_usn")
public Long getOriginatingUSN() {
return originatingUSN;
}
@@ -95,4 +115,3 @@ public class ChangeRecord implements Serializable {
this.originatingUSN = value;
}
}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java b/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
index f471712..fe0ca52 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
@@ -38,7 +38,7 @@ public class Clerk implements java.io.Serializable {
private String clerkName;
@Column(name="publisher_id", nullable = false, length=255)
private String publisherId;
- @ManyToOne(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
+ @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private Node node;
@Column(name="cred", length=255)
private String cred;
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java b/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
index e0251f1..b2ec7d0 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
@@ -26,9 +26,12 @@ import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
+import javax.persistence.TableGenerator;
@Entity
@Table(name = "j3_chg_graph")
@@ -78,6 +81,13 @@ public class CommunicationGraph implements Serializable {
@Id
@Column(name = "j3_id")
+ @GeneratedValue(strategy = GenerationType.TABLE,
+ generator = "cfggrphGen")
+ @TableGenerator(name = "cfggrphGen",
+ table = "JPAGEN_CFGGRPH",
+ pkColumnName = "NAME",
+ pkColumnValue = "JPAGEN_PERSON_GEN",
+ valueColumnName = "VALUE")
public Long getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Contact.java b/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
index 8aa62f7..4f8b62d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
@@ -77,7 +77,7 @@ public class Contact implements java.io.Serializable {
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "entity_key", nullable = false)
+ @JoinColumn(name = "entity_key", nullable = true)
public BusinessEntity getBusinessEntity() {
return this.businessEntity;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java b/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
index 2c5f10d..ce79b8f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
@@ -29,6 +29,10 @@ import javax.persistence.Id;
public class ControlMessage implements Serializable{
private static final long serialVersionUID = 1L;
+ public ControlMessage(){}
+ public ControlMessage(String msg){
+ this.message = msg;
+ }
private Long id;
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
index 63625ef..768bb23 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
@@ -36,18 +36,26 @@ import javax.persistence.Table;
public class Edge {
private Long id;
- private Set<ReplicationMessage> message;
+ private List<ControlMessage> message;
private Node messageSender;
private Node messageReceiver;
private Set<Node> messageReceiverAlternate;
private CommunicationGraph parent;
+ /**
+ * link the parent object
+ * @param val
+ */
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = CommunicationGraph.class)
//@JoinColumn(name = "OWNER_ID")
public CommunicationGraph getCommunicationGraph() {
return parent;
}
+ /**
+ * link the parent object
+ * @param val
+ */
public void setCommunicationGraph(CommunicationGraph val) {
parent = val;
}
@@ -56,14 +64,14 @@ public class Edge {
* The message elements contain the local name of the Replication API message elements
* @return
*/
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = ReplicationMessage.class)
- public Set<ReplicationMessage> getMessages() {
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = ControlMessage.class)
+ public List<ControlMessage> getMessages() {
if (message == null) {
- message = new HashSet<ReplicationMessage>();
+ message = new ArrayList<ControlMessage>();
}
return this.message;
}
- public void setMessages(Set<ReplicationMessage> values) {
+ public void setMessages(List<ControlMessage> values) {
this.message = values;
}
@@ -113,7 +121,7 @@ public class Edge {
return id;
}
- public void setMessage(Set<ReplicationMessage> message) {
+ public void setMessage(List<ControlMessage> message) {
this.message = message;
}
@@ -121,9 +129,7 @@ public class Edge {
this.messageReceiverAlternate = messageReceiverAlternate;
}
- public void setParent(CommunicationGraph parent) {
- this.parent = parent;
- }
+
public void setId(Long id) {
this.id = id;
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
index 82efe29..742c252 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
@@ -16,6 +16,7 @@ package org.apache.juddi.model;
*/
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.persistence.AttributeOverride;
import javax.persistence.AttributeOverrides;
@@ -29,11 +30,13 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
*/
-@Entity
+ @Entity
@Table(name = "j3_publisher_assertion")
public class PublisherAssertion implements java.io.Serializable {
@@ -46,6 +49,7 @@ public class PublisherAssertion implements java.io.Serializable {
private String keyValue;
private String fromCheck;
private String toCheck;
+ private Date modified;
public PublisherAssertion() {
}
@@ -63,6 +67,20 @@ public class PublisherAssertion implements java.io.Serializable {
this.fromCheck = fromCheck;
this.toCheck = toCheck;
}
+
+ public void setModified(Date created) {
+ this.modified = created;
+ }
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "modified", nullable = false, length = 29)
+ public Date getModified() {
+ if (modified!=null) {
+ return new Date(modified.getTime());
+ } else {
+ return null;
+ }
+ }
@EmbeddedId
@AttributeOverrides({
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
index 86e34c9..a481412 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
@@ -25,11 +25,14 @@ import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import javax.persistence.TableGenerator;
@Entity
@Table(name = "j3_chg_replconf")
@@ -37,7 +40,7 @@ public class ReplicationConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
- private long serialNumber;
+ private Long serialNumber;
private String timeOfConfigurationUpdate;
private List<Operator> operator = new ArrayList<Operator>(0);
private CommunicationGraph communicationGraph;
@@ -73,8 +76,15 @@ public class ReplicationConfiguration implements Serializable {
*/
@Column(name = "serialnumb")
@OrderBy(value = "SerialNumber DESC")
- @Id
- public long getSerialNumber() {
+ @Id
+ @GeneratedValue(strategy = GenerationType.TABLE,
+ generator = "replcfgGen")
+ @TableGenerator(name = "replcfgGen",
+ table = "JPAGEN_REPLGEN",
+ pkColumnName = "NAME",
+ pkColumnValue = "JPAGEN_PERSON_GEN",
+ valueColumnName = "VALUE")
+ public Long getSerialNumber() {
return serialNumber;
}
@@ -82,7 +92,7 @@ public class ReplicationConfiguration implements Serializable {
* Sets the value of the serialNumber property.
*
*/
- public void setSerialNumber(long value) {
+ public void setSerialNumber(Long value) {
this.serialNumber = value;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationMessage.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationMessage.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationMessage.java
deleted file mode 100644
index 35ca14e..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationMessage.java
+++ /dev/null
@@ -1,51 +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.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- *
- * @author Alex O'Ree
- */
-@Entity(name = "j3_repl_messages")
-public class ReplicationMessage {
-
- private Long id;
- private String msg;
-
- @Column(name ="j3_repl_message")
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Id
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/replication/ChangeList.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ChangeList.java b/juddi-core/src/main/java/org/apache/juddi/replication/ChangeList.java
deleted file mode 100644
index 88d1b65..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ChangeList.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.juddi.replication;
-
-import org.apache.juddi.subscription.*;
-import org.apache.commons.collections.buffer.CircularFifoBuffer;
-import org.apache.commons.collections.Buffer;
-import org.apache.commons.collections.BufferUtils;
-
-public class ChangeList<T> {
- private static ChangeList<String> nl = null;
- private static Buffer list = null;
-
- private ChangeList() {
- list = BufferUtils.synchronizedBuffer(new CircularFifoBuffer(10));
- }
-
- public static ChangeList<String> getInstance() {
- if (nl == null) {
- nl = new ChangeList<String>();
- }
- return nl;
- }
-
- public Buffer getNotifications() {
- return list;
- }
-}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
index 4a91348..15b16ab 100644
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
@@ -26,8 +26,6 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
import javax.xml.ws.BindingProvider;
-
-
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,8 +34,8 @@ import org.apache.juddi.config.AppConfig;
import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.ChangeRecord;
import org.apache.juddi.model.ReplicationConfiguration;
-
import org.apache.juddi.v3.client.UDDIService;
import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
@@ -46,17 +44,21 @@ import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
import org.uddi.v3_service.UDDIReplicationPortType;
/**
- *
+ * Handles when local records have been changed, change journal storage and
+ * notifications to all remote replication nodes that something has been
+ * altered.
+ *
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*
*/
public class ReplicationNotifier extends TimerTask {
- private Log log = LogFactory.getLog(this.getClass());
+ private static Log log = LogFactory.getLog(ReplicationNotifier.class);
private Timer timer = null;
private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds
+ private static String node = null;
/**
* default constructor
@@ -70,6 +72,7 @@ public class ReplicationNotifier extends TimerTask {
if (queue == null) {
queue = new ConcurrentLinkedQueue();
}
+ node = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID, "UNDEFINED_NODE_NAME");
}
@Override
@@ -80,13 +83,85 @@ public class ReplicationNotifier extends TimerTask {
}
//ReplicationNotifier.Enqueue(this);
- public synchronized static void Enqueue(Object change) {
+ public synchronized static void Enqueue(org.apache.juddi.model.ChangeRecord change) {
if (queue == null) {
- queue = new ConcurrentLinkedQueue();
+ queue = new ConcurrentLinkedQueue<ChangeRecord>();
}
queue.add(change);
}
- static Queue queue;
+ static Queue<ChangeRecord> queue;
+
+ /**
+ *
+ * @param j must be one of the UDDI save APIs
+ */
+ protected void ProcessChangeRecord(ChangeRecord j) {
+ //store and convert the changes to database model
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = null;
+ try {
+ tx = em.getTransaction();
+ tx.begin();
+
+ em.persist(j);
+ tx.commit();
+ } catch (Exception ex) {
+ log.error("error", ex);
+ if (tx != null && tx.isActive()) {
+ tx.rollback();
+ }
+ } finally {
+ em.close();
+ }
+
+ log.info("ChangeRecord: " + j.getId() + "," + j.getEntityKey() + "," + j.getNodeID() + "," + j.getOriginatingUSN() + "," + j.getRecordType().toString());
+ org.uddi.repl_v3.ReplicationConfiguration repcfg = FetchEdges();
+
+ //TODO figure out what this statement means 7.5.3
+ /**
+ * In the absence of a communicationGraph element from the
+ * Replication Configuration Structure, all nodes listed in the
+ * node element MAY send any and all messages to any other node
+ * of the registry.
+ */
+ if (repcfg == null) {
+ log.info("No replication configuration is defined!");
+ return;
+
+ }
+ Iterator<CommunicationGraph.Edge> it = repcfg.getCommunicationGraph().getEdge().iterator();
+
+ while (it.hasNext()) {
+ //send each change set to the replication node in the graph
+
+ UDDIReplicationPortType x = new UDDIService().getUDDIReplicationPort();
+ CommunicationGraph.Edge next = it.next();
+ //next.getMessageReceiver(); //Node ID
+ Node destinationNode = getNode(next.getMessageSender());
+ if (destinationNode == null) {
+ log.warn(next.getMessageSender() + " node was not found, cannot deliver replication messages");
+ } else {
+ //TODO the spec talks about control messages, should we even support it? seems pointless
+ ((BindingProvider) x).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, destinationNode.getReplicationUrl());
+ NotifyChangeRecordsAvailable req = new NotifyChangeRecordsAvailable();
+
+ req.setNotifyingNode(node);
+ HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
+
+ highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(node, j.getId()));
+ req.setChangesAvailable(highWaterMarkVectorType);
+
+ try {
+ x.notifyChangeRecordsAvailable(req);
+ log.info("Successfully sent change record available message to " + destinationNode.getName());
+ } catch (Exception ex) {
+ log.warn("Unable to send change notification to " + destinationNode.getName(), ex);
+ }
+ }
+ }
+
+ }
public synchronized void run() {
log.debug("Replication thread triggered");
@@ -94,53 +169,22 @@ public class ReplicationNotifier extends TimerTask {
queue = new ConcurrentLinkedQueue();
}
while (!queue.isEmpty()) {
- log.info("Notifying nodes of change records " + queue.size());
- //TODO identify chnage set format
- Object j = queue.poll();
- org.uddi.repl_v3.ReplicationConfiguration repcfg = FetchEdges();
- if (repcfg == null) {
- log.debug("No replication configuration is defined!");
- queue.clear();
- break;
- }
- Iterator<CommunicationGraph.Edge> it = repcfg.getCommunicationGraph().getEdge().iterator();
-
- while (it.hasNext()) {
-
- //for (int i = 0; i < endpoints.size(); i++) {
- UDDIReplicationPortType x = new UDDIService().getUDDIReplicationPort();
- CommunicationGraph.Edge next = it.next();
- next.getMessageReceiver(); //Node ID
- Node destinationNode = getNode(next.getMessageSender());
- if (destinationNode == null) {
- log.warn(next.getMessageSender() + " node was not found, cannot deliver replication messages");
- } else {
- ((BindingProvider) x).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, destinationNode.getReplicationUrl());
- NotifyChangeRecordsAvailable req = new NotifyChangeRecordsAvailable();
- String node = "UNKNOWN";
- try {
- node = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
- } catch (ConfigurationException ex) {
- log.fatal(ex);
- }
- req.setNotifyingNode(node);
- HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
- String nextWatermark = ""; //TODO get current watermark + 1 toString()
- //TODO save watermark along with change set
-
- highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(node, 1L));
- req.setChangesAvailable(highWaterMarkVectorType);
- try {
- x.notifyChangeRecordsAvailable(req);
- } catch (Exception ex) {
- log.warn("Unable to send change notification to " + next.getMessageSender(), ex);
- }
- }
- }
+ //for each change at this node
+ log.info("Replication, Notifying nodes of new change records. " + queue.size() + " remaining");
+
+ ChangeRecord j = queue.poll();
+ ProcessChangeRecord(j);
+
}
}
- private org.uddi.repl_v3.ReplicationConfiguration FetchEdges() {
+ /**
+ * returns the latest version of the replication config or null if there
+ * is no config
+ *
+ * @return
+ */
+ public static org.uddi.repl_v3.ReplicationConfiguration FetchEdges() {
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = null;
@@ -173,7 +217,6 @@ public class ReplicationNotifier extends TimerTask {
private Node getNode(String messageSender) {
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = null;
- org.uddi.repl_v3.ReplicationConfiguration item = new org.uddi.repl_v3.ReplicationConfiguration();
try {
tx = em.getTransaction();
tx.begin();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[19/28] juddi git commit: Merge commit
'63d53d0869f8c56ef7f07bc1a09fbe4b1ab825a2' into JUDDI-241
Posted by al...@apache.org.
Merge commit '63d53d0869f8c56ef7f07bc1a09fbe4b1ab825a2' into JUDDI-241
* commit '63d53d0869f8c56ef7f07bc1a09fbe4b1ab825a2':
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release juddi-3.2.1
NOJIRA missed some dependencies
missed a pom
NOJIRA rolling back masters to 3.2.1 snapshot
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release juddi-3.2.1
fun with the release plugin
[maven-release-plugin] prepare release juddi-3.2.1
preparing for 3.2.1 release
Conflicts:
uddi-ws/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/874d02b4
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/874d02b4
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/874d02b4
Branch: refs/heads/master
Commit: 874d02b4a0e1f9a54d5183316a40c4b0203abf72
Parents: 20d9dff 63d53d0
Author: Alex <al...@apache.org>
Authored: Sat Dec 6 08:37:00 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sat Dec 6 08:37:00 2014 -0500
----------------------------------------------------------------------
docs/asciidoc/ClientGuide/pom.xml | 19 ++++-
docs/asciidoc/Guide/pom.xml | 19 ++++-
docs/asciidoc/pom.xml | 2 +-
docs/devguide/pom.xml | 18 ++++-
docs/dist/pom.xml | 2 +-
docs/pom.xml | 2 +-
docs/userguide/pom.xml | 2 +-
juddi-client-plugins/pom.xml | 23 ++++--
juddi-client/pom.xml | 2 +-
juddi-core-openjpa/pom.xml | 2 +-
juddi-core/pom.xml | 2 +-
juddi-ddl-generator/pom.xml | 25 +++++--
juddi-dist/pom.xml | 2 +-
juddi-examples/ValueSetValidator/pom.xml | 7 +-
juddi-examples/create-partition/pom.xml | 22 +++++-
juddi-examples/hello-world-embedded/pom.xml | 24 +++++--
juddi-examples/hello-world/pom.xml | 22 +++++-
juddi-examples/more-uddi-samples/pom.xml | 22 +++++-
juddi-examples/pom.xml | 2 +-
juddi-examples/service-version/pom.xml | 24 +++++--
juddi-examples/simple-browse/pom.xml | 22 +++++-
juddi-examples/simple-publish-clerk/pom.xml | 22 +++++-
juddi-examples/simple-publish-portable/pom.xml | 22 +++++-
.../subscription-notification-amqp/pom.xml | 4 +-
juddi-examples/uddi-annotations/pom.xml | 2 +-
.../uddiv2-api-bridge-example/pom.xml | 22 +++++-
juddi-examples/wsdl2uddi-lifecyle/pom.xml | 18 ++++-
juddi-examples/wsdl2uddi/pom.xml | 22 +++++-
juddi-extras/juddi-client-extras/pom.xml | 2 +-
juddi-gui-dsig/pom.xml | 2 +-
juddi-gui/pom.xml | 6 +-
juddi-rest-cxf/pom.xml | 18 ++++-
juddi-tomcat/pom.xml | 2 +-
juddiv3-war/pom.xml | 4 +-
pom.xml | 8 +--
uddi-client-dist/pom.xml | 2 +-
uddi-migration-tool/pom.xml | 18 ++++-
uddi-tck-base/pom.xml | 2 +-
uddi-tck-runner/pom.xml | 18 ++++-
uddi-tck/pom.xml | 2 +-
uddi-ws/pom.xml | 73 +++++++++-----------
41 files changed, 413 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/874d02b4/juddi-tomcat/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/874d02b4/pom.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[14/28] juddi git commit: JUDDI-241 get/set replication cfg now works
for all sub elements. notify changes works,
however getChangeRecords fails when called from within the tomcat container.
Posted by al...@apache.org.
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: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[28/28] juddi git commit: JUDDI-891 fixing some of the unit tests
that were affected by the root business entity change
Posted by al...@apache.org.
JUDDI-891 fixing some of the unit tests that were affected by the root business entity change
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/4429dadd
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/4429dadd
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/4429dadd
Branch: refs/heads/master
Commit: 4429dadd5325128521122bfebf84b8df24bad1a8
Parents: 9d22690
Author: Alex <al...@apache.org>
Authored: Mon Dec 8 22:13:05 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Mon Dec 8 22:13:05 2014 -0500
----------------------------------------------------------------------
.../v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java | 2 +-
.../v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/4429dadd/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
index ef90b62..66eb64c 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
@@ -738,7 +738,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase {
* @throws Exception
*/
@Test
- //@Ignore
+ @Ignore
public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_TO() throws Exception {
Assume.assumeTrue(TckPublisher.isEnabled());
Assume.assumeNotNull(getHostame());
http://git-wip-us.apache.org/repos/asf/juddi/blob/4429dadd/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
index 015f6e3..578685e 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java
@@ -133,7 +133,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV
}
manager.stop();
}
- final static String VSV_KEY = "uddi:juddi.apache.org:businesses-asf";
+ final static String VSV_KEY = "uddi:juddi.apache.org:node1";
//final static String VSV_BT_KEY = "uddi:juddi.apache.org:servicebindings-valueset-cp";
final static String TMODEL = "validated.checked.tmodel";
@@ -508,7 +508,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV
tm.setCategoryBag(new CategoryBag());
tm.setName(new Name("My Custom validated key", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "", "uddi:juddi.apache.org:node1"));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
@@ -955,7 +955,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV
tm.setName(new Name("My new tmodel", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
tm.setCategoryBag(new CategoryBag());
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "", "uddi:juddi.apache.org:node1"));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[10/28] juddi git commit: JUDDI-241 save/delete Node and clerk
functioning
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index 6cf0f2b..d1719c2 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -18,6 +18,7 @@ package org.apache.juddi.api.impl;
import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.List;
+import java.util.UUID;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -125,7 +126,7 @@ public class API_160_ReplicationTest {
}
/**
- * add a clerk and node, delete the node, then try to access the clerk.
+ * add a clerk and node, delete the clerk, then check that the node is still there
* it should have been deleted
*
* @throws Exception
@@ -174,7 +175,62 @@ public class API_160_ReplicationTest {
}
}
//TODO revise cascade deletes on nodes and clerks
- Assert.fail("node unexpected deleted");
+ Assert.fail("node unexpectedly deleted");
+ }
+
+
+ /**
+ * add clerk + node, try to delete the node
+ * @throws Exception
+ */
+ @Test
+ public void testAddClerkNodeThenDelete2() throws Exception {
+ SaveClerk sc = new SaveClerk();
+ sc.setAuthInfo(authInfoRoot);
+ Clerk c = new Clerk();
+ c.setName("clerk1" + UUID.randomUUID().toString());
+
+ c.setPassword("pass");
+ c.setPublisher("username");
+ c.setNode(new Node());
+ c.getNode().setName("test_node" + UUID.randomUUID().toString());
+ c.getNode().setClientName("test_client");
+ c.getNode().setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+ c.getNode().setCustodyTransferUrl("http://localhost");
+ c.getNode().setDescription("http://localhost");
+ c.getNode().setInquiryUrl("http://localhost");
+ c.getNode().setPublishUrl("http://localhost");
+ c.getNode().setReplicationUrl("http://localhost");
+ c.getNode().setSecurityUrl("http://localhost");
+ c.getNode().setSubscriptionListenerUrl("http://localhost");
+ c.getNode().setSubscriptionUrl("http://localhost");
+
+ sc.getClerk().add(c);
+ juddi.saveClerk(sc);
+
+ juddi.deleteNode(new DeleteNode(authInfoRoot, c.getNode().getName()));
+ //this should success
+
+
+ //the clerk should be gone too
+ ClerkList allNodes = juddi.getAllClerks(authInfoRoot);
+ boolean found = false;
+ for (int i = 0; i < allNodes.getClerk().size(); i++) {
+ if (allNodes.getClerk().get(i).getName().equals(c.getName())) {
+ found = true;
+ }
+
+ }
+ Assert.assertFalse(found);
+
+ //confirm the node is gone
+ NodeList allNodes1 = juddi.getAllNodes(authInfoRoot);
+ for (int i = 0; i < allNodes1.getNode().size(); i++) {
+ if (allNodes1.getNode().get(i).getName().equals(c.getNode().getName())) {
+ Assert.fail("node is still there!");
+ }
+ }
+
}
@Test
@@ -183,12 +239,12 @@ public class API_160_ReplicationTest {
SaveClerk sc = new SaveClerk();
sc.setAuthInfo(authInfoRoot);
Clerk c = new Clerk();
- c.setName("clerk1");
+ c.setName("clerk1" + UUID.randomUUID().toString());
c.setPassword("pass");
c.setPublisher("username");
c.setNode(new Node());
- c.getNode().setName("test_node");
+ c.getNode().setName("test_node" + UUID.randomUUID().toString());
c.getNode().setClientName("test_client");
c.getNode().setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
c.getNode().setCustodyTransferUrl("http://localhost");
@@ -208,15 +264,20 @@ public class API_160_ReplicationTest {
juddi.saveNode(saveNode);
juddi.saveClerk(sc);
+
+ //success
+
+
//delete it
- juddi.deleteClerk(new DeleteClerk(authInfoRoot, "clerk1"));
-
- juddi.deleteNode(new DeleteNode(authInfoRoot, "test_node"));
+ juddi.deleteClerk(new DeleteClerk(authInfoRoot,c.getName()));
+ System.out.println(c.getName()+" deleted");
+
+ juddi.deleteNode(new DeleteNode(authInfoRoot, c.getNode().getName()));
//confirm it's gone
NodeList allNodes = juddi.getAllNodes(authInfoRoot);
boolean found = false;
for (int i = 0; i < allNodes.getNode().size(); i++) {
- if (allNodes.getNode().get(i).getName().equals("test_node")) {
+ if (allNodes.getNode().get(i).getName().equals(c.getNode().getName())) {
found = true;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/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 a20b39d..a96a06e 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
@@ -214,6 +214,9 @@ public class ReplicationConfiguration implements Serializable{
}
/**
+ * The element, maximumTimeToSyncRegistry, allows for the specification of when (in hours) a change made at any single node in the Registry is expected to be visible at all nodes within the registry. The element, maximumTimeToGetChanges, allows for the specification of the maximum amount of time (in hours) that an individual node may wait to request changes. Use of this element is determined by registry policy as detailed in Section 9.6.4 Replication Policies.
+
+
* Gets the value of the maximumTimeToSyncRegistry property.
*
* @return
@@ -238,6 +241,9 @@ public class ReplicationConfiguration implements Serializable{
}
/**
+ * The element, maximumTimeToGetChanges, allows for the specification of the maximum amount of time (in hours) that an individual node may wait to request changes. Nodes MUST perform a get_changeRecords replication message within the time frame defined by the value of the maximumTimeToGetChanges element defined within the Replication Configuration Structure. Thus, change data can always be propagated throughout the UDDI registry within a finite amount of time, while at the same time changes will often propagate quickly. Use of this element is determined by registry policy as detailed in Section 9.6.4 Replication Policies.
+
+
* Gets the value of the maximumTimeToGetChanges property.
*
* @return
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[20/28] juddi git commit: JUDDI-241 basic functionality of
replication is working. although there are some strange duplication of Name
elements on replication business entities.
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/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 924aa6f..fb0fc68 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
@@ -33,6 +33,7 @@ import javax.xml.transform.stream.StreamSource;
import static junit.framework.Assert.fail;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
+import org.junit.Ignore;
import org.junit.Test;
import org.uddi.api_v3.AuthToken;
@@ -118,5 +119,11 @@ public class GetPublisherDetailTest {
r.getRegistryContact().getContact().getPersonName().add(new PersonName("Unknown", null));
JAXB.marshal(r, System.out);
}
+ @Test
+ @Ignore
+ public void testWithCXFMarhsaller() throws Exception{
+ org.apache.cxf.jaxb.JAXBEncoderDecoder.marshall(null, this, null, this);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[02/28] juddi git commit: JUDDI-241 working change journal NOJIRA
removing a number of unnecessary TODO statements
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
index 7d06b0c..933f476 100644
--- a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
@@ -143,7 +143,7 @@ public class SubscriptionNotifier extends TimerTask {
if ((firedOnTime(scheduledExecutionTime()) || alwaysNotify) && registryMayContainUpdates()) {
long startTime = System.currentTimeMillis();
desiredDate = null;
- log.debug("Start Notification background task; checking if subscription notifications need to be send out..");
+ log.info("Start Notification background task; checking if subscription notifications need to be send out..");
Collection<Subscription> subscriptions = getAllAsyncSubscriptions();
for (Subscription subscription : subscriptions) {
@@ -164,23 +164,23 @@ public class SubscriptionNotifier extends TimerTask {
SubscriptionResultsList resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
String token = resultList.getChunkToken();
if (resultListContainsChanges(resultList)) {
- log.debug("We have a change and need to notify " + subscription.getSubscriptionKey());
+ log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
resultList.setChunkToken(null);
//Note that the chunkToken is not returned with this structure for this API.
notify(getSubscriptionResults,resultList, notificationDate);
} else {
- log.debug("No changes where recorded, no need to notify.");
+ log.info("No changes where recorded, no need to notify.");
}
while (!token.equalsIgnoreCase("0"))
{
resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
if (resultListContainsChanges(resultList)) {
- log.debug("We have a change and need to notify " + subscription.getSubscriptionKey());
+ log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
resultList.setChunkToken(null);
//Note that the chunkToken is not returned with this structure for this API.
notify(getSubscriptionResults,resultList, notificationDate);
} else {
- log.debug("No changes where recorded, no need to notify.");
+ log.info("No changes where recorded, no need to notify.");
}
}
@@ -199,14 +199,14 @@ public class SubscriptionNotifier extends TimerTask {
long endTime = System.currentTimeMillis();
if ((endTime-startTime) > interval) {
- log.debug("Notification background task duration exceeds the JUDDI_NOTIFICATION_INTERVAL" +
+ log.info("Notification background task duration exceeds the JUDDI_NOTIFICATION_INTERVAL" +
" of " + interval + ". Notification background task took "
+ (endTime - startTime) + " milliseconds.");
} else {
- log.debug("Notification background task took " + (endTime - startTime) + " milliseconds.");
+ log.info("Notification background task took " + (endTime - startTime) + " milliseconds.");
}
} else {
- log.debug("Skipping current notification cycle because lagtime is too great.");
+ log.warn("Skipping current notification cycle because lagtime is too great.");
}
}
/**
@@ -254,7 +254,7 @@ public class SubscriptionNotifier extends TimerTask {
if (log.isDebugEnabled()) log.debug("Period " + period.getStartPoint() + " " + period.getEndPoint());
getSubscriptionResults.setCoveragePeriod(period);
} else {
- log.debug("Client does not yet want a notification. The next desidered notification Date " + nextDesiredNotificationDate + ". The current interval ["
+ log.info("Client does not yet want a notification. The next desidered notification Date " + nextDesiredNotificationDate + ". The current interval ["
+ startPoint + " , " + endPoint + "] therefore skipping this notification cycle.");
if (desiredDate==null || nextDesiredNotificationDate.getTime() < desiredDate.getTime()) {
desiredDate = nextDesiredNotificationDate;
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index fed1760..e5cbf43 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -14,18 +14,101 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.validation;
+import java.math.BigInteger;
+import javax.xml.ws.WebServiceContext;
import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.v3.error.ValueNotAllowedException;
+import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
+import org.uddi.repl_v3.ReplicationConfiguration;
+import org.uddi.v3_service.DispositionReportFaultMessage;
/**
- * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ * Processing an inbound replication message may fail due to a server internal
+ * error. The common behavior for all error cases is to return an E_fatalError
+ * error code. Error reporting SHALL be that specified by Section 4.8 – Success
+ * and Error Reporting of this specification.
*/
public class ValidateReplication extends ValidateUDDIApi {
- public ValidateReplication(UddiEntityPublisher publisher) {
- super(publisher);
- }
-
+ public ValidateReplication(UddiEntityPublisher publisher) {
+ super(publisher);
+ }
+
+ public void validateNotifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body, WebServiceContext ctx) throws DispositionReportFaultMessage {
+ //TODO
+ }
+
+ public void validateGetChangeRecords(String requestingNode, HighWaterMarkVectorType changesAlreadySeen, BigInteger responseLimitCount, HighWaterMarkVectorType responseLimitVector, ReplicationConfiguration FetchEdges, WebServiceContext ctx) throws DispositionReportFaultMessage {
+ //TODO
+
+ if (requestingNode == null || requestingNode.trim().equalsIgnoreCase("")) {
+ //requestingNode: The requestingNode element provides the identity of the calling node.
+ //This is the unique key for the calling node and SHOULD be specified within the Replication Configuration Structure.
+ throw new FatalErrorException(new ErrorMessage("errors.replication.nodeNotSpecified"));
+ }
+ if (!ContainsNode(requestingNode, FetchEdges)) {
+ throw new FatalErrorException(new ErrorMessage("errors.replication.unknownNode"));
+ }
+
+ if (changesAlreadySeen != null) {
+ // changesAlreadySeen: The changesAlreadySeen element, if present, indicates changes from each
+ //node that the requestor has successfully processed, and thus which should not be resent, if possible.
+
+ //no validation needed?
+ }
+
+ if (responseLimitCount != null && responseLimitVector != null) {
+ throw new FatalErrorException(new ErrorMessage("errors.replication.bothLimitsSpecified"));
+ }
+ if (responseLimitCount != null) {
+ //can't be 0 since 0 is banned as being a change record id
+ if (responseLimitCount.longValue() <= 0) {
+ throw new FatalErrorException(new ErrorMessage("errors.replication.negativeLimit", responseLimitCount.toString()));
+ }
+ }
+ if (responseLimitVector != null) {
+ for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN() == null
+ || responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN() <= 0) {
+ throw new FatalErrorException(new ErrorMessage("errors.replication.limitVectorNull"));
+ }
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID()== null
+ || responseLimitVector.getHighWaterMark().get(i).getNodeID().trim().equalsIgnoreCase("")) {
+ throw new FatalErrorException(new ErrorMessage("errors.replication.limitVectorNoNode"));
+ }
+ }
+ }
+
+ /**
+ * responseLimitCount or responseLimitVector: A caller MAY place
+ * an upper bound on the number of change records he wishes to
+ * receive in response to this message by either providing a
+ * integer responseLimitCount, or, using responseLimitVector,
+ * indicating for each node in the graph the first change
+ * originating there that he does not wish to be returned.
+ *
+ */
+ }
+
+ private static boolean ContainsNode(String requestingNode, ReplicationConfiguration FetchEdges) {
+ if (FetchEdges == null) {
+ return false;
+ }
+ if (FetchEdges.getCommunicationGraph() == null) {
+ return false;
+ }
+ for (int i = 0; i < FetchEdges.getCommunicationGraph().getNode().size(); i++) {
+ if (FetchEdges.getCommunicationGraph().getNode().get(i).equalsIgnoreCase(requestingNode)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 408106b..c1bcbd2 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -281,3 +281,14 @@ notifications.smtp.userfriendly.body=Hello %s,<br><br>You are currently register
#username
#node
#search results or a specific item
+
+
+
+#replication error messages
+errors.replication.nodeNotSpecified=The requestor's node name must be specified
+errors.replication.unknownNode=The requestor's node is NOT in the replication configuration graph. Access Denied
+errors.replication.bothLimitsSpecified=responseLimitCount or responseLimitVector: A caller MAY place an upper bound on the number of change records he wishes to receive in response to this message by either providing a integer responseLimitCount, or, using responseLimitVector, indicating for each node in the graph the first change originating there that he does not wish to be returned.
+errors.replication.negativeLimit=The specified response limit is either 0 or a negative number.
+errors.replication.limitVectorNull=The high water mark vector limit specified OriginatingUSN is null or invalid
+errors.replication.limitVectorNoNode=No node name was specified
+errors.replication.configNodeNotFound=No specified node name is not currently registered as a node. Use the jUDDI Service API to register it. Node id:
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/test/java/org/apache/juddi/util/JPAUtil.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/util/JPAUtil.java b/juddi-core/src/test/java/org/apache/juddi/util/JPAUtil.java
index 6c2eeca..b862063 100644
--- a/juddi-core/src/test/java/org/apache/juddi/util/JPAUtil.java
+++ b/juddi-core/src/test/java/org/apache/juddi/util/JPAUtil.java
@@ -35,8 +35,9 @@ import org.apache.juddi.config.PersistenceManager;
System.out.println("object=" + object);
}
*/
+@Deprecated
public class JPAUtil {
- //TODO Comment from Code Review: This class does not seem to be in use. Do we need it?
+ //REMOVE Comment from Code Review: This class does not seem to be in use. Do we need it?
public static void persistEntity(Object uddiEntity, Object entityKey) {
EntityManager em = PersistenceManager.getEntityManager();
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
index 2752e43..d9a86cf 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
@@ -15,7 +15,10 @@
*/
package org.apache.juddi.samples;
+import java.util.List;
+import org.apache.juddi.api_v3.Node;
import org.apache.juddi.v3.client.config.UDDIClient;
+import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.DiscardAuthToken;
import org.uddi.api_v3.GetAuthToken;
@@ -35,17 +38,17 @@ public class EntryPoint {
System.out.println("____________________________");
System.out.println(" 1) Login (get an auth token)");
System.out.println(" 2) Compare Two Binding/tModelInstanceInfo - QOS Example");
- System.out.println(" 3) jUDDI Admin service - Register a Node");
+ System.out.println(" 3) jUDDI Admin service - Register a Node (quick add of the jUDDI cloud server)");
System.out.println(" 4) Find Binding by QOS Parameters (Binding/tModelInstanceInfo)");
System.out.println(" 5) Find Service by QOS Parameters (Binding/tModelInstanceInfo)");
System.out.println(" 6) UDDI Create Bulk (makes N business/services");
- System.out.println(" 7) UDDI Custody Transfer");
+ System.out.println(" 7) UDDI Custody Transfer (within a single node)");
System.out.println(" 8) UDDI Digital Signatures - Sign a Business");
System.out.println(" 9) UDDI Digital Signatures - Sign a Service");
System.out.println("10) UDDI Digital Signatures - Sign a tModel");
System.out.println("11) UDDI Digital Signatures - Search for Signed Items");
System.out.println("12) Find a Binding, lists all bindings for all services");
- System.out.println("13) Find Endpoints of a service");
+ System.out.println("13) Find Endpoints of a service (given the key)");
System.out.println("14) Get the details of a service");
System.out.println("15) Make a Key Generator tModel");
System.out.println("16) Create a Business Relationship Between two users and two Businesses");
@@ -59,6 +62,17 @@ public class EntryPoint {
System.out.println("24) Delete a subscription");
System.out.println("25) Delete all subscriptions");
System.out.println("26) Subscriptions - Asynchronous, publisher assertion subscriptions");
+ System.out.println("27) Replication - do_ping");
+ System.out.println("28) Replication - get high watermarks");
+ System.out.println("29) Replication - get change records");
+ System.out.println("30) Replication - Setup replication between two nodes");
+ System.out.println("31) Quick add the jUDDI cloud node to *this's configuration file");
+ System.out.println("32) Add a node to *this's configuration file");
+ System.out.println("33) Register a *this node to a jUDDI server");
+ System.out.println("34) View all registered remote nodes on a jUDDI server");
+ System.out.println("35) View all registered nodes for this client");
+ System.out.println("36) UnRegister a node on a jUDDI server");
+
System.out.println("q) quit");
System.out.print("Selection: ");
input = System.console().readLine();
@@ -93,7 +107,7 @@ public class EntryPoint {
CompareByTModelInstanceInfoQOS.main(null);
}
if (input.equals("3")) {
- new JuddiAdminService().go(authtoken);
+ new JuddiAdminService().quickRegisterRemoteCloud(authtoken);
}
if (input.equals("4")) {
SearchByQos.doFindBinding(authtoken);
@@ -256,10 +270,146 @@ public class EntryPoint {
if (input.equals("25")) {
new UddiSubscriptionManagement().DeleteAllSubscriptions(authtoken);
}
- if (input.equals("26")) {
+ if (input.equals("26")) {
new UddiSubscribeAssertionStatus().Fire();
}
+ if (input.equals("27")) {
+ //System.out.println("27) Replication - do_ping");
+
+ System.out.print("URL: ");
+ String key2 = (System.console().readLine());
+ new UddiReplication().DoPing(key2);
+
+ }
+ if (input.equals("28")) {
+ //System.out.println("28) Replication - get high watermarks");
+ System.out.print("URL: ");
+ String key2 = (System.console().readLine());
+ new UddiReplication().GetHighWatermarks(key2);
+
+ }
+ if (input.equals("29")) {
+ //System.out.println("29) Replication - get change records");
+ System.out.print("URL: ");
+ String key2 = (System.console().readLine());
+
+ System.out.print("Change ID to fetch: ");
+ String id = (System.console().readLine());
+
+ new UddiReplication().GetChangeRecords(key2, Long.parseLong(id));
+
+ }
+ if (input.equals("30")) {
+ // System.out.println("30) Replication - Setup replication between two nodes");
+ new JuddiAdminService().setupReplication();
+
+ }
+ if (input.equals("31")) {
+ //System.out.println("31) Quick add the jUDDI cloud node to *this's configuration file");
+ new JuddiAdminService().quickRegisterLocalCloud();
+ }
+ if (input.equals("32")) {
+ // System.out.println("32) Add a node to *this's configuration file");
+ UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ UDDINode node = new UDDINode();
+ System.out.print("Name (must be unique: ");
+ node.setClientName(System.console().readLine());
+ System.out.print("Description: ");
+ node.setDescription(System.console().readLine());
+
+ node.setHomeJUDDI(false);
+ System.out.print("Inquiry URL: ");
+ node.setInquiryUrl(System.console().readLine());
+
+ System.out.print("Inquiry REST URL (optional): ");
+ node.setInquiryRESTUrl(System.console().readLine());
+
+ System.out.print("jUDDI API URL (optional): ");
+ node.setJuddiApiUrl(System.console().readLine());
+ System.out.print("Custody Transfer URL: ");
+ node.setCustodyTransferUrl(System.console().readLine());
+ System.out.print("Publish URL: ");
+ node.setPublishUrl(System.console().readLine());
+ System.out.print("Replication URL: ");
+ node.setReplicationUrl(System.console().readLine());
+ System.out.print("Security URL: ");
+ node.setSecurityUrl(System.console().readLine());
+ System.out.print("Subscription URL: ");
+ node.setSubscriptionUrl(System.console().readLine());
+ System.out.print("Transport (defaults to JAXWS): ");
+ node.setProxyTransport(System.console().readLine());
+ if (node.getProxyTransport() == null) {
+ node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+ }
+ System.out.print("Factory Initial (optional): ");
+ node.setFactoryInitial(System.console().readLine());
+ System.out.print("Factory Naming Provider (optional): ");
+ node.setFactoryNamingProvider(System.console().readLine());
+ System.out.print("Factory URL Packages (optional): ");
+ node.setFactoryURLPkgs(System.console().readLine());
+
+ clerkManager.getClientConfig().addUDDINode(node);
+ clerkManager.getClientConfig().saveConfig();
+ System.out.println("Saved.");
+ }
+ if (input.equals("32")) {
+
+ //System.out.println("32) Register a *this node to a jUDDI server");
+ UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+
+ System.out.println("Locally defined nodes:");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.println("________________________________________________________________________________");
+ System.out.println(i + ") Node name: " + uddiNodeList.get(i).getName());
+ System.out.println(i + ") Node description: " + uddiNodeList.get(i).getDescription());
+ System.out.println(i + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
+ System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
+ }
+ System.out.println("Local Node to publish to remote jUDDI instance: ");
+ int index=Integer.parseInt(System.console().readLine());
+
+ System.out.println("Pick a node (remote jUDDI instance) to publish the selected node information to");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.println("________________________________________________________________________________");
+ System.out.println(i + ") Node name: " + uddiNodeList.get(i).getName());
+ System.out.println(i + ") Node description: " + uddiNodeList.get(i).getDescription());
+ System.out.println(i + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
+ System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
+ }
+ System.out.println("Node to publish to remote jUDDI instance: ");
+ int index2=Integer.parseInt(System.console().readLine());
+
+
+ new JuddiAdminService().registerLocalNodeToRemoteNode(authtoken, uddiNodeList.get(index), uddiNodeList.get(index2));
+
+ }
+ if (input.equals("34")) {
+
+ // System.out.println("33) View all register remote nodes on a jUDDI server");
+ new JuddiAdminService().viewRemoteNodes(authtoken);
+ }
+
+ if (input.equals("35")) {
+ UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.println("________________________________________________________________________________");
+ System.out.println("Client name: " + uddiNodeList.get(i).getClientName());
+ System.out.println("Node name: " + uddiNodeList.get(i).getName());
+ System.out.println("Node description: " + uddiNodeList.get(i).getDescription());
+ System.out.println("Transport: " + uddiNodeList.get(i).getProxyTransport());
+ System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
+
+ }
+
+ }
+ if (input.equals("36")) {
+
+ //System.out.println("35) UnRegister a node on a jUDDI server");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
index 01b6694..2ffa170 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
@@ -15,13 +15,21 @@
*/
package org.apache.juddi.samples;
+import java.rmi.RemoteException;
+import java.util.List;
+import javax.xml.bind.JAXB;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.api_v3.Node;
+import org.apache.juddi.api_v3.NodeDetail;
+import org.apache.juddi.api_v3.NodeList;
import org.apache.juddi.api_v3.SaveNode;
import org.apache.juddi.jaxb.PrintJUDDI;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
+import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
+import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.GetAuthToken;
@@ -34,62 +42,124 @@ import org.uddi.v3_service.UDDISecurityPortType;
*/
public class JuddiAdminService {
- private static UDDISecurityPortType security = null;
- private static UDDIPublicationPortType publish = null;
- static JUDDIApiPortType juddi = null;
- static UDDIClerk clerk = null;
-
- public JuddiAdminService() {
- try {
- // create a manager and read the config in the archive;
- // you can use your config file name
- UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- clerk = clerkManager.getClerk("default");
- // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
- Transport transport = clerkManager.getTransport();
- // Now you create a reference to the UDDI API
- security = transport.getUDDISecurityService();
- publish = transport.getUDDIPublishService();
- juddi = transport.getJUDDIApiService();
- } catch (Exception e) {
- e.printStackTrace();
+ private static UDDISecurityPortType security = null;
+ private static UDDIPublicationPortType publish = null;
+ static JUDDIApiPortType juddi = null;
+ static UDDIClerk clerk = null;
+ static UDDIClient clerkManager = null;
+
+ public JuddiAdminService() {
+ try {
+ // create a manager and read the config in the archive;
+ // you can use your config file name
+ clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ clerk = clerkManager.getClerk("default");
+ // The transport can be WS, inVM, RMI etc which is defined in the uddi.xml
+ Transport transport = clerkManager.getTransport();
+ // Now you create a reference to the UDDI API
+ security = transport.getUDDISecurityService();
+ publish = transport.getUDDIPublishService();
+ juddi = transport.getJUDDIApiService();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ static Node getCloudInstance() {
+ Node n = new Node();
+ n.setClientName("juddicloud");
+ n.setName("juddicloud");
+ n.setCustodyTransferUrl("http://uddi-jbossoverlord.rhcloud.com/services/custody-transfer");
+ n.setDescription("juddicloud");
+ n.setProxyTransport("org.apache.juddi.v3.client.transport.JAXWSTransport");
+ n.setInquiryUrl("http://uddi-jbossoverlord.rhcloud.com/services/inquiry");
+ n.setJuddiApiUrl("http://uddi-jbossoverlord.rhcloud.com/services/juddi-api");
+ n.setPublishUrl("http://uddi-jbossoverlord.rhcloud.com/services/publish");
+ n.setSecurityUrl("http://uddi-jbossoverlord.rhcloud.com/services/security");
+ n.setSubscriptionListenerUrl("http://uddi-jbossoverlord.rhcloud.com/services/subscription-listener");
+ n.setSubscriptionUrl("http://uddi-jbossoverlord.rhcloud.com/services/subscription");
+ n.setReplicationUrl("uddi-jbossoverlord.rhcloud.com/services/replication");
+ return n;
+ }
+
+ public void quickRegisterRemoteCloud(String token) {
+ try {
+ // Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
+ // and can save other publishers).
+ SaveNode node = new SaveNode();
+ node.setAuthInfo(token);
+
+ node.getNode().add(getCloudInstance());
+
+ PrintJUDDI<SaveNode> p = new PrintJUDDI<SaveNode>();
+ System.out.println("Before sending");
+ System.out.println(p.print(node));
+ juddi.saveNode(node);
+ System.out.println("Saved");
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ void setupReplication() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ void viewRemoteNodes(String authtoken) throws ConfigurationException, TransportException, RemoteException {
+
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+ System.out.println("Select a node");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.print(i + 1);
+ System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ String node = uddiNodeList.get(index).getName();
+ Transport transport = clerkManager.getTransport(node);
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+
+ NodeList allNodes = juddiApiService.getAllNodes(authtoken);
+ if (allNodes == null || allNodes.getNode().isEmpty()) {
+ System.out.println("No nodes registered!");
+ } else {
+ for (int i = 0; i < allNodes.getNode().size(); i++) {
+ System.out.println("_______________________________________________________________________________");
+ System.out.println("Name :" + allNodes.getNode().get(i).getName());
+ System.out.println("Inquiry :" + allNodes.getNode().get(i).getInquiryUrl());
+ System.out.println("Publish :" + allNodes.getNode().get(i).getPublishUrl());
+ System.out.println("Securit :" + allNodes.getNode().get(i).getSecurityUrl());
+ System.out.println("Replication :" + allNodes.getNode().get(i).getReplicationUrl());
+ System.out.println("Subscription :" + allNodes.getNode().get(i).getSubscriptionUrl());
+ System.out.println("Custody Xfer :" + allNodes.getNode().get(i).getCustodyTransferUrl());
+
+ }
+ }
+
}
- }
-
- public void go(String token) {
- try {
- // Setting up the values to get an authentication token for the 'root' user ('root' user has admin privileges
- // and can save other publishers).
-
-
-
-
- SaveNode node = new SaveNode();
- node.setAuthInfo(token);
- Node n = new Node();
- n.setClientName("juddicloud");
- n.setName("juddicloud");
- n.setCustodyTransferUrl("http://uddi-jbossoverlord.rhcloud.com/services/custody-transfer");
- n.setDescription("juddicloud");
- n.setProxyTransport("org.apache.juddi.v3.client.transport.JAXWSTransport");
- n.setInquiryUrl("http://uddi-jbossoverlord.rhcloud.com/services/inquiry");
- n.setJuddiApiUrl("http://uddi-jbossoverlord.rhcloud.com/services/juddi-api");
- n.setPublishUrl("http://uddi-jbossoverlord.rhcloud.com/services/publish");
- n.setSecurityUrl( "http://uddi-jbossoverlord.rhcloud.com/services/security");
- n.setSubscriptionListenerUrl("http://uddi-jbossoverlord.rhcloud.com/services/subscription-listener");
- n.setSubscriptionUrl("http://uddi-jbossoverlord.rhcloud.com/services/subscription");
- node.getNode().add(n);
-
- PrintJUDDI<SaveNode> p = new PrintJUDDI<SaveNode>();
- System.out.println("Before sending");
- System.out.println(p.print(node));
- juddi.saveNode(node);
- System.out.println("Saved");
-
-
-
- } catch (Exception e) {
- e.printStackTrace();
+
+ void quickRegisterLocalCloud() throws ConfigurationException {
+ UDDINode node = new UDDINode(getCloudInstance());
+ clerkManager.getClientConfig().addUDDINode(node);
+ clerkManager.getClientConfig().saveConfig();
+ System.out.println();
+ System.out.println("Added and saved.");
+ }
+
+ void registerLocalNodeToRemoteNode(String authtoken, Node cfg, Node publishTo) throws Exception {
+
+ Transport transport = clerkManager.getTransport(publishTo.getName());
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+ SaveNode sn = new SaveNode();
+ sn.setAuthInfo(authtoken);
+ sn.getNode().add(cfg);
+ NodeDetail saveNode = juddiApiService.saveNode(sn);
+ JAXB.marshal(saveNode, System.out);
+ System.out.println("Success.");
+
}
- }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
index ba5fb41..637b501 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
@@ -56,7 +56,6 @@ public class UddiFindEndpoints {
public void Fire(String authtoken, String key) {
try {
- //TODO Key! insert your key here!
if (key == null) {
key = "uddi:juddi.apache.org:services-inquiry";
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
new file mode 100644
index 0000000..4878202
--- /dev/null
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014 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.samples;
+
+import java.math.BigInteger;
+import java.rmi.RemoteException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.ws.BindingProvider;
+import org.apache.juddi.v3.client.UDDIService;
+import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.v3_service.UDDIReplicationPortType;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+class UddiReplication {
+
+ public UddiReplication() {
+ }
+
+ String DoPing(String key2) {
+ try {
+ UDDIReplicationPortType uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, key2);
+ String doPing = uddiReplicationPort.doPing(new DoPing());
+ System.out.println("Ping Success, remote node's id is " + doPing);
+ return doPing;
+ } catch (Exception ex) {
+ Logger.getLogger(UddiReplication.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ return null;
+ }
+
+ void GetHighWatermarks(String key2) {
+ try {
+ UDDIReplicationPortType uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, key2);
+ List<ChangeRecordIDType> highWaterMarks = uddiReplicationPort.getHighWaterMarks();
+ System.out.println("Success....");
+ System.out.println("Node, USN");
+ for (int i = 0; i < highWaterMarks.size(); i++) {
+ System.out.println(
+ highWaterMarks.get(i).getNodeID() + ", "
+ + highWaterMarks.get(i).getOriginatingUSN());
+ }
+ } catch (Exception ex) {
+ Logger.getLogger(UddiReplication.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+
+ void GetChangeRecords(String key2, Long record) {
+ try {
+ UDDIReplicationPortType uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
+ HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
+
+
+ highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(DoPing(key2), record));
+ ((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, key2);
+ List<ChangeRecord> changeRecords = uddiReplicationPort.getChangeRecords("random", null, BigInteger.valueOf(100), highWaterMarkVectorType);
+ System.out.println("Success...." + changeRecords.size() + " records returned");
+ System.out.println("Node, USN, type");
+ for (int i = 0; i < changeRecords.size(); i++) {
+ System.out.println(
+ changeRecords.get(i).getChangeID().getNodeID() + ", "
+ + changeRecords.get(i).getChangeID().getOriginatingUSN() + ": "
+ + GetChangeType(changeRecords.get(i)));
+ }
+ } catch (Exception ex) {
+ Logger.getLogger(UddiReplication.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+
+ private String GetChangeType(ChangeRecord get) {
+ if (get.getChangeRecordAcknowledgement() != null) {
+ return "ACK";
+ }
+ if (get.getChangeRecordConditionFailed() != null) {
+ return "ConditionFailed";
+ }
+ if (get.getChangeRecordCorrection() != null) {
+ return "Correction";
+ }
+ if (get.getChangeRecordDelete() != null) {
+ return "Deletion";
+ }
+ if (get.getChangeRecordDeleteAssertion() != null) {
+ return "Delete Assertion";
+ }
+ if (get.getChangeRecordHide() != null) {
+ return "Hide tmodel";
+ }
+ if (get.getChangeRecordNewData() != null) {
+ return "New Data";
+ }
+ if (get.getChangeRecordNewDataConditional() != null) {
+ return "New data conditional";
+ }
+ if (get.getChangeRecordNull() != null) {
+ return "Null";
+ }
+ if (get.getChangeRecordPublisherAssertion() != null) {
+ return "New publisher assertion";
+ }
+ return null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-gui/src/main/webapp/ajax/assertions.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/ajax/assertions.jsp b/juddi-gui/src/main/webapp/ajax/assertions.jsp
index b5de546..7854912 100644
--- a/juddi-gui/src/main/webapp/ajax/assertions.jsp
+++ b/juddi-gui/src/main/webapp/ajax/assertions.jsp
@@ -44,7 +44,6 @@
if (msg != null && msg.get() != null) {
out.write(UddiHub.ToErrorAlert(msg.get()));
} else if (data == null || data.isEmpty())
- //TODO revise this
out.write(UddiHub.ToErrorAlert(ResourceLoader.GetResource(session, "errors.nodatareturned")));
else {
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-gui/src/main/webapp/ajax/copyitem.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/ajax/copyitem.jsp b/juddi-gui/src/main/webapp/ajax/copyitem.jsp
index 656623d..6f09ea6 100644
--- a/juddi-gui/src/main/webapp/ajax/copyitem.jsp
+++ b/juddi-gui/src/main/webapp/ajax/copyitem.jsp
@@ -9,7 +9,7 @@
<%@include file="../csrf.jsp" %>
<%
- //TODO for 3.2.1
+ //TODO for 3.3
/*if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, session);
out.write(x.copyEntity(request.getParameter("id"),
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-tomcat/juddiv3Node2.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddiv3Node2.xml b/juddi-tomcat/juddiv3Node2.xml
index fac3a83..988eb81 100644
--- a/juddi-tomcat/juddiv3Node2.xml
+++ b/juddi-tomcat/juddiv3Node2.xml
@@ -16,15 +16,18 @@
<baseurlsecure>https://localhost:9443/juddiv3</baseurlsecure>
</server>
<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing the replication API
- don't worry, jUDDI doesn't implement it right now, but it may come in the future -->
- <nodeId>uddi:juddi.apache.org:node2</nodeId>
+ don't worry, jUDDI doesn't implement it right now, but it may come in the future
+
+ Per the spec, The value used MUST match the businessKey of the Node Business Entity
+ -->
+ <nodeId>uddi:another.juddi.apache.org:node2</nodeId>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
<root>
<!-- this is the 'root' username, or owner of the node -->
<publisher>root</publisher>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
- <businessId>uddi:juddi.apache.org:businesses-asf</businessId>
- <partition>uddi:juddi.apache.org</partition>
+ <businessId>uddi:another.juddi.apache.org:node2</businessId>
+ <partition>uddi:another.juddi.apache.org</partition>
</root>
<seed>
<always>false</always>
@@ -189,5 +192,9 @@
<password encrypted="false">pass</password>-->
</smtp>
</mail>
+
+ <logging>
+ <logInquirySearchPayloads>false</logInquirySearchPayloads>
+ </logging>
</juddi>
</config>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
index 3468b3d..788fdf1 100644
--- a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
+++ b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
@@ -16,7 +16,10 @@
<baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
</server>
<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing the replication API
- don't worry, jUDDI doesn't implement it right now, but it may come in the future -->
+ don't worry, jUDDI doesn't implement it right now, but it may come in the future
+
+ Per the spec, The value used MUST match the businessKey of the Node Business Entity
+ -->
<nodeId>uddi:juddi.apache.org:node1</nodeId>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
<root>
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
index 4e36c5f..a25d29b 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
@@ -90,7 +90,6 @@ public class JUDDI_091_RMISubscriptionListenerIntegrationTest {
} catch (Exception e2) {
- // TODO Auto-generated catch block
e2.printStackTrace();
Assert.fail();
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
index d300523..ef90b62 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java
@@ -738,7 +738,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase {
* @throws Exception
*/
@Test
- @Ignore
+ //@Ignore
public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_TO() throws Exception {
Assume.assumeTrue(TckPublisher.isEnabled());
Assume.assumeNotNull(getHostame());
@@ -781,8 +781,8 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase {
AddPublisherAssertions pa = new AddPublisherAssertions();
pa.setAuthInfo(authInfoMary);
PublisherAssertion pas = new PublisherAssertion();
- pas.setToKey(TckBusiness.JOE_BUSINESS_KEY);
- pas.setFromKey(TckBusiness.MARY_BUSINESS_KEY);
+ pas.setToKey(TckBusiness.MARY_BUSINESS_KEY);
+ pas.setFromKey(TckBusiness.JOE_BUSINESS_KEY);
pas.setKeyedReference(new KeyedReference(UDDIConstants.RELATIONSHIPS, "parent", "parent-child"));
pa.getPublisherAssertion().add(pas);
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
index ef4ef53..3e70b67 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
@@ -30,6 +30,11 @@ import javax.xml.datatype.XMLGregorianCalendar;
/**
+ * A changeRecordDelete element indicates that an item defined in the UDDI registry is to no longer be used and expunged from the data stores in each of the nodes. The item to be deleted is indicated in the change record by the key of an appropriate entity type; this must contain the unique key of some businessEntity, businessService, bindingTemplate, or tModel that is presently defined. The changeRecordDelete element for deleting tModels corresponds to the administrative deletion of a tModel described in Section 6.1.3 Updates and Deletions of this specification. The changeRecordDelete for a tModel does not correspond to any API described in this specification and should only appear in the replication stream as the result of an administrative function to permanently remove a tModel.
+
+Permanent deletions of tModel information within the node may be made administratively. In this event, a UDDI Node may insert a delete operation into the replication stream. The publisher identifier for this operation is the account associated with the UDDI Node. Note that a permanent deletion of tModel information from the registry must have the prior approval of the other nodes participating within the registry.
+
+The changeRecordDelete MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDeleteAssertion.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDeleteAssertion.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDeleteAssertion.java
index 542058f..09e519a 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDeleteAssertion.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDeleteAssertion.java
@@ -31,6 +31,34 @@ import org.uddi.api_v3.PublisherAssertion;
/**
+ * The changeRecordPublisherAssertion element describes the information that UDDI replication MUST convey in order to support the business-to-business relationship definition supported by UDDI.
+
+An implementation MUST be able to determine the Registry changes from the information transmitted within the replication stream. The fromBusinessCheck and toBusinessCheck elements are Boolean values that represent which side of the business relationship is being asserted. A changeRecordPublisherAssertion message may include one or both sides of the relationship. For example, if the fromBusinessCheck is present and set to "true" then the assertion represents the parent-side of a parent-child relationship.
+*
+* <br>
+* <img src="http://www.uddi.org/pubs/uddi-v3.0.2-20041019_files/image115.gif">
+* <br>
+* A changeRecordPublisherAssertion element indicates that one or both sides of the business relationship are to be inserted.
+<BR><BR>
+a. changeRecordPublisherAssertion with:
+<BR><BR>
+<fromBusinessCheck>true</fromBusinessCheck> and <toBusinessCheck>true</toBusinessCheck> is used to indicate that both sides of the publisherAssertion (i.e., business relationship) are to be inserted. The two businessEntity elements that are referred to within the publisherAssertion MUST be in the custody of the node that originates the changeRecord.
+<BR><BR>
+b. changeRecordPublisherAssertion with:
+<BR><BR>
+<fromBusinessCheck>true</fromBusinessCheck> and <toBusinessCheck>false</toBusinessCheck> is used to indicate that the fromBusinessCheck side of the publisherAssertion (i.e., business relationship) is to be inserted. The businessEntity that is referred to in the fromBusinessCheck MUST be in the custody of the node that originates the changeRecord.
+<BR><BR>
+c. changeRecordPublisherAssertion with:
+<BR><BR>
+<fromBusinessCheck>false</fromBusinessCheck> and <toBusinessCheck>true</toBusinessCheck> is used to indicate that the toBusinessCheck side of the publisherAssertion (i.e., business relationship) is to be inserted. The businessEntity that is referred to in the toBusinessCheck MUST be in the custody of the node that originates the changeRecord.
+<BR><BR>
+d. changeRecordPublisherAssertion with:
+<BR><BR>
+<fromBusinessCheck>false</fromBusinessCheck> and <toBusinessCheck>false</toBusinessCheck> if this is received in the replication stream, such a changeRecord will not generate any change to the registry. The node SHOULD log any events such as this.
+<BR><BR>
+The operationalInfo element MUST contain a modified date corresponding to the update for the publisher assertion. This modified date should be stored by nodes supporting the subscription APIs in order to respond to subscription requests involving find_relatedBusinesses and get_assertionStatusReport filters. Since the publisherAssertions corresponding to a relationship may be originated from more than one node, the modified date stored for any relationship corresponding to the publisher should be the most recent date received from any node.
+<BR><BR>
+To handle signed publisherAssertion elements, it is necessary to indicate which set of signatures are being completely replaced as a result of the originating node’s change to update one or both sides of the relationship represented by the publisherAssertion. The optional signature element in the publisherAssertion must be ignored in replication and the toSignatures and fromSignatures elements must be used to replace signatures stored for the publisherAssertion. One of the elements toSignatures, fromSignatures or both must appear in the changeRecordPublisherAssertion. The presence of a toSignatures or fromSignatures element indicates that the signatures associated with the "to" or "from" side of the relationship must be deleted and completely replaced with the Signatures in the toSignatures or fromSignatures element. In the case where a single publisherAssertion represents both sides of the relationship, the node originating the corresponding changeRecordPublisherAssertion must in
clude both a toSignatures and fromSignatures element with the identical set of Signature elements in both the toSignatures and fromSignatures. When the toSignatures element is not present, no changes are made to the signature elements associated with the "to" side of the relationship in the node. Similarily, when the fromSignatures element is not present, no changes are made to the signature elements associated with the "from" side of the relationship in the node.
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordHide.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordHide.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordHide.java
index 1fd75d6..86f4a13 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordHide.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordHide.java
@@ -30,6 +30,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
/**
+ * A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
+
+The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordIDType.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordIDType.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordIDType.java
index 6c2c595..97461f5 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordIDType.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordIDType.java
@@ -61,6 +61,19 @@ public class ChangeRecordIDType implements Serializable {
public ChangeRecordIDType() {
}
+ /**
+ *
+ * @param node owning node of the item/source of request
+ * @param oUSN Each node SHALL maintain a strictly increasing register known as its Originating Update Sequence Number (USN). An originating USN is assigned to a change record at its creation by a node. The originating USN SHALL NEVER decrease in value, even in the face of system crashes and restarts. UDDI nodes MUST NOT rely on an originating USN sequence increasing monotonically by a value of "1". Gaps in a node's originating USN sequence MUST be allowed for as they are likely to occur in the face of system crashes and restarts.
+
+While processing changes to the Registry as a result of performing UDDI Replication, all replicated data MUST be assigned an additional unique and locally generated USN register value – a local USN.
+
+The originating and local USN registers MUST be sufficiently large such that register rollover is not a concern. For this purpose, UDDI nodes MUST implement a USN of exactly 63 bits in size.
+
+Note that it is semantically meaningless to compare USNs that have been generated on different nodes; only USNs generated on the same node may be meaningfully compared to each other.
+
+NO change record MAY have a USN equal to 0 (zero).
+ */
public ChangeRecordIDType(String node, Long oUSN) {
originatingUSN = oUSN;
nodeID = node;
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordNewData.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordNewData.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordNewData.java
index 3938581..7807e90 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordNewData.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordNewData.java
@@ -34,6 +34,12 @@ import org.uddi.api_v3.TModel;
/**
+ * <img src="http://www.uddi.org/pubs/uddi-v3.0.2-20041019_files/image112.gif"><Br>
+ * A changeRecordNewData MUST not be empty; it must contain a valid semantic piece of new data. Change records of this type provide new or updated business or modeling information that is to be incorporated. Partial updates to a datum are not provided for; rather, the entire new contents of the datum and its operationalInfo are to be provided, and these replace any existing definition of the datum and its operationalInfo with the recipient of the change record. The hidden state (i.e. the deleted attribute) must be persisted through replication to allow for a custody transfer of hidden tModels between nodes via the replication protocol.
+
+The operationalInfo element MUST contain the operational information associated with the indicated new data. No validation other than schema assessment and presence requirements are performed by the consuming node. Specifically, the creation date may change; the creation date need not be earlier than the modification date; the modification date need not be earlier than the modified including children date.
+
+A changeRecordNewData is considered "successfully processed" once a node has received it, assigned a local USN to it, validated it, durably stored it in its change record journal, and then successfully incorporated it into the node’s data store.
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/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 4effd0d..33f5416 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
@@ -107,6 +107,25 @@ public interface UDDIReplicationPortType extends Remote {
* changeRecords element. Under all circumstances, all change records
* returned therein by the message recipient MUST be returned sorted in
* increasing order according to the recipient’s local USN.</p>
+ *
+ * <p><b>A node that is ready to initiate replication of change records held
+ * at another node within the registry uses the get_changeRecords message.
+ * Part of the message is a high water mark vector that contains for each
+ * node of the registry the originating USN of the most recent change record
+ * that has been successfully processed by the invocating node. The effect
+ * of receiving a get_changeRecords message causes a node to return to the
+ * calling node change records it has generated locally and processed from
+ * other nodes constrained by the directives of the high water mark vector
+ * specified. As such, by invoking get_changeRecords a node obtains from its
+ * adjacent node all change records (constrained by the high water mark
+ * vector) the adjacent node has generated locally or successfully processed
+ * from other nodes participating in the replication topology. What
+ * constitutes an adjacent node is governed by the replication communication
+ * graph. Replication topology is controlled via a Replication Configuration
+ * Structure. Amongst other parameters, the Replication Configuration
+ * Structure identifies one unique URL to represent the replication point,
+ * soapReplicationURL, of each of the nodes of the registry.
+ * </b></p>
*
* @param responseLimitVector responseLimitCount or responseLimitVector: A
* caller MAY place an upper bound on the number of change records he wishes
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[11/28] juddi git commit: JUDDI-241 save/delete Node and clerk
functioning
Posted by al...@apache.org.
JUDDI-241 save/delete Node and clerk functioning
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/7aa78f62
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/7aa78f62
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/7aa78f62
Branch: refs/heads/master
Commit: 7aa78f62cc66ff3484d105e293b361345a939b86
Parents: 455149a
Author: Alex <al...@apache.org>
Authored: Sat Nov 15 13:16:09 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sat Nov 15 13:16:09 2014 -0500
----------------------------------------------------------------------
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 53 +-
.../juddi/api/impl/UDDIReplicationImpl.java | 1023 +++++++++---------
.../api/impl/UDDISubscriptionListenerImpl.java | 2 +-
.../apache/juddi/mapping/MappingApiToModel.java | 2 +-
.../apache/juddi/mapping/MappingModelToApi.java | 13 +-
.../main/java/org/apache/juddi/model/Clerk.java | 18 +-
.../main/java/org/apache/juddi/model/Node.java | 12 +-
.../juddi/validation/ValidatePublish.java | 19 +-
.../src/main/resources/messages.properties | 5 +-
.../juddi/api/impl/API_160_ReplicationTest.java | 77 +-
.../uddi/repl_v3/ReplicationConfiguration.java | 6 +
11 files changed, 673 insertions(+), 557 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index a4ef416..1f7ca77 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -17,6 +17,7 @@
package org.apache.juddi.api.impl;
import java.io.StringWriter;
+import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Date;
@@ -558,7 +559,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
result.getClientSubscriptionInfo().add(apiClientSubscriptionInfo);
}
@@ -621,7 +622,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
result.getClientSubscriptionInfo().add(apiClientSubscriptionInfo);
}
@@ -655,6 +656,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @return ClerkDetail
* @throws DispositionReportFaultMessage
*/
+ @Override
public ClerkDetail saveClerk(SaveClerk body)
throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
@@ -675,14 +677,16 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Clerk modelClerk = new org.apache.juddi.model.Clerk();
MappingApiToModel.mapClerk(apiClerk, modelClerk);
- org.apache.juddi.model.Node node = em.find(org.apache.juddi.model.Node.class, apiClerk.getNode().getName());
- if (node==null)
+ org.apache.juddi.model.Node node2 = em.find(org.apache.juddi.model.Node.class, apiClerk.getNode().getName());
+ if (node2==null)
{
//it doesn't exist yet
- node = new Node();
+ node2 = new Node();
+ MappingApiToModel.mapNode(apiClerk.getNode(), node2);
+ em.persist(node2);
}
- MappingApiToModel.mapNode(apiClerk.getNode(), node);
- modelClerk.setNode(node);
+
+ modelClerk.setNode(node2.getName());
Object existingUddiEntity = em.find(modelClerk.getClass(), modelClerk.getClerkName());
if (existingUddiEntity != null) {
@@ -690,7 +694,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
} else {
em.persist(modelClerk);
}
-
+
result.getClerk().add(apiClerk);
}
@@ -811,7 +815,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
clientSubscriptionInfoMap.put(apiClientSubscriptionInfo.getSubscriptionKey(), apiClientSubscriptionInfo);
}
@@ -947,7 +951,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
List<org.apache.juddi.model.Clerk> resultList = qry.getResultList();
for (int i = 0; i < resultList.size(); i++) {
Clerk api = new Clerk();
- MappingModelToApi.mapClerk(resultList.get(i), api);
+ MappingModelToApi.mapClerk(resultList.get(i), api,em);
ret.getClerk().add(api);
}
@@ -980,18 +984,25 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
EntityTransaction tx = em.getTransaction();
try {
tx.begin();
-
+ //TODO if the given node is in the replication config, prevent deletion
UddiEntityPublisher publisher = this.getEntityPublisher(em, req.getAuthInfo());
- new ValidatePublish(publisher).validateDeleteNode(em, req);
+ new ValidatePublish(publisher).validateDeleteNode(em, req, getReplicationNodes(req.getAuthInfo()));
org.apache.juddi.model.Node existingUddiEntity = em.find(org.apache.juddi.model.Node.class, req.getNodeID());
- if (existingUddiEntity
- != null) {
-
- //TODO cascade delete all clerks tied to this node, confirm that it works
- em.remove(existingUddiEntity);
- found = true;
+ if (existingUddiEntity != null) {
+
+
+ //cascade delete all clerks tied to this node, confirm that it works
+
+ Query createQuery = em.createQuery("delete from Clerk c where c.node = :nodename");
+ createQuery.setParameter("nodename", req.getNodeID());
+ createQuery.executeUpdate();
+
+ em.remove(existingUddiEntity);
+ found=true;
}
+ else
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NotFound"));
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
@@ -1012,7 +1023,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
if (!found) {
- throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NotFound"));
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NotFound", req.getNodeID()));
}
}
@@ -1306,7 +1317,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
}
StringBuilder sql = new StringBuilder();
- sql.append("select c from ReplicationConfiguration c order by c.SerialNumber desc");
+ sql.append("select c from ReplicationConfiguration c order by c.serialNumber desc");
sql.toString();
Query qry = em.createQuery(sql.toString());
qry.setMaxResults(1);
@@ -1329,6 +1340,8 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
em.close();
}
+ r.setMaximumTimeToGetChanges(BigInteger.ONE);
+ r.setMaximumTimeToSyncRegistry(BigInteger.ONE);
return r;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index e2fe3fd..15ed7a8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -78,562 +78,559 @@ import org.uddi.v3_service.UDDIReplicationPortType;
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree<a/>
*/
public class UDDIReplicationImpl extends AuthenticatedService implements UDDIReplicationPortType {
-
- private UDDIServiceCounter serviceCounter;
-
- private static PullTimerTask timer = null;
- private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
-
- private static UDDIPublicationImpl pub = null;
-
- public UDDIReplicationImpl() {
- super();
- if (pub == null) {
- pub = new UDDIPublicationImpl();
- }
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
- Init();
- try {
- startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
- } catch (ConfigurationException ex) {
- logger.fatal(ex);
- }
-
+
+ private UDDIServiceCounter serviceCounter;
+
+ private static PullTimerTask timer = null;
+ private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+
+ private static UDDIPublicationImpl pub = null;
+
+ public UDDIReplicationImpl() {
+ super();
+ if (pub == null) {
+ pub = new UDDIPublicationImpl();
}
-
- private synchronized void Init() {
- if (queue == null) {
- queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
- }
- timer = new PullTimerTask();
-
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
+ Init();
+ try {
+ startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ } catch (ConfigurationException ex) {
+ logger.fatal(ex);
}
-
- private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
- if (changesAlreadySeen != null) {
- for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
- if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
- && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
- return true;
- }
- }
- }
- return false;
+
+ }
+
+ private synchronized void Init() {
+ if (queue == null) {
+ queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
}
-
- private class PullTimerTask extends TimerTask {
-
- private Timer timer = null;
-
- public PullTimerTask() {
- super();
- timer = new Timer(true);
- timer.scheduleAtFixedRate(this, startBuffer, interval);
+ timer = new PullTimerTask();
+
+ }
+
+ private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
+ if (changesAlreadySeen != null) {
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
+ && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
+ return true;
}
-
- @Override
- public void run() {
-
- //ok someone told me there's a change available
- while (!queue.isEmpty()) {
- NotifyChangeRecordsAvailable poll = queue.poll();
- if (poll != null) {
- UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
- try {
- //ok now get all the changes
- List<ChangeRecord> records
- = replicationClient.getChangeRecords(node,
- null, null, poll.getChangesAvailable());
- //ok now we need to persist the change records
- for (int i = 0; i < records.size(); i++) {
- PersistChangeRecord(records.get(i));
- }
- } catch (Exception ex) {
- logger.equals(ex);
- }
- }
+ }
+ }
+ return false;
+ }
+
+ private class PullTimerTask extends TimerTask {
+
+ private Timer timer = null;
+
+ public PullTimerTask() {
+ super();
+ timer = new Timer(true);
+ timer.scheduleAtFixedRate(this, startBuffer, interval);
+ }
+
+ @Override
+ public void run() {
+
+ //ok someone told me there's a change available
+ while (!queue.isEmpty()) {
+ NotifyChangeRecordsAvailable poll = queue.poll();
+ if (poll != null) {
+ UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
+ try {
+ //ok now get all the changes
+ List<ChangeRecord> records
+ = replicationClient.getChangeRecords(node,
+ null, null, poll.getChangesAvailable());
+ //ok now we need to persist the change records
+ for (int i = 0; i < records.size(); i++) {
+ PersistChangeRecord(records.get(i));
}
+ } catch (Exception ex) {
+ logger.equals(ex);
+ }
}
+ }
+ }
+
+ @Override
+ public boolean cancel() {
+ timer.cancel();
+ return super.cancel();
+ }
- @Override
- public boolean cancel() {
- timer.cancel();
- return super.cancel();
- }
-
- /**
- * someone told me there's a change available, we retrieved it
- * and are processing the changes locally
- *
- * @param rec
- */
- private void PersistChangeRecord(ChangeRecord rec) {
- if (rec == null) {
- return;
- }
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
+ /**
+ * someone told me there's a change available, we retrieved it and are
+ * processing the changes locally
+ *
+ * @param rec
+ */
+ private void PersistChangeRecord(ChangeRecord rec) {
+ if (rec == null) {
+ return;
+ }
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ /**
+ * In nodes that support pre-bundled replication responses, the
+ * recipient of the get_changeRecords message MAY return more change
+ * records than requested by the caller. In this scenario, the
+ * caller MUST also be prepared to deal with such redundant changes
+ * where a USN is less than the USN specified in the
+ * changesAlreadySeen highWaterMarkVector.
+ */
+ try {
+ tx.begin();
+ //the change record rec must also be persisted!!
+ em.persist(MappingApiToModel.mapChangeRecord(rec));
+ //<editor-fold defaultstate="collapsed" desc="delete a record">
+
+ if (rec.getChangeRecordDelete() != null) {
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
+ //delete a binding template
+ pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
+ //delete a business
+ pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
+ //delete a service
+ pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getTModelKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getTModelKey())) {
+ //delete a tmodel
/**
- * In nodes that support pre-bundled replication
- * responses, the recipient of the get_changeRecords
- * message MAY return more change records than requested
- * by the caller. In this scenario, the caller MUST also
- * be prepared to deal with such redundant changes where
- * a USN is less than the USN specified in the
- * changesAlreadySeen highWaterMarkVector.
+ * The changeRecordDelete for a tModel does not
+ * correspond to any API described in this specification
+ * and should only appear in the replication stream as
+ * the result of an administrative function to
+ * permanently remove a tModel.
*/
- try {
- tx.begin();
- //the change record rec must also be persisted!!
- em.persist(MappingApiToModel.mapChangeRecord(rec));
- //<editor-fold defaultstate="collapsed" desc="delete a record">
-
- if (rec.getChangeRecordDelete() != null) {
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
- //delete a binding template
- pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
- //delete a business
- pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
- //delete a service
- pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getTModelKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getTModelKey())) {
- //delete a tmodel
- /**
- * The changeRecordDelete for a
- * tModel does not correspond to
- * any API described in this
- * specification and should only
- * appear in the replication
- * stream as the result of an
- * administrative function to
- * permanently remove a tModel.
- */
- pub.deleteTModel(rec.getChangeRecordDelete().getTModelKey(), em);
- }
- }
- if (rec.getChangeRecordDeleteAssertion() != null && rec.getChangeRecordDeleteAssertion().getPublisherAssertion() != null) {
- //delete a pa template
- pub.deletePublisherAssertion(rec.getChangeRecordDeleteAssertion().getPublisherAssertion(), em);
- }
+ pub.deleteTModel(rec.getChangeRecordDelete().getTModelKey(), em);
+ }
+ }
+ if (rec.getChangeRecordDeleteAssertion() != null && rec.getChangeRecordDeleteAssertion().getPublisherAssertion() != null) {
+ //delete a pa template
+ pub.deletePublisherAssertion(rec.getChangeRecordDeleteAssertion().getPublisherAssertion(), em);
+ }
//</editor-fold>
- //<editor-fold defaultstate="collapsed" desc="New Data">
- if (rec.getChangeRecordNewData() != null) {
-
- if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
- throw new Exception("Inbound replication data is missiong node id!");
- }
-
- //The operationalInfo element MUST contain the operational information associated with the indicated new data.
- if (rec.getChangeRecordNewData().getOperationalInfo() == null) {
- logger.warn("Inbound replication data does not have the required OperationalInfo element and is NOT spec compliant. Data will be ignored");
- } else {
- if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
+ //<editor-fold defaultstate="collapsed" desc="New Data">
+ if (rec.getChangeRecordNewData() != null) {
+
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
+ throw new Exception("Inbound replication data is missiong node id!");
+ }
+
+ //The operationalInfo element MUST contain the operational information associated with the indicated new data.
+ if (rec.getChangeRecordNewData().getOperationalInfo() == null) {
+ logger.warn("Inbound replication data does not have the required OperationalInfo element and is NOT spec compliant. Data will be ignored");
+ } else {
+ if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
//fetch the binding template if it exists already
- //if it exists,
- // confirm the owning node, it shouldn't be the local node id, if it is, throw
- // the owning node should be the same as it was before
-
- BusinessService model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBindingTemplate().getServiceKey());
- if (model == null) {
- logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet");
- } else {
- ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
-
- org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
- MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
- em.persist(model);
- }
-
- } else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
-
- BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
- if (model == null) {
- model = new BusinessEntity();
- } else {
- ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
- }
- MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
-
- }
- if (rec.getChangeRecordNewData().getBusinessService() != null) {
- BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessService().getBusinessKey());
- if (find == null) {
- logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
- } else {
- org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
- MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
- }
-
- } else if (rec.getChangeRecordNewData().getTModel() != null) {
- Tmodel model = new Tmodel();
- MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
-
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
- }
-
- }
-
- }
+ //if it exists,
+ // confirm the owning node, it shouldn't be the local node id, if it is, throw
+ // the owning node should be the same as it was before
+
+ BusinessService model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBindingTemplate().getServiceKey());
+ if (model == null) {
+ logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet");
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+
+ org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
+ MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
+
+ BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
+ if (model == null) {
+ model = new BusinessEntity();
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+ }
+ MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+
+ }
+ if (rec.getChangeRecordNewData().getBusinessService() != null) {
+ BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessService().getBusinessKey());
+ if (find == null) {
+ logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
+ } else {
+ org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
+ MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getTModel() != null) {
+ Tmodel model = new Tmodel();
+ MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
+
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ }
+
+ }
//</editor-fold>
// changeRecordNull no action needed
- // changeRecordHide tmodel only
- //<editor-fold defaultstate="collapsed" desc="hide tmodel">
- if (rec.getChangeRecordHide() != null) {
- /*
- A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
+ // changeRecordHide tmodel only
+ //<editor-fold defaultstate="collapsed" desc="hide tmodel">
+ if (rec.getChangeRecordHide() != null) {
+ /*
+ A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
- The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
- */
- String key = rec.getChangeRecordHide().getTModelKey();
- org.apache.juddi.model.Tmodel existing = em.find(org.apache.juddi.model.Tmodel.class, key);
- if (existing == null) {
- logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
- } else {
- existing.setDeleted(true);
- existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
- existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
- em.persist(existing);
- }
- }
+ The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
+ */
+ String key = rec.getChangeRecordHide().getTModelKey();
+ org.apache.juddi.model.Tmodel existing = em.find(org.apache.juddi.model.Tmodel.class, key);
+ if (existing == null) {
+ logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
+ } else {
+ existing.setDeleted(true);
+ existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ em.persist(existing);
+ }
+ }
//</editor-fold>
- //<editor-fold defaultstate="collapsed" desc="changeRecordPublisherAssertion">
- if (rec.getChangeRecordPublisherAssertion() != null) {
+ //<editor-fold defaultstate="collapsed" desc="changeRecordPublisherAssertion">
+ if (rec.getChangeRecordPublisherAssertion() != null) {
//TODO implement
- }
+ }
//</editor-fold>
- tx.commit();
-
- } catch (Exception drfm) {
- logger.warn(drfm);
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
+ tx.commit();
+
+ } catch (Exception drfm) {
+ logger.warn(drfm);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
}
-
+ em.close();
+ }
}
-
- private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
- if (nodeId == null || operationalInfo == null) {
- throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
- }
- if (!nodeId.equals(operationalInfo.getNodeID())) {
- throw new Exception("node id mismatch!");
- }
+
+ }
+
+ private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
+ if (nodeId == null || operationalInfo == null) {
+ throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
}
-
- private synchronized UDDIReplicationPortType getReplicationClient(String node) {
- if (cache.containsKey(node)) {
- return cache.get(node);
- }
- UDDIService svc = new UDDIService();
- UDDIReplicationPortType replicationClient = svc.getUDDIReplicationPort();
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- Node find = em.find(org.apache.juddi.model.Node.class, node);
- ((BindingProvider) replicationClient).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, find.getReplicationUrl());
- cache.put(node, replicationClient);
- return replicationClient;
- } catch (Exception ex) {
- logger.fatal("Node not found!" + node, ex);
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- em.close();
- return null;
-
+ if (!nodeId.equals(operationalInfo.getNodeID())) {
+ throw new Exception("node id mismatch!");
+ }
+ }
+
+ private synchronized UDDIReplicationPortType getReplicationClient(String node) {
+ if (cache.containsKey(node)) {
+ return cache.get(node);
}
- private Map<String, UDDIReplicationPortType> cache = new HashMap<String, UDDIReplicationPortType>();
+ UDDIService svc = new UDDIService();
+ UDDIReplicationPortType replicationClient = svc.getUDDIReplicationPort();
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ Node find = em.find(org.apache.juddi.model.Node.class, node);
+ ((BindingProvider) replicationClient).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, find.getReplicationUrl());
+ cache.put(node, replicationClient);
+ return replicationClient;
+ } catch (Exception ex) {
+ logger.fatal("Node not found!" + node, ex);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ em.close();
+ return null;
+
+ }
+ private Map<String, UDDIReplicationPortType> cache = new HashMap<String, UDDIReplicationPortType>();
+
+ /**
+ * @since 3.3
+ * @param body
+ * @return
+ * @throws DispositionReportFaultMessage
+ */
+ public String doPing(DoPing body) throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
+
+ return node;
+
+ }
+
+ @Override
+ public List<ChangeRecord> getChangeRecords(String requestingNode,
+ HighWaterMarkVectorType changesAlreadySeen,
+ BigInteger responseLimitCount,
+ HighWaterMarkVectorType responseLimitVector)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
+
+ //TODO should we validate that "requestingNode" is in the replication config?
+ List<ChangeRecord> ret = new ArrayList<ChangeRecord>();
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
/**
- * @since 3.3
- * @param body
- * @return
- * @throws DispositionReportFaultMessage
+ * More specifically, the recipient determines the particular change
+ * records that are returned by comparing the originating USNs in the
+ * caller’s high water mark vector with the originating USNs of each of
+ * the changes the recipient has seen from others or generated by
+ * itself. The recipient SHOULD only return change records that have
+ * originating USNs that are greater than those listed in the
+ * changesAlreadySeen highWaterMarkVector and less than the limit
+ * required by either the responseLimitCount or the responseLimitVector.
+ *
+ *
+ * Part of the message is a high water mark vector that contains for
+ * each node of the registry the originating USN of the most recent
+ * change record that has been successfully processed by the invocating
+ * node
*/
- public String doPing(DoPing body) throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
-
- return node;
-
+ int maxrecords = 100;
+ if (responseLimitCount != null) {
+ maxrecords = responseLimitCount.intValue();
}
-
- @Override
- public List<ChangeRecord> getChangeRecords(String requestingNode,
- HighWaterMarkVectorType changesAlreadySeen,
- BigInteger responseLimitCount,
- HighWaterMarkVectorType responseLimitVector)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
-
- //TODO should we validate that "requestingNode" is in the replication config?
- List<ChangeRecord> ret = new ArrayList<ChangeRecord>();
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
-
- /**
- * More specifically, the recipient determines the particular
- * change records that are returned by comparing the originating
- * USNs in the caller’s high water mark vector with the
- * originating USNs of each of the changes the recipient has
- * seen from others or generated by itself. The recipient SHOULD
- * only return change records that have originating USNs that
- * are greater than those listed in the changesAlreadySeen
- * highWaterMarkVector and less than the limit required by
- * either the responseLimitCount or the responseLimitVector.
- *
- *
- * Part of the message is a high water mark vector that contains
- * for each node of the registry the originating USN of the most
- * recent change record that has been successfully processed by
- * the invocating node
- */
- int maxrecords = 100;
- if (responseLimitCount != null) {
- maxrecords = responseLimitCount.intValue();
- }
- try {
- tx.begin();
- Long firstrecord = 1L;
- Long lastrecord = null;
-
- if (changesAlreadySeen != null) {
+ try {
+ tx.begin();
+ Long firstrecord = 1L;
+ Long lastrecord = null;
+
+ if (changesAlreadySeen != null) {
//this is basically a lower limit (i.e. the newest record that was processed by the requestor
- //therefore we want the oldest record stored locally to return to the requestor for processing
- for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
- if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
- firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
- }
- }
- }
- if (responseLimitVector != null) {
+ //therefore we want the oldest record stored locally to return to the requestor for processing
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
+ }
+ }
+ }
+ if (responseLimitVector != null) {
//using responseLimitVector, indicating for each node in the graph the first change originating there that he does not wish to be returned.
- //upper limit basically
- for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
- if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
- lastrecord = responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN();
- }
- }
- }
-
- Query createQuery = null;
- if (lastrecord != null) {
- createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node and e.id < :lastrecord) OR (e.originatingUSN > :inbound and e.nodeID != :node and e.originatingUSN < :lastrecord) order by e.id ASC");
- createQuery.setParameter("lastrecord", lastrecord);
- } else {
- createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node) OR (e.originatingUSN > :inbound and e.nodeID != :node) order by e.id ASC");
- }
- createQuery.setMaxResults(maxrecords);
- createQuery.setParameter("inbound", firstrecord);
- createQuery.setParameter("node", node);
-
- List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) (org.apache.juddi.model.ChangeRecord) createQuery.getResultList();
- for (int i = 0; i < records.size(); i++) {
- ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
- if (!Excluded(changesAlreadySeen, r)) {
- ret.add(r);
- }
-
- }
-
- tx.rollback();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
- QueryStatus.SUCCESS, procTime);
-
- } catch (Exception ex) {
- logger.fatal("Error, this node is: " + node, ex);
- throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
+ //upper limit basically
+ for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ lastrecord = responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN();
+ }
+ }
+ }
+
+ Query createQuery = null;
+ if (lastrecord != null) {
+ createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node and e.id < :lastrecord) OR (e.originatingUSN > :inbound and e.nodeID != :node and e.originatingUSN < :lastrecord) order by e.id ASC");
+ createQuery.setParameter("lastrecord", lastrecord);
+ } else {
+ createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node) OR (e.originatingUSN > :inbound and e.nodeID != :node) order by e.id ASC");
+ }
+ createQuery.setMaxResults(maxrecords);
+ createQuery.setParameter("inbound", firstrecord);
+ createQuery.setParameter("node", node);
+
+ List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) (org.apache.juddi.model.ChangeRecord) createQuery.getResultList();
+ for (int i = 0; i < records.size(); i++) {
+ ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
+ if (!Excluded(changesAlreadySeen, r)) {
+ ret.add(r);
}
- return ret;
+
+ }
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
+ QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception ex) {
+ logger.fatal("Error, this node is: " + node, ex);
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
}
-
- /**
- * This UDDI API message provides a means to obtain a list of
- * highWaterMark element containing the highest known USN for all nodes
- * in the replication graph. If there is no graph, we just return the
- * local bits
- *
- * @return
- * @throws DispositionReportFaultMessage
- */
- @Override
- public List<ChangeRecordIDType> getHighWaterMarks()
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- List<ChangeRecordIDType> ret = new ArrayList<ChangeRecordIDType>();
-
- //fetch from database the highest known watermark
- ReplicationConfiguration FetchEdges = FetchEdges();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
- if (FetchEdges != null) {
- Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
- while (it.hasNext()) {
- String nextNode = it.next();
- if (!nextNode.equals(node)) {
-
- Long id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
- if (id == null) {
- id = 0L;
- //per the spec
- }
- ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
- ret.add(x);
- }
- }
+ return ret;
+ }
+
+ /**
+ * This UDDI API message provides a means to obtain a list of highWaterMark
+ * element containing the highest known USN for all nodes in the replication
+ * graph. If there is no graph, we just return the local bits
+ *
+ * @return
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
+ public List<ChangeRecordIDType> getHighWaterMarks()
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ List<ChangeRecordIDType> ret = new ArrayList<ChangeRecordIDType>();
+
+ //fetch from database the highest known watermark
+ ReplicationConfiguration FetchEdges = FetchEdges();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ if (FetchEdges != null) {
+ Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
+ while (it.hasNext()) {
+ String nextNode = it.next();
+ if (!nextNode.equals(node)) {
+
+ Long id = 0L;
+ try {
+ id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
+ } catch (Exception ex) {
+ logger.debug(ex);
}
- //dont forget this node
- Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
if (id == null) {
- id = 0L;
+ id = 0L;
+ //per the spec
}
- ChangeRecordIDType x = new ChangeRecordIDType();
- x.setNodeID(node);
- x.setOriginatingUSN(id);
+ ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
+
ret.add(x);
-
- tx.rollback();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
-
- } catch (Exception drfm) {
- throw new FatalErrorException(new ErrorMessage("E_fatalError", drfm.getMessage()));
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
+
+ }
}
-
- return ret;
+ }
+ //dont forget this node
+ Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
+ if (id == null) {
+ id = 0L;
+ }
+ ChangeRecordIDType x = new ChangeRecordIDType();
+ x.setNodeID(node);
+ x.setOriginatingUSN(id);
+ ret.add(x);
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception drfm) {
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", drfm.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
}
-
- /**
- * this means that another node has a change and we need to pick up the
- * change and apply it to our local database.
- *
- * @param body
- * @throws DispositionReportFaultMessage
- */
- @Override
- public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.NOTIFY_CHANGERECORDSAVAILABLE,
- QueryStatus.SUCCESS, procTime);
+
+
+
+ return ret;
+ }
+
+ /**
+ * this means that another node has a change and we need to pick up the
+ * change and apply it to our local database.
+ *
+ * @param body
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
+ public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.NOTIFY_CHANGERECORDSAVAILABLE,
+ QueryStatus.SUCCESS, procTime);
//some other node just told us there's new records available, call
- //getChangeRecords from the remote node asynch
-
- new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
-
- queue.add(body);
+ //getChangeRecords from the remote node asynch
+
+ new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
+
+ queue.add(body);
+
+ //ValidateReplication.unsupportedAPICall();
+ }
+ private static Queue<NotifyChangeRecordsAvailable> queue = null;
+
+ /**
+ * transfers custody of an entity from node1/user1 to node2/user2
+ *
+ * @param body
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
+ public void transferCustody(TransferCustody body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
- //ValidateReplication.unsupportedAPICall();
- }
- private static Queue<NotifyChangeRecordsAvailable> queue = null;
+ //*this node is transfering data to another node
+ //body.getTransferOperationalInfo().
+ ValidateReplication.unsupportedAPICall();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ //EntityTransaction tx = em.getTransaction();
/**
- * transfers custody of an entity from node1/user1 to node2/user2
+ * The custodial node must verify that it has granted permission to
+ * transfer the entities identified and that this permission is still
+ * valid. This operation is comprised of two steps:
+ *
+ * 1. Verification that the transferToken was issued by it, that it has
+ * not expired, that it represents the authority to transfer no more and
+ * no less than those entities identified by the businessKey and
+ * tModelKey elements and that all these entities are still valid and
+ * not yet transferred. The transferToken is invalidated if any of these
+ * conditions are not met.
+ *
+ * 2. If the conditions above are met, the custodial node will prevent
+ * any further changes to the entities identified by the businessKey and
+ * tModelKey elements identified. The entity will remain in this state
+ * until the replication stream indicates it has been successfully
+ * processed via the replication stream. Upon successful verification of
+ * the custody transfer request by the custodial node, an empty message
+ * is returned by it indicating the success of the request and
+ * acknowledging the custody transfer. Following the issue of the empty
+ * message, the custodial node will submit into the replication stream a
+ * changeRecordNewData providing in the operationalInfo, the nodeID
+ * accepting custody of the datum and the authorizedName of the
+ * publisher accepting ownership. The acknowledgmentRequested attribute
+ * of this change record MUST be set to "true".
*
- * @param body
- * @throws DispositionReportFaultMessage
+ * TODO enqueue Replication message
+ *
+ * Finally, the custodial node invalidates the transferToken in order to
+ * prevent additional calls of the transfer_entities API.
*/
- @Override
- public void transferCustody(TransferCustody body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- //*this node is transfering data to another node
- //body.getTransferOperationalInfo().
- ValidateReplication.unsupportedAPICall();
-
- EntityManager em = PersistenceManager.getEntityManager();
- //EntityTransaction tx = em.getTransaction();
-
- /**
- * The custodial node must verify that it has granted permission
- * to transfer the entities identified and that this permission
- * is still valid. This operation is comprised of two steps:
- *
- * 1.
- * Verification that the transferToken was issued by it, that it
- * has not expired, that it represents the authority to transfer
- * no more and no less than those entities identified by the
- * businessKey and tModelKey elements and that all these
- * entities are still valid and not yet transferred. The
- * transferToken is invalidated if any of these conditions are
- * not met.
- *
- * 2. If the conditions above are met, the custodial
- * node will prevent any further changes to the entities
- * identified by the businessKey and tModelKey elements
- * identified. The entity will remain in this state until the
- * replication stream indicates it has been successfully
- * processed via the replication stream. Upon successful
- * verification of the custody transfer request by the custodial
- * node, an empty message is returned by it indicating the
- * success of the request and acknowledging the custody
- * transfer. Following the issue of the empty message, the
- * custodial node will submit into the replication stream a
- * changeRecordNewData providing in the operationalInfo, the
- * nodeID accepting custody of the datum and the authorizedName
- * of the publisher accepting ownership. The
- * acknowledgmentRequested attribute of this change record MUST
- * be set to "true".
- *
- * TODO enqueue Replication message
- *
- * Finally, the custodial node
- * invalidates the transferToken in order to prevent additional
- * calls of the transfer_entities API.
- */
- DiscardTransferToken dtt = new DiscardTransferToken();
- dtt.setKeyBag(body.getKeyBag());
- dtt.setTransferToken(body.getTransferToken());
- new UDDICustodyTransferImpl().discardTransferToken(dtt);
- }
-
+ DiscardTransferToken dtt = new DiscardTransferToken();
+ dtt.setKeyBag(body.getKeyBag());
+ dtt.setTransferToken(body.getTransferToken());
+ new UDDICustodyTransferImpl().discardTransferToken(dtt);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
index d1a1f3f..a6239b1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionListenerImpl.java
@@ -88,7 +88,7 @@ public class UDDISubscriptionListenerImpl extends AuthenticatedService implement
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
tx.commit();
} finally {
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index 7297311..65739a4 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -1071,7 +1071,7 @@ public class MappingApiToModel {
if (apiClerk.getNode() != null) {
org.apache.juddi.model.Node modelNode = new org.apache.juddi.model.Node();
mapNode(apiClerk.getNode(), modelNode);
- modelClerk.setNode(modelNode);
+ modelClerk.setNode(modelNode.getName());
}
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index 8a4f1c1..0b5d9a3 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.persistence.EntityManager;
import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBElement;
@@ -1111,7 +1112,7 @@ public class MappingModelToApi {
}
public static void mapClientSubscriptionInfo(org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo,
- org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo)
+ org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo, EntityManager em)
throws DispositionReportFaultMessage {
apiClientSubscriptionInfo.setSubscriptionKey(modelClientSubscriptionInfo.getSubscriptionKey());
@@ -1125,18 +1126,18 @@ public class MappingModelToApi {
if (modelClientSubscriptionInfo.getFromClerk() != null) {
org.apache.juddi.api_v3.Clerk apiFromClerk = new org.apache.juddi.api_v3.Clerk();
- mapClerk(modelClientSubscriptionInfo.getFromClerk(), apiFromClerk);
+ mapClerk(modelClientSubscriptionInfo.getFromClerk(), apiFromClerk,em);
apiClientSubscriptionInfo.setFromClerk(apiFromClerk);
}
if (modelClientSubscriptionInfo.getToClerk() != null) {
org.apache.juddi.api_v3.Clerk apiToClerk = new org.apache.juddi.api_v3.Clerk();
- mapClerk(modelClientSubscriptionInfo.getToClerk(), apiToClerk);
+ mapClerk(modelClientSubscriptionInfo.getToClerk(), apiToClerk,em);
apiClientSubscriptionInfo.setToClerk(apiToClerk);
}
}
public static void mapClerk(org.apache.juddi.model.Clerk modelClerk,
- org.apache.juddi.api_v3.Clerk apiClerk)
+ org.apache.juddi.api_v3.Clerk apiClerk,EntityManager em)
throws DispositionReportFaultMessage {
apiClerk.setName(modelClerk.getClerkName());
@@ -1144,7 +1145,9 @@ public class MappingModelToApi {
apiClerk.setPublisher(modelClerk.getPublisherId());
if (modelClerk.getNode() != null) {
org.apache.juddi.api_v3.Node apiNode = new org.apache.juddi.api_v3.Node();
- mapNode(modelClerk.getNode(), apiNode);
+ mapNode(
+ em.find(org.apache.juddi.model.Node.class, modelClerk.getNode())
+ , apiNode);
apiClerk.setNode(apiNode);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java b/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
index fe0ca52..3ed1368 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Clerk.java
@@ -20,7 +20,10 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -38,14 +41,19 @@ public class Clerk implements java.io.Serializable {
private String clerkName;
@Column(name="publisher_id", nullable = false, length=255)
private String publisherId;
- @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
- private Node node;
+ //@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ //@OneToOne(cascade = CascadeType.PERSIST , fetch = FetchType.EAGER)
+ //@JoinColumn(name = "nodeid", nullable = false)
+ //@ManyToOne(fetch = FetchType.LAZY, targetEntity = Node.class , cascade = {CascadeType.PERSIST, CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH })
+
+ @Column (name="nodeid")
+ private String node;
@Column(name="cred", length=255)
private String cred;
public Clerk() {}
- public Clerk(String clerkName, String cred, Node node, String publisherId) {
+ public Clerk(String clerkName, String cred, String node, String publisherId) {
super();
this.clerkName = clerkName;
this.cred = cred;
@@ -69,11 +77,11 @@ public class Clerk implements java.io.Serializable {
this.publisherId = publisherId;
}
- public Node getNode() {
+ public String getNode() {
return node;
}
- public void setNode(Node node) {
+ public void setNode(String node) {
this.node = node;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/model/Node.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Node.java b/juddi-core/src/main/java/org/apache/juddi/model/Node.java
index a085536..53fbe12 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Node.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Node.java
@@ -15,9 +15,17 @@ package org.apache.juddi.model;
* limitations under the License.
*/
+import java.util.List;
+import java.util.Set;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -61,7 +69,7 @@ public class Node implements java.io.Serializable {
private String factoryURLPkgs;
@Column(name="factory_naming_provider", nullable = true, length=255)
private String factoryNamingProvider;
-
+
public Node() {}
public Node(String custodyTransferUrl, String inquiryUrl,
@@ -189,5 +197,7 @@ public class Node implements java.io.Serializable {
public void setFactoryNamingProvider(String factoryNamingProvider) {
this.factoryNamingProvider = factoryNamingProvider;
}
+
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index ca560f1..9d02d9c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -90,6 +90,7 @@ import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveService;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModel;
+import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.sub_v3.Subscription;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -2365,7 +2366,7 @@ public class ValidatePublish extends ValidateUDDIApi {
return TokenResolver.replaceTokens(url, p);
}
- public void validateDeleteNode(EntityManager em, DeleteNode nodeID) throws DispositionReportFaultMessage {
+ public void validateDeleteNode(EntityManager em, DeleteNode nodeID, ReplicationConfiguration cfg) throws DispositionReportFaultMessage {
if (nodeID == null) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteClerk.NoInput"));
}
@@ -2375,6 +2376,22 @@ public class ValidatePublish extends ValidateUDDIApi {
if (nodeID.getNodeID() == null || nodeID.getNodeID().trim().equalsIgnoreCase("")) {
throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NoInput"));
}
+ //get the latest replication config
+ if (cfg!=null){
+ if (cfg.getCommunicationGraph()!=null){
+ for (String node : cfg.getCommunicationGraph().getNode()) {
+ if (node.equals(nodeID.getNodeID()))
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+ }
+ for (int i=0; i <cfg.getCommunicationGraph().getEdge().size(); i++){
+ if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageReceiver()))
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+ if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageSender()))
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/7aa78f62/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 18f7cfc..9665589 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -107,7 +107,7 @@ errors.saveclientsubscriptionKey.NoInput=The SubscriptionKey must be provided
errors.saveClerk.NoInput=At least one Clerk must be provided
errors.saveNodes.NoInput=At least one Node must be provided
errors.deleteNode.NoInput=A node id must be specified
-errors.deleteNode.NotFound=The specified node if could not be found.
+errors.deleteNode.NotFound=The specified node could not be found.
errors.deleteClerk.NoInput=A clerk id must be specified
errors.deleteClerk.NotFound=The specified clerk if could not be found.
errors.savetmodel.NoInput=At least one tModel must be provided
@@ -292,4 +292,5 @@ errors.replication.negativeLimit=The specified response limit is either 0 or a n
errors.replication.limitVectorNull=The high water mark vector limit specified OriginatingUSN is null or invalid
errors.replication.limitVectorNoNode=No node name was specified
errors.replication.configNodeNotFound=No specified node name is not currently registered as a node. Use the jUDDI Service API to register it. Node id:
-errors.replication.configNull=No replication config was present in the message
\ No newline at end of file
+errors.replication.configNull=No replication config was present in the message
+errors.deleteNode.InReplicationConfig=The node to be deleted is currently referenced in the replication configuration. You must revise the configuration before deleting the node,
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[27/28] juddi git commit: JUDDI-896 resolved a number of typos and
formatting issues JUDDI-241 business, service,
binding templates and models now replicate
Posted by al...@apache.org.
JUDDI-896 resolved a number of typos and formatting issues
JUDDI-241 business, service, binding templates and models now replicate
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/9d22690e
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/9d22690e
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/9d22690e
Branch: refs/heads/master
Commit: 9d22690eee0aae19f98191c00a00833bf6a28f5c
Parents: 962f8d8
Author: Alex <al...@apache.org>
Authored: Mon Dec 8 19:43:11 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Mon Dec 8 19:43:11 2014 -0500
----------------------------------------------------------------------
.../juddi/api/impl/AuthenticatedService.java | 5 +-
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 33 +-
.../juddi/api/impl/UDDIReplicationImpl.java | 182 +-
.../juddi/validation/ValidatePublish.java | 112 +-
.../juddi/validation/ValidateReplication.java | 6 +-
.../src/main/resources/messages.properties | 1 +
.../juddi/api/impl/API_160_ReplicationTest.java | 9 +-
.../org/apache/juddi/samples/EntryPoint.java | 17 +-
.../apache/juddi/samples/UddiCreatebulk.java | 6 +-
.../juddi/webconsole/resources/web.properties | 2 +-
juddi-gui/src/main/webapp/bindingEditor.jsp | 4 +-
juddi-gui/src/main/webapp/js/businessEditor.js | 22 +-
juddi-gui/src/main/webapp/serviceEditor.jsp | 2 +-
juddi-tomcat/build.xml | 6 +-
.../juddi_install_data_node2/UDDI_Publisher.xml | 22 +
.../juddi_install_data_node2/UDDI_tModels.xml | 2362 ++++++++++++++++++
.../root_BusinessEntity.xml | 2 +-
.../repl_v3/NotifyChangeRecordsAvailable.java | 5 +
18 files changed, 2663 insertions(+), 135 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
index 767cbee..fb0e00e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
@@ -49,7 +49,10 @@ public abstract class AuthenticatedService {
public static final int AUTHTOKEN_ACTIVE = 1;
public static final int AUTHTOKEN_RETIRED = 0;
static final Log logger = LogFactory.getLog(AuthenticatedService.class);
- protected String node = "UNDEFINED_NODE_NAME";
+ /**
+ * the node id of this server instance, as loaded from the config file
+ */
+ protected static String node = "UNDEFINED_NODE_NAME";
protected String baseUrlSSL="UNDEFINED";
protected String baseUrl="UNDEFINED";
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index dd201fe..1b6b019 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -125,7 +125,7 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
*/
@WebService(serviceName = "JUDDIApiService",
endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
- targetNamespace = "urn:juddi-apache-org:v3_service", wsdlLocation = "classpath:/juddi_api_v1.wsdl")
+ targetNamespace = "urn:juddi-apache-org:v3_service", wsdlLocation = "classpath:/juddi_api_v1.wsdl")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
private Log log = LogFactory.getLog(this.getClass());
@@ -1276,6 +1276,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
try {
tx.begin();
+ org.uddi.repl_v3.ReplicationConfiguration oldConfig = null;
UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
if (!((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
@@ -1289,9 +1290,9 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
if (model == null) {
- //this is a brand new configuration
+ //this is a brand new configuration and we didn't have one before
model = new ReplicationConfiguration();
- MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model,em);
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
model.setSerialNumber(System.currentTimeMillis());
model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
em.persist(model);
@@ -1305,17 +1306,20 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
//spec doesn't appear to mention if recording a change history on the config is required
//assuming not.
//em.remove(model);
- model = new ReplicationConfiguration();
- MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
- model.setSerialNumber(System.currentTimeMillis());
+ oldConfig = new org.uddi.repl_v3.ReplicationConfiguration();
+ MappingModelToApi.mapReplicationConfiguration(model, oldConfig);
- model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
- em.merge(model);
+ ReplicationConfiguration model2 = new ReplicationConfiguration();
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model2, em);
+ model2.setSerialNumber(System.currentTimeMillis());
+
+ model2.setTimeOfConfigurationUpdate(sdf.format(new Date()));
+ em.persist(model2);
}
tx.commit();
- //UDDIReplicationImpl.notifyConfigurationChange(replicationConfiguration);
+ UDDIReplicationImpl.notifyConfigurationChange(oldConfig, replicationConfiguration);
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
QueryStatus.SUCCESS, procTime);
@@ -1324,12 +1328,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
QueryStatus.FAILED, procTime);
throw drfm;
- } catch (Exception ex){
- logger.error(ex,ex);
+ } catch (Exception ex) {
+ logger.error(ex, ex);
JAXB.marshal(replicationConfiguration, System.out);
throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
- }
- finally {
+ } finally {
if (tx.isActive()) {
tx.rollback();
}
@@ -1381,11 +1384,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
op.setOperatorNodeID(node);
op.setSoapReplicationURL(baseUrlSSL + "/services/replication");
//TODO lookup from the root business
-
+
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(node);
r.getCommunicationGraph().getControlledMessage().add("*");
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 5c3b22c..bb2d17c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -21,10 +21,12 @@ import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Queue;
+import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentLinkedDeque;
@@ -104,6 +106,55 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
static void notifyConfigurationChange(ReplicationConfiguration oldConfig, ReplicationConfiguration newConfig) {
//if the config is different
+ Set<String> oldnodes = getNodes(oldConfig);
+ Set<String> newNodes = getNodes(newConfig);
+
+ Set<String> addedNodes = diffNodeList(oldnodes, newNodes);
+ if (queue == null) {
+ queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
+ }
+ for (String s : addedNodes) {
+ if (!s.equals(node)) {
+ logger.info("This node: " + node + ". New replication node queue for synchronization: " + s);
+ HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
+ highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(s, 0L));
+ queue.add(new NotifyChangeRecordsAvailable(s, highWaterMarkVectorType));
+ }
+ }
+
+ }
+
+ private static Set<String> getNodes(ReplicationConfiguration oldConfig) {
+ Set<String> ret = new HashSet<String>();
+ if (oldConfig == null) {
+ return ret;
+ }
+ for (org.uddi.repl_v3.Operator o : oldConfig.getOperator()) {
+ ret.add(o.getOperatorNodeID());
+ }
+ if (oldConfig.getCommunicationGraph() != null) {
+ ret.addAll(oldConfig.getCommunicationGraph().getNode());
+ }
+ return ret;
+ }
+
+ private static Set<String> diffNodeList(Set<String> oldnodes, Set<String> newNodes) {
+ Set<String> diff = new HashSet<String>();
+ Iterator<String> iterator = null;
+ /*oldnodes.iterator();
+ while (iterator.hasNext()){
+ String lhs=iterator.next();
+ if (!newNodes.contains(lhs))
+ diff.add(lhs);
+ }*/
+ iterator = newNodes.iterator();
+ while (iterator.hasNext()) {
+ String lhs = iterator.next();
+ if (!oldnodes.contains(lhs)) {
+ diff.add(lhs);
+ }
+ }
+ return diff;
}
private UDDIServiceCounter serviceCounter;
@@ -179,17 +230,19 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
try {
//get the high water marks for this node
//ok now get all the changes
- logger.info("fetching updates on, since ");
- for (int xx = 0; xx < poll.getChangesAvailable().getHighWaterMark().size(); xx++) {
- logger.info("Node " + poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID()
- + " USN " + poll.getChangesAvailable().getHighWaterMark().get(xx).getOriginatingUSN());
- }
- //JAXB.marshal(poll, System.out);
+
+ //done TODO replace with last known record from the given node
+ //for (int xx = 0; xx < poll.getChangesAvailable().getHighWaterMark().size(); xx++) {
+ // logger.info("Node " + poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID()
+ // + " USN " + poll.getChangesAvailable().getHighWaterMark().get(xx).getOriginatingUSN());
+ //}
GetChangeRecords body = new GetChangeRecords();
body.setRequestingNode(node);
body.setResponseLimitCount(BigInteger.valueOf(100));
- //indexing is screwed up
- body.setChangesAlreadySeen(poll.getChangesAvailable());
+
+ body.setChangesAlreadySeen(getLastChangeRecordFrom(poll.getNotifyingNode()));
+ logger.info("fetching updates from " + poll.getNotifyingNode() + " since " + body.getChangesAlreadySeen().getHighWaterMark().get(0).getOriginatingUSN());
+
List<ChangeRecord> records
= replicationClient.getChangeRecords(body).getChangeRecord();
//ok now we need to persist the change records
@@ -235,9 +288,9 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
* a USN is less than the USN specified in the
* changesAlreadySeen highWaterMarkVector.
*/
- StringWriter sw = new StringWriter();
- JAXB.marshal(rec, sw);
- logger.info("_______________________Remote change request " + sw.toString());
+ // StringWriter sw = new StringWriter();
+ //JAXB.marshal(rec, sw);
+ logger.info("_______________________Remote change request " + rec.getChangeID().getNodeID() + ":" + rec.getChangeID().getOriginatingUSN());
try {
tx.begin();
@@ -245,6 +298,9 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
org.apache.juddi.model.ChangeRecord mapChangeRecord = MappingApiToModel.mapChangeRecord(rec);
mapChangeRecord.setId(null);
em.persist(mapChangeRecord);
+ tx.commit();
+ tx = em.getTransaction();
+ tx.begin();
//<editor-fold defaultstate="collapsed" desc="delete a record">
if (rec.getChangeRecordDelete() != null) {
@@ -304,10 +360,10 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
} else {
ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
- org.apache.juddi.model.BindingTemplate bt= em.find(org.apache.juddi.model.BindingTemplate.class,rec.getChangeRecordNewData().getBindingTemplate().getBindingKey() );
- if (bt!=null){
- em.remove(bt);
- }
+ org.apache.juddi.model.BindingTemplate bt = em.find(org.apache.juddi.model.BindingTemplate.class, rec.getChangeRecordNewData().getBindingTemplate().getBindingKey());
+ if (bt != null) {
+ em.remove(bt);
+ }
bt = new BindingTemplate();
MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), bt, model);
MappingApiToModel.mapOperationalInfo(bt, rec.getChangeRecordNewData().getOperationalInfo());
@@ -322,7 +378,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
//TODO revisit access control rules
em.remove(model);
- }
+ }
model = new BusinessEntity();
MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
// MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
@@ -413,15 +469,68 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
}
+ private HighWaterMarkVectorType getLastChangeRecordFrom(String notifyingNode) {
+ HighWaterMarkVectorType ret = new HighWaterMarkVectorType();
+ ChangeRecordIDType cid = new ChangeRecordIDType();
+ cid.setNodeID(notifyingNode);
+ cid.setOriginatingUSN(0L);
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ Long id = 0L;
+ try {
+ cid.setOriginatingUSN((Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", notifyingNode).setMaxResults(1).getSingleResult());
+ } catch (Exception ex) {
+ logger.info(ex);
+ }
+
+ tx.rollback();
+
+ } catch (Exception drfm) {
+ logger.warn("error caught fetching newest record from node " + notifyingNode, drfm);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ ret.getHighWaterMark().add(cid);
+
+ return ret;
+ }
}
- private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
- if (nodeId == null || operationalInfo == null) {
+ // private void ValidateDontChangeMyRecordsAtAnotherNode(String )
+ private void ValidateNodeIdMatches(String modelNodeId, OperationalInfo newDataOperationalInfo) throws Exception {
+ if (modelNodeId == null || newDataOperationalInfo == null) {
throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
}
- if (!nodeId.equals(operationalInfo.getNodeID())) {
+ //only time this is allowed is custody transfer
+ if (!modelNodeId.equals(newDataOperationalInfo.getNodeID())) {
throw new Exception("node id mismatch!");
}
+
+ //if i already have a record and "own it" and the remote node has a record with the same key, reject the update
+ //1.5.8
+ /**
+ * Each node has custody of a portion of the aggregate data
+ * managed by the registry of which it is a part. Each datum is
+ * by definition in the custody of exactly one such node. A
+ * datum in this context can be a businessEntity, a
+ * businessService, a bindingTemplate, a tModel, or a
+ * publisherAssertion. Changes to a datum in the registry MUST
+ * originate at the node which is the custodian of the datum.
+ * The registry defines the policy for data custody and, if
+ * allowed, the custodian node for a given datum can be changed;
+ * such custody transfer processes are discussed in Section 5.4
+ * Custody and Ownership Transfer API.
+ */
+ //so someone else attempted to update one of my records, reject it
+ if (modelNodeId.equals(node)) {
+ throw new Exception("node id mismatch! this node already has a record for key " + newDataOperationalInfo.getEntityKey() + " and I'm the authority for it.");
+ }
}
private synchronized UDDIReplicationPortType getReplicationClient(String node) {
@@ -482,6 +591,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
@WebResult(name = "changeRecords", targetNamespace = "urn:uddi-org:repl_v3", partName = "body")
// @WebMethod(operationName = "get_changeRecords", action = "get_changeRecords")
+ @Override
public org.uddi.repl_v3.ChangeRecords getChangeRecords(
@WebParam(partName = "body", name = "get_changeRecords", targetNamespace = "urn:uddi-org:repl_v3") org.uddi.repl_v3.GetChangeRecords body
) throws DispositionReportFaultMessage, RemoteException {/*
@@ -625,6 +735,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
+ HashMap<String, Long> map = new HashMap<String, Long>();
try {
tx.begin();
if (FetchEdges != null) {
@@ -632,26 +743,26 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
while (it.hasNext()) {
String nextNode = it.next();
if (!nextNode.equals(node)) {
+ if (!map.containsKey(nextNode)) {
+ Long id = 0L;
+ try {
+ id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
+ } catch (Exception ex) {
+ logger.debug(ex);
+ }
+ if (id == null) {
+ id = 0L;
+ //per the spec
+ }
+ map.put(nextNode, id);
- Long id = 0L;
- try {
- id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
- } catch (Exception ex) {
- logger.debug(ex);
- }
- if (id == null) {
- id = 0L;
- //per the spec
}
- ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
-
- ret.add(x);
-
}
}
}
//dont forget this node
- Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
+ Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc")
+ .setParameter("node", node).setMaxResults(1).getSingleResult();
if (id == null) {
id = 0L;
}
@@ -674,6 +785,11 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
em.close();
}
+ Iterator<Map.Entry<String, Long>> iterator = map.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<String, Long> next = iterator.next();
+ ret.add(new ChangeRecordIDType(next.getKey(), next.getValue()));
+ }
return ret;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index f3df32f..64ebdb9 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -117,8 +117,9 @@ public class ValidatePublish extends ValidateUDDIApi {
/**
* used from Install class
+ *
* @param publisher
- * @param nodeid
+ * @param nodeid
* @see Install
*/
public ValidatePublish(UddiEntityPublisher publisher, String nodeid) {
@@ -284,14 +285,20 @@ public class ValidatePublish extends ValidateUDDIApi {
private void AccessCheck(Object obj, String entityKey) throws UserMismatchException {
boolean accessCheck = false; //assume access denied
- //TODO revisit access control rules in a replicated environment
+ if (!((UddiEntity) obj).getNodeId().equals(nodeID)) {
+ //prevent changes to data owned by another node in a replicated environment
+ //even if you're the boss
+ throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidNode", entityKey + " Owning Node: " +((UddiEntity) obj).getNodeId()
+ + ", this node: " + nodeID));
+ }
+
if (publisher.isOwner((UddiEntity) obj)) {
accessCheck = true;
}
//if i'm an admin, let me edit stuff on this node, but only stuff that's owned by this node
if (((Publisher) publisher).isAdmin()
- && nodeID.equals(((UddiEntity) obj).getNodeId())) {
+ && nodeID.equals(((UddiEntity) obj).getNodeId())) {
accessCheck = true;
}
@@ -331,8 +338,8 @@ public class ValidatePublish extends ValidateUDDIApi {
}
if (!pubAssertion.getTmodelKey().equalsIgnoreCase(keyedRef.getTModelKey())
- || !pubAssertion.getKeyName().equalsIgnoreCase(keyedRef.getKeyName())
- || !pubAssertion.getKeyValue().equalsIgnoreCase(keyedRef.getKeyValue())) {
+ || !pubAssertion.getKeyName().equalsIgnoreCase(keyedRef.getKeyName())
+ || !pubAssertion.getKeyValue().equalsIgnoreCase(keyedRef.getKeyValue())) {
throw new AssertionNotFoundException(new ErrorMessage("errors.pubassertion.AssertionNotFound", entity.getFromKey() + ", " + entity.getToKey()));
}
@@ -363,9 +370,9 @@ public class ValidatePublish extends ValidateUDDIApi {
for (org.uddi.api_v3.BusinessEntity entity : entityList) {
validateBusinessEntity(em, entity, config, publisher);
-
+
}
- validateCheckedTModelsBE(entityList, config);
+ validateCheckedTModelsBE(entityList, config);
}
public void validateSaveBusinessMax(EntityManager em) throws DispositionReportFaultMessage {
@@ -473,7 +480,7 @@ public class ValidatePublish extends ValidateUDDIApi {
for (org.uddi.api_v3.BindingTemplate entity : entityList) {
validateBindingTemplate(em, entity, null, config, publisher);
-
+
}
validateCheckedTModelsBT(entityList, config);
}
@@ -527,7 +534,7 @@ public class ValidatePublish extends ValidateUDDIApi {
for (org.uddi.api_v3.TModel entity : entityList) {
validateTModel(em, entity, config, publisher);
-
+
}
validateCheckedTModelsTM(entityList, config);
}
@@ -604,17 +611,17 @@ public class ValidatePublish extends ValidateUDDIApi {
if (item.getBusinessServices() != null && !item.getSignature().isEmpty()) {
for (int i = 0; i < item.getBusinessServices().getBusinessService().size(); i++) {
if (item.getBusinessServices().getBusinessService().get(i).getBusinessKey() == null
- || item.getBusinessServices().getBusinessService().get(i).getBusinessKey().length() == 0) {
+ || item.getBusinessServices().getBusinessService().get(i).getBusinessKey().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.entity.SignedButNoKey", "business/Service(" + i + ")/businessKey"));
}
if (item.getBusinessServices().getBusinessService().get(i).getServiceKey() == null
- || item.getBusinessServices().getBusinessService().get(i).getServiceKey().length() == 0) {
+ || item.getBusinessServices().getBusinessService().get(i).getServiceKey().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.entity.SignedButNoKey", "business/Service(" + i + ")/serviceKey"));
}
if (item.getBusinessServices().getBusinessService().get(i).getBindingTemplates() != null) {
for (int k = 0; k < item.getBusinessServices().getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size(); k++) {
if (item.getBusinessServices().getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey() == null
- || item.getBusinessServices().getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey().length() == 0) {
+ || item.getBusinessServices().getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.entity.SignedButNoKey", "business/Service(" + i + ")/bindingTemplate)" + k + ")/bindingKey"));
}
}
@@ -658,7 +665,7 @@ public class ValidatePublish extends ValidateUDDIApi {
if (item.getBindingTemplates() != null && !item.getSignature().isEmpty()) {
for (int i = 0; i < item.getBindingTemplates().getBindingTemplate().size(); i++) {
if (item.getBindingTemplates().getBindingTemplate().get(i).getBindingKey() == null
- || item.getBindingTemplates().getBindingTemplate().get(i).getBindingKey().length() == 0) {
+ || item.getBindingTemplates().getBindingTemplate().get(i).getBindingKey().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.entity.SignedButNoKey", "businessService/bindingTemplate(" + i + ")/bindingKey"));
}
}
@@ -666,7 +673,7 @@ public class ValidatePublish extends ValidateUDDIApi {
}
public void validateBusinessEntity(EntityManager em, org.uddi.api_v3.BusinessEntity businessEntity,
- Configuration config, UddiEntityPublisher publisher) throws DispositionReportFaultMessage {
+ Configuration config, UddiEntityPublisher publisher) throws DispositionReportFaultMessage {
// A supplied businessEntity can't be null
if (businessEntity == null) {
@@ -724,8 +731,8 @@ public class ValidatePublish extends ValidateUDDIApi {
}
public void validateBusinessServices(EntityManager em, org.uddi.api_v3.BusinessServices businessServices,
- org.uddi.api_v3.BusinessEntity parent, Configuration config, UddiEntityPublisher publisher)
- throws DispositionReportFaultMessage {
+ org.uddi.api_v3.BusinessEntity parent, Configuration config, UddiEntityPublisher publisher)
+ throws DispositionReportFaultMessage {
// Business services is optional
if (businessServices == null) {
return;
@@ -742,8 +749,8 @@ public class ValidatePublish extends ValidateUDDIApi {
}
public void validateBusinessService(EntityManager em, org.uddi.api_v3.BusinessService businessService,
- org.uddi.api_v3.BusinessEntity parent, Configuration config, UddiEntityPublisher publisher)
- throws DispositionReportFaultMessage {
+ org.uddi.api_v3.BusinessEntity parent, Configuration config, UddiEntityPublisher publisher)
+ throws DispositionReportFaultMessage {
// A supplied businessService can't be null
if (businessService == null) {
@@ -894,8 +901,8 @@ public class ValidatePublish extends ValidateUDDIApi {
}
public void validateBindingTemplates(EntityManager em, org.uddi.api_v3.BindingTemplates bindingTemplates,
- org.uddi.api_v3.BusinessService parent, Configuration config, UddiEntityPublisher publisher)
- throws DispositionReportFaultMessage {
+ org.uddi.api_v3.BusinessService parent, Configuration config, UddiEntityPublisher publisher)
+ throws DispositionReportFaultMessage {
// Binding templates is optional
if (bindingTemplates == null) {
return;
@@ -909,13 +916,12 @@ public class ValidatePublish extends ValidateUDDIApi {
for (org.uddi.api_v3.BindingTemplate bindingTemplate : bindingTemplateList) {
validateBindingTemplate(em, bindingTemplate, parent, config, publisher);
}
-
}
public void validateBindingTemplate(EntityManager em, org.uddi.api_v3.BindingTemplate bindingTemplate,
- org.uddi.api_v3.BusinessService parent, Configuration config, UddiEntityPublisher publisher)
- throws DispositionReportFaultMessage {
+ org.uddi.api_v3.BusinessService parent, Configuration config, UddiEntityPublisher publisher)
+ throws DispositionReportFaultMessage {
// A supplied bindingTemplate can't be null
if (bindingTemplate == null) {
@@ -1125,7 +1131,7 @@ public class ValidatePublish extends ValidateUDDIApi {
// TODO: validate "checked" categories or category groups (see section 5.2.3 of spec)? optional to support
if (tModel.getName() == null || tModel.getName().getValue() == null
- || tModel.getName().getValue().equals("")) {
+ || tModel.getName().getValue().equals("")) {
throw new ValueNotAllowedException(new ErrorMessage("errors.tmodel.NoName"));
}
@@ -1152,9 +1158,9 @@ public class ValidatePublish extends ValidateUDDIApi {
// The keyedRef must not be blank and every field must contain data.
org.uddi.api_v3.KeyedReference keyedRef = pubAssertion.getKeyedReference();
if (keyedRef == null
- || keyedRef.getTModelKey() == null || keyedRef.getTModelKey().length() == 0
- || keyedRef.getKeyName() == null || keyedRef.getKeyName().length() == 0
- || keyedRef.getKeyValue() == null || keyedRef.getKeyValue().length() == 0) {
+ || keyedRef.getTModelKey() == null || keyedRef.getTModelKey().length() == 0
+ || keyedRef.getKeyName() == null || keyedRef.getKeyName().length() == 0
+ || keyedRef.getKeyValue() == null || keyedRef.getKeyValue().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.pubassertion.BlankKeyedRef"));
}
@@ -1577,21 +1583,22 @@ public class ValidatePublish extends ValidateUDDIApi {
}
public void validateSaveSubscriptionAdmin(EntityManager em, String publisherOrUsername, List<Subscription> subscriptions) throws DispositionReportFaultMessage {
-
- // No null input
+
+ // No null input
if (subscriptions == null || subscriptions.isEmpty()) {
throw new FatalErrorException(new ErrorMessage("errors.NullInput"));
}
-
+
if (!((Publisher) publisher).isAdmin()) {
- throw new UserMismatchException(new ErrorMessage("errors.deletepublisher.AdminReqd"));
+ throw new UserMismatchException(new ErrorMessage("errors.deletepublisher.AdminReqd"));
}
UddiEntityPublisher user = new UddiEntityPublisher(publisherOrUsername);
ValidateSubscription vsub = new ValidateSubscription(user);
- for (int i=0; i < subscriptions.size(); i++){
- vsub.validateSubscriptions(em, subscriptions, user);
+ for (int i = 0; i < subscriptions.size(); i++) {
+ vsub.validateSubscriptions(em, subscriptions, user);
}
}
+
public void validateSavePublisher(EntityManager em, SavePublisher body) throws DispositionReportFaultMessage {
// No null input
@@ -1815,7 +1822,7 @@ public class ValidatePublish extends ValidateUDDIApi {
for (int i = 0; i < phone.size(); i++) {
validateUseType(phone.get(i).getUseType());
if (phone.get(i).getValue() == null
- || phone.get(i).getValue().length() == 0) {
+ || phone.get(i).getValue().length() == 0) {
throw new ValueNotAllowedException(new ErrorMessage("errors.phone.noinput"));
}
if (phone.get(i).getValue().length() > ValidationConstants.MAX_phone) {
@@ -2198,15 +2205,15 @@ public class ValidatePublish extends ValidateUDDIApi {
for (int i = 0; i < addressLine.size(); i++) {
if (addressLine.get(i).getKeyName() == null
- || addressLine.get(i).getKeyName().trim().length() == 0) {
+ || addressLine.get(i).getKeyName().trim().length() == 0) {
err += "addressLine(" + i + ").keyName,";
}
if (addressLine.get(i).getKeyValue() == null
- || addressLine.get(i).getKeyValue().trim().length() == 0) {
+ || addressLine.get(i).getKeyValue().trim().length() == 0) {
err += "addressLine(" + i + ").keyValue,";
}
if (addressLine.get(i).getValue() == null
- || addressLine.get(i).getValue().trim().length() == 0) {
+ || addressLine.get(i).getValue().trim().length() == 0) {
err += "addressLine(" + i + ").value,";
}
}
@@ -2385,20 +2392,23 @@ public class ValidatePublish extends ValidateUDDIApi {
throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NoInput"));
}
//get the latest replication config
- if (cfg!=null){
- if (cfg.getCommunicationGraph()!=null){
- for (String node : cfg.getCommunicationGraph().getNode()) {
- if (node.equals(nodeID.getNodeID()))
- throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
- }
- for (int i=0; i <cfg.getCommunicationGraph().getEdge().size(); i++){
- if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageReceiver()))
- throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
- if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageSender()))
- throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
-
- }
- }
+ if (cfg != null) {
+ if (cfg.getCommunicationGraph() != null) {
+ for (String node : cfg.getCommunicationGraph().getNode()) {
+ if (node.equals(nodeID.getNodeID())) {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+ }
+ }
+ for (int i = 0; i < cfg.getCommunicationGraph().getEdge().size(); i++) {
+ if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageReceiver())) {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+ }
+ if (nodeID.getNodeID().equals(cfg.getCommunicationGraph().getEdge().get(i).getMessageSender())) {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.InReplicationConfig", nodeID.getNodeID()));
+ }
+
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index 97da3ff..df5a436 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -58,9 +58,9 @@ public class ValidateReplication extends ValidateUDDIApi {
//This is the unique key for the calling node and SHOULD be specified within the Replication Configuration Structure.
throw new FatalErrorException(new ErrorMessage("errors.replication.nodeNotSpecified"));
}
- if (!ContainsNode(requestingNode, FetchEdges)) {
- throw new FatalErrorException(new ErrorMessage("errors.replication.unknownNode"));
- }
+ //if (!ContainsNode(requestingNode, FetchEdges)) {
+ // throw new FatalErrorException(new ErrorMessage("errors.replication.unknownNode"));
+ //}
if (changesAlreadySeen != null) {
// changesAlreadySeen: The changesAlreadySeen element, if present, indicates changes from each
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 95d98ce..fe79f62 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -296,3 +296,4 @@ errors.replication.configNodeNotFound=No specified node name is not currently li
errors.replication.configNull=No replication config was present in the message
errors.replication.contactNull=No replication contact was present in the message
errors.deleteNode.InReplicationConfig=The node to be deleted is currently referenced in the replication configuration. You must revise the configuration before deleting the node,
+errors.usermismatch.InvalidNode=The user is not authorized to alter the given entity. It is not owned by this jUDDI node. Try your request again on the authoritative node.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index 700c96d..2227973 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -46,6 +46,7 @@ import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.PersonName;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.ChangeRecords;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.DoPing;
import org.uddi.repl_v3.GetChangeRecords;
@@ -121,8 +122,8 @@ public class API_160_ReplicationTest {
}
}
- @Test(expected = FatalErrorException.class)
- public void getChangeRecordsInvalid() throws DispositionReportFaultMessage, RemoteException {
+ // @Test(expected = FatalErrorException.class)
+ public void getChangeRecordsValid() throws DispositionReportFaultMessage, RemoteException {
List<ChangeRecordIDType> highWaterMarks = repl.getHighWaterMarks();
HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
@@ -132,8 +133,8 @@ public class API_160_ReplicationTest {
req.setChangesAlreadySeen(null);
req.setResponseLimitVector(highWaterMarkVectorType);
- repl.getChangeRecords(req);//"test", null, BigInteger.valueOf(highWaterMarks.get(0).getOriginatingUSN()), highWaterMarkVectorType);
- Assert.fail("unexpected success");
+ ChangeRecords changeRecords = repl.getChangeRecords(req); //"test", null, BigInteger.valueOf(highWaterMarks.get(0).getOriginatingUSN()), highWaterMarkVectorType);
+ //Assert.fail("unexpected success");
}
/**
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
index 3d0dacd..8b38575 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
@@ -133,7 +133,7 @@ public class EntryPoint {
int biz = Integer.parseInt(System.console().readLine());
System.out.print("servicesPerBusiness: ");
int svc = Integer.parseInt(System.console().readLine());
- new UddiCreatebulk().publishBusiness(authtoken, biz, svc);
+ new UddiCreatebulk("default").publishBusiness(authtoken, biz, svc);
}
if (input.equals("7")) {
UDDISecurityPortType security = null;
@@ -439,22 +439,25 @@ public class EntryPoint {
}
if (input.equals("magic")) {
//secret menu, setups up replication between juddi8080 and 9080 and adds a record or two on 8080
- UDDISecurityPortType security = null;
- UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ //UDDISecurityPortType security = null;
+ //UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- Transport transport = clerkManager.getTransport("default");
+ /* Transport transport = clerkManager.getTransport("default");
security = transport.getUDDISecurityService();
- String uname = "root";
+ String uname = "root";
GetAuthToken getAuthTokenRoot = new GetAuthToken();
getAuthTokenRoot.setUserID(uname);
getAuthTokenRoot.setCred("root");
authtoken = security.getAuthToken(getAuthTokenRoot).getAuthInfo();
- System.out.println("Success!");
+ System.out.println("Success!");*/
+
+ //this setups up a replication config between the two nodes
new JuddiAdminService().autoMagic();
- new UddiCreatebulk().publishBusiness(authtoken, 1, 1);
+ new UddiCreatebulk("default").publishBusiness(null, 1, 1);
+ new UddiCreatebulk("uddi:another.juddi.apache.org:node2").publishBusiness(null, 1, 1);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
index 696c8b7..7825e79 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiCreatebulk.java
@@ -41,12 +41,12 @@ public class UddiCreatebulk {
private static UDDISecurityPortType security = null;
private static UDDIPublicationPortType publish = null;
- public UddiCreatebulk() {
+ public UddiCreatebulk(String node) {
try {
// create a manager and read the config in the archive;
// you can use your config file name
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- Transport transport = clerkManager.getTransport();
+ Transport transport = clerkManager.getTransport(node);
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
publish = transport.getUDDIPublishService();
@@ -186,7 +186,7 @@ public class UddiCreatebulk {
}
public static void main(String args[]) {
- UddiCreatebulk sp = new UddiCreatebulk();
+ UddiCreatebulk sp = new UddiCreatebulk(null);
sp.publishBusiness(null, 15, 20);
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
index 106e855..534032d 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
@@ -363,7 +363,7 @@ pages.editor.tmodel.instances=Instances
pages.editor.tmodel.deleted=Is this tModel Deleted? (not available for future use).
pages.signatures.signedby=Signed By
pages.signatures.status=Signature Status
-pages.editor.tmodel.instances.content=Use this to search for other entities in this registery that reference this tModel
+pages.editor.tmodel.instances.content=Use this to search for other entities in this registry that reference this tModel
pages.editor.tmodel.search.business=Find Businesses
pages.editor.tmodel.search.binding=Find binding
pages.editor.tmodel.search.services=Find services
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-gui/src/main/webapp/bindingEditor.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/bindingEditor.jsp b/juddi-gui/src/main/webapp/bindingEditor.jsp
index a0699c7..9a1a1f1 100644
--- a/juddi-gui/src/main/webapp/bindingEditor.jsp
+++ b/juddi-gui/src/main/webapp/bindingEditor.jsp
@@ -217,14 +217,14 @@
<b><%=ResourceLoader.GetResource(session, "items.description")%> </b>-
<%=ResourceLoader.GetResource(session, "items.services.description")%><br>
- <a href="javascript:AddDescription('Description');"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.description.add")%>
+ <a href="javascript:AddDescription('Description');"><i class="icon-plus-sign icon-large"></i> <%=ResourceLoader.GetResource(session, "items.description.add")%></a>
<div id="Description" style="border-width: 2px; border-style: solid;" >
<%
for (int i = 0; i < bd.getDescription().size(); i++) {
out.write("<div id=\"" + PostBackConstants.DESCRIPTION + i + "\" style=\"border-width:1px; border-style:solid\">");
out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
- out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + ": </div>"
+ out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ": </div>"
+ "<div class=\"edit\" id=\"" + PostBackConstants.DESCRIPTION + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getDescription().get(i).getValue()) + "</div>");
out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ": </div>"
+ "<div class=\"edit\" id=\"" + PostBackConstants.DESCRIPTION + i + PostBackConstants.LANG + "\">"
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-gui/src/main/webapp/js/businessEditor.js
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/js/businessEditor.js b/juddi-gui/src/main/webapp/js/businessEditor.js
index 090fe49..ab213e3 100644
--- a/juddi-gui/src/main/webapp/js/businessEditor.js
+++ b/juddi-gui/src/main/webapp/js/businessEditor.js
@@ -92,7 +92,7 @@ function AddDescription()
var i = currentDescriptionEntries;
$("<div id=\"Description" + i + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_value + ": </div>"
+"<div class=\"edit\" id=\"Description" + i + "Value\"></div>"
+"<div style=\"float:left\">" + i18n_lang + ": </div>"
@@ -109,7 +109,7 @@ function AddDisco()
$("<div id=\"disco" + i + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('disco" + i
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_value + ": </div>"
+"<div class=\"edit\" id=\"disco" + i + "Value\"></div>"
+"<div style=\"float:left\">" + i18n_type + ": </div>"
@@ -129,7 +129,7 @@ function AddContact()
$("<div id=\"contact" + i + "\" style=\"border-width:2px; border-style:solid; border-color:red\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + i
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_contactType+ ": </div>"
+"<div class=\"edit\" id=\"contact" + i + "Type\">" + i18n_contactTypeDefault + "</div>"
+"<a href=\"javascript:AddContactName('" + i + "');\"><i class=\"icon-plus-sign icon-large\"></i></a>" + i18n_name + "  "
@@ -148,7 +148,7 @@ function AddContactName(contactid)
{
$("<div id=\"contact" + contactid + "Name" + contactname + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Name" + contactname
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_name + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "Name" + contactname + "Value\"></div>"
+"<div style=\"float:left\">" + i18n_lang + ": </div>"
@@ -162,7 +162,7 @@ function AddContactEmail(contactid)
{
$("<div id=\"contact" + contactid + "Email" + contactemail + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Email" + contactemail
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_type + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "Email" + contactemail + "Type\">" + i18n_email+ "</div>"
+"<div style=\"float:left\">" + i18n_value + ": </div>"
@@ -175,7 +175,7 @@ function AddContactDescription(contactid)
{
$("<div id=\"contact" + contactid + "Description" + contactdescription + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Description" + contactdescription
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_description + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "Description" + contactdescription + "Value\">"+i18n_contactPrimary+"</div>"
+"<div style=\"float:left\">" + i18n_lang + ": </div>"
@@ -189,7 +189,7 @@ function AddContactPhone(contactid)
{
$("<div id=\"contact" + contactid + "Phone" + contactphone + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Phone" + contactphone
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_phone + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "Phone" + contactphone + "Value\"></div>"
+"<div style=\"float:left\">" + i18n_type + ": </div>"
@@ -204,7 +204,7 @@ function AddContactAddress(contactid)
$("<div id=\"contact" + contactid + "Address" + contactaddress + "\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "Address" + contactaddress
- +"');\"><i class=\"icon-trash icon-large\"></i></a>" + i18n_address + "</div><br>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a>" + i18n_address + "</div><br>"
+"<div style=\"float:left\">" + i18n_lang + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "Address" + contactaddress + "Lang\"></div>"
+"<div style=\"float:left\">" + i18n_addressSortCode + ": </div>"
@@ -228,7 +228,7 @@ function AddContactAddressLine(contactid)
"\" style=\"border-width:1px; border-style:solid\" >"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('contact" + contactid + "addressLine" +contactaddresslines
- +"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ +"');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+"<div style=\"float:left\">" + i18n_addressValue + ": </div>"
+"<div class=\"edit\" id=\"contact" + contactid + "addressLine" + contactaddresslines + "Value\"></div>"
+"<div style=\"float:left\">" +i18n_keyname_optional + ": </div>"
@@ -248,7 +248,7 @@ function AddCategoryKeyReferenceParam(tmodelkey, keyname, keyvalue)
var i=currentcatkeyref;
$("<div id=\"catbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
- "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>"+
"<div style=\"float:left\">" + i18n_key +" (<a href=\"javascript:tModelModal('catbagkeyref" + i + "Value')\" ><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ "<div class=\"edit\" id=\"catbagkeyref" + i + "Value\">" + tmodelkey + "</div>"
+"<div style=\"float:left\">" + i18n_name + ": </div>"
@@ -267,7 +267,7 @@ function AddCategoryKeyReference()
var i=currentcatkeyref;
$("<div id=\"catbagkeyref" + i + "\" style=\"border-width:1px; border-style:solid\">"+
- "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"+
+ "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbagkeyref" + i + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>"+
// <div style=\"float:left\">" + s.key") + ": <a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "')\" class=\"btn btn-mini\">Picker</a> </div>"
"<div style=\"float:left\">" + i18n_key +" (<a href=\"javascript:tModelModal('catbagkeyref" + i + "Value')\" ><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div>"
+ "<div class=\"edit\" id=\"catbagkeyref" + i + "Value\"></div>"
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-gui/src/main/webapp/serviceEditor.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/serviceEditor.jsp b/juddi-gui/src/main/webapp/serviceEditor.jsp
index 00b41b9..9c1c37f 100644
--- a/juddi-gui/src/main/webapp/serviceEditor.jsp
+++ b/juddi-gui/src/main/webapp/serviceEditor.jsp
@@ -348,7 +348,7 @@
<b><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%> </b>- <%=ResourceLoader.GetResource(session, "items.bindingtemplate.description")%> <br>
<% if (!newitem) {
%>
- <a href="bindingEditor.jsp?svcid=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>"><i class="icon-plus-sign icon-large"></i></a> <%=ResourceLoader.GetResource(session, "items.bindingtemplate.add")%> <Br>
+ <a href="bindingEditor.jsp?svcid=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>"><i class="icon-plus-sign icon-large"></i> <%=ResourceLoader.GetResource(session, "items.bindingtemplate.add")%></a> <Br>
<%
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-tomcat/build.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index f2349f9..325634f 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -81,8 +81,10 @@
<copy file="${basedir}/juddiv3Node2.xml" tofile="${webapps2.dir}/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true"/>
<copy file="${basedir}/juddi_install_data_node2/root_BusinessEntity.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
-<copy file="${basedir}/juddi_install_data_node2/root_Publisher.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
-<copy file="${basedir}/juddi_install_data_node2/root_tModelKeyGen.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+ <copy file="${basedir}/juddi_install_data_node2/root_Publisher.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+ <copy file="${basedir}/juddi_install_data_node2/root_tModelKeyGen.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+ <copy file="${basedir}/juddi_install_data_node2/UDDI_Publisher.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
+ <copy file="${basedir}/juddi_install_data_node2/UDDI_tModels.xml" todir="${webapps2.dir}/juddiv3/WEB-INF/classes/juddi_custom_install_data/" overwrite="true"/>
<copy file="${basedir}/uddiNode2.xml" tofile="${webapps2.dir}/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-tomcat/juddi_install_data_node2/UDDI_Publisher.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/UDDI_Publisher.xml b/juddi-tomcat/juddi_install_data_node2/UDDI_Publisher.xml
new file mode 100644
index 0000000..0bfd815
--- /dev/null
+++ b/juddi-tomcat/juddi_install_data_node2/UDDI_Publisher.xml
@@ -0,0 +1,22 @@
+<?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.
+ *
+ */ -->
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="uddi">
+ <publisherName>UDDI publisher</publisherName>
+ <isAdmin>false</isAdmin>
+</publisher>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[22/28] juddi git commit: JUDDI-241 basic replication now working for
business entities
Posted by al...@apache.org.
JUDDI-241 basic replication now working for business entities
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/daf9de25
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/daf9de25
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/daf9de25
Branch: refs/heads/master
Commit: daf9de25362e6a2d4cda316c23dea5bdaac18b41
Parents: 939ae47
Author: Alex <al...@apache.org>
Authored: Sun Dec 7 15:07:38 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sun Dec 7 15:07:38 2014 -0500
----------------------------------------------------------------------
.../juddi/api/impl/UDDIReplicationImpl.java | 54 ++++++++++++++------
.../java/org/apache/juddi/config/Property.java | 2 +-
.../juddi/validation/ValidatePublish.java | 8 +++
3 files changed, 48 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/daf9de25/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 30cfdec..5c3b22c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -16,6 +16,7 @@
*/
package org.apache.juddi.api.impl;
+import java.io.StringWriter;
import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.ArrayList;
@@ -46,6 +47,7 @@ import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.BindingTemplate;
import org.apache.juddi.model.BusinessEntity;
import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.Operator;
@@ -108,7 +110,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
private static PullTimerTask timer = null;
private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ private long interval = 5000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
private static UDDIPublicationImpl pub = null;
@@ -175,7 +177,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
logger.fatal("unable to obtain a replication client to node " + poll.getNotifyingNode());
} else {
try {
- //get the high water marks for this node
+ //get the high water marks for this node
//ok now get all the changes
logger.info("fetching updates on, since ");
for (int xx = 0; xx < poll.getChangesAvailable().getHighWaterMark().size(); xx++) {
@@ -233,8 +235,10 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
* a USN is less than the USN specified in the
* changesAlreadySeen highWaterMarkVector.
*/
- logger.info("Remote change request");
- JAXB.marshal(rec, System.out);
+ StringWriter sw = new StringWriter();
+ JAXB.marshal(rec, sw);
+ logger.info("_______________________Remote change request " + sw.toString());
+
try {
tx.begin();
//the change record rec must also be persisted!!
@@ -300,25 +304,31 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
} else {
ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
- org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
- MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
- MappingApiToModel.mapOperationalInfo(modelT, rec.getChangeRecordNewData().getOperationalInfo());
+ org.apache.juddi.model.BindingTemplate bt= em.find(org.apache.juddi.model.BindingTemplate.class,rec.getChangeRecordNewData().getBindingTemplate().getBindingKey() );
+ if (bt!=null){
+ em.remove(bt);
+ }
+ bt = new BindingTemplate();
+ MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), bt, model);
+ MappingApiToModel.mapOperationalInfo(bt, rec.getChangeRecordNewData().getOperationalInfo());
// MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
- em.persist(model);
+ em.persist(bt);
}
} else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
- if (model == null) {
- model = new BusinessEntity();
- } else {
+ if (model != null) {
ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
- }
+ //TODO revisit access control rules
+ em.remove(model);
+ }
+ model = new BusinessEntity();
MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
- // MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ // MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
+ logger.warn("Name size on save is " + model.getBusinessNames().size());
em.persist(model);
}
@@ -327,7 +337,15 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
if (find == null) {
logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
} else {
- org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
+
+ org.apache.juddi.model.BusinessService model = null;
+ model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBusinessService().getServiceKey());
+ if (model != null) {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+ em.remove(model);
+ }
+
+ model = new org.apache.juddi.model.BusinessService();
MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
@@ -336,7 +354,13 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
} else if (rec.getChangeRecordNewData().getTModel() != null) {
- Tmodel model = new Tmodel();
+
+ Tmodel model = em.find(org.apache.juddi.model.Tmodel.class, rec.getChangeRecordNewData().getTModel().getTModelKey());
+ if (model != null) {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+ em.remove(model);
+ }
+ model = new Tmodel();
MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
http://git-wip-us.apache.org/repos/asf/juddi/blob/daf9de25/juddi-core/src/main/java/org/apache/juddi/config/Property.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Property.java b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
index 18d15a6..2960c5c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Property.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Property.java
@@ -50,7 +50,7 @@ public interface Property {
*/
public final static String JUDDI_NODE_ROOT_BUSINESS = "juddi.root.businessId";
/**
- * this is the unique identifier of this uddi service provide, primarily used for clustered setups with the replication api
+ * this is the unique identifier of this uddi service provider, primarily used for clustered setups with the replication api
* JUDDI-645
*/
public final static String JUDDI_NODE_ID = "juddi.nodeId";
http://git-wip-us.apache.org/repos/asf/juddi/blob/daf9de25/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index 9d02d9c..f3df32f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -115,6 +115,12 @@ public class ValidatePublish extends ValidateUDDIApi {
*/
private Log log = LogFactory.getLog(this.getClass());
+ /**
+ * used from Install class
+ * @param publisher
+ * @param nodeid
+ * @see Install
+ */
public ValidatePublish(UddiEntityPublisher publisher, String nodeid) {
super(publisher, nodeid);
}
@@ -278,10 +284,12 @@ public class ValidatePublish extends ValidateUDDIApi {
private void AccessCheck(Object obj, String entityKey) throws UserMismatchException {
boolean accessCheck = false; //assume access denied
+ //TODO revisit access control rules in a replicated environment
if (publisher.isOwner((UddiEntity) obj)) {
accessCheck = true;
}
+ //if i'm an admin, let me edit stuff on this node, but only stuff that's owned by this node
if (((Publisher) publisher).isAdmin()
&& nodeID.equals(((UddiEntity) obj).getNodeId())) {
accessCheck = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[08/28] juddi git commit: JUDDI-241 Adding additional changes
required by replication api. Not all tests pass on juddi api
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index e9bf41a..8a4f1c1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.mapping;
import java.math.BigInteger;
@@ -98,1088 +97,1106 @@ import org.w3c.dom.Element;
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*/
public class MappingModelToApi {
- private static Log logger = LogFactory.getLog(MappingModelToApi.class);
-
-
- public static void mapPublisher(org.apache.juddi.model.Publisher modelPublisher,
- org.apache.juddi.api_v3.Publisher apiPublisher)
- throws DispositionReportFaultMessage {
-
- apiPublisher.setAuthorizedName(modelPublisher.getAuthorizedName());
- apiPublisher.setPublisherName(modelPublisher.getPublisherName());
- apiPublisher.setEmailAddress(modelPublisher.getEmailAddress());
- apiPublisher.setIsAdmin(modelPublisher.getIsAdmin());
- apiPublisher.setIsEnabled(modelPublisher.getIsEnabled());
- apiPublisher.setMaxBindingsPerService(modelPublisher.getMaxBindingsPerService());
- apiPublisher.setMaxBusinesses(modelPublisher.getMaxBusinesses());
- apiPublisher.setMaxServicePerBusiness(modelPublisher.getMaxServicesPerBusiness());
- apiPublisher.setMaxTModels(modelPublisher.getMaxTmodels());
+
+ private static Log logger = LogFactory.getLog(MappingModelToApi.class);
+
+ public static void mapPublisher(org.apache.juddi.model.Publisher modelPublisher,
+ org.apache.juddi.api_v3.Publisher apiPublisher)
+ throws DispositionReportFaultMessage {
+
+ apiPublisher.setAuthorizedName(modelPublisher.getAuthorizedName());
+ apiPublisher.setPublisherName(modelPublisher.getPublisherName());
+ apiPublisher.setEmailAddress(modelPublisher.getEmailAddress());
+ apiPublisher.setIsAdmin(modelPublisher.getIsAdmin());
+ apiPublisher.setIsEnabled(modelPublisher.getIsEnabled());
+ apiPublisher.setMaxBindingsPerService(modelPublisher.getMaxBindingsPerService());
+ apiPublisher.setMaxBusinesses(modelPublisher.getMaxBusinesses());
+ apiPublisher.setMaxServicePerBusiness(modelPublisher.getMaxServicesPerBusiness());
+ apiPublisher.setMaxTModels(modelPublisher.getMaxTmodels());
mapSignature(modelPublisher.getSignatures(), apiPublisher.getSignature());
- }
-
- public static void mapBusinessEntity(org.apache.juddi.model.BusinessEntity modelBusinessEntity,
- org.uddi.api_v3.BusinessEntity apiBusinessEntity)
- throws DispositionReportFaultMessage {
-
- apiBusinessEntity.setBusinessKey(modelBusinessEntity.getEntityKey());
-
- mapBusinessNames(modelBusinessEntity.getBusinessNames(), apiBusinessEntity.getName());
- mapBusinessDescriptions(modelBusinessEntity.getBusinessDescrs(), apiBusinessEntity.getDescription());
-
- mapDiscoveryUrls(modelBusinessEntity.getDiscoveryUrls(), apiBusinessEntity.getDiscoveryURLs(), apiBusinessEntity);
- mapContacts(modelBusinessEntity.getContacts(), apiBusinessEntity.getContacts(), apiBusinessEntity);
- mapBusinessIdentifiers(modelBusinessEntity.getBusinessIdentifiers(), apiBusinessEntity.getIdentifierBag(), apiBusinessEntity);
- apiBusinessEntity.setCategoryBag(mapCategoryBag(modelBusinessEntity.getCategoryBag(), apiBusinessEntity.getCategoryBag()));
-
- mapBusinessServices(modelBusinessEntity.getBusinessServices(), modelBusinessEntity.getServiceProjections(), apiBusinessEntity.getBusinessServices(), apiBusinessEntity);
-
+ }
+
+ public static void mapBusinessEntity(org.apache.juddi.model.BusinessEntity modelBusinessEntity,
+ org.uddi.api_v3.BusinessEntity apiBusinessEntity)
+ throws DispositionReportFaultMessage {
+
+ apiBusinessEntity.setBusinessKey(modelBusinessEntity.getEntityKey());
+
+ mapBusinessNames(modelBusinessEntity.getBusinessNames(), apiBusinessEntity.getName());
+ mapBusinessDescriptions(modelBusinessEntity.getBusinessDescrs(), apiBusinessEntity.getDescription());
+
+ mapDiscoveryUrls(modelBusinessEntity.getDiscoveryUrls(), apiBusinessEntity.getDiscoveryURLs(), apiBusinessEntity);
+ mapContacts(modelBusinessEntity.getContacts(), apiBusinessEntity.getContacts(), apiBusinessEntity);
+ mapBusinessIdentifiers(modelBusinessEntity.getBusinessIdentifiers(), apiBusinessEntity.getIdentifierBag(), apiBusinessEntity);
+ apiBusinessEntity.setCategoryBag(mapCategoryBag(modelBusinessEntity.getCategoryBag(), apiBusinessEntity.getCategoryBag()));
+
+ mapBusinessServices(modelBusinessEntity.getBusinessServices(), modelBusinessEntity.getServiceProjections(), apiBusinessEntity.getBusinessServices(), apiBusinessEntity);
+
mapSignature(modelBusinessEntity.getSignatures(), apiBusinessEntity.getSignature());
- }
+ }
public static void mapSignature(List<org.apache.juddi.model.Signature> signatureList,
- List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatureList)
- throws DispositionReportFaultMessage {
- apiSignatureList.clear();
- for (org.apache.juddi.model.Signature modelSig : signatureList) {
- SignatureType apiSignature = new SignatureType();
- apiSignature.setId(modelSig.getXmlID());
-
- SignedInfo modelSignedInfo = modelSig.getSignedInfo();
- SignedInfoType apiSignedInfoType = new SignedInfoType();
- apiSignature.setSignedInfo(apiSignedInfoType);
- // Canonicalization method
- CanonicalizationMethod modelCanonMethod = modelSignedInfo.getCanonicalizationMethod();
- CanonicalizationMethodType apiCanonMethod = new CanonicalizationMethodType();
- apiCanonMethod.setAlgorithm(modelCanonMethod.getAlgorithm());
- apiSignedInfoType.setCanonicalizationMethod(apiCanonMethod);
-
- // Signature Method
- String sigAlg = modelSignedInfo.getSignatureMethod().getAlgorithm();
- SignatureMethodType apiSigMethod = new SignatureMethodType();
- apiSigMethod.setAlgorithm(sigAlg);
- apiSignedInfoType.setSignatureMethod(apiSigMethod);
-
- // References
- List<Reference> modelReferenceList = modelSignedInfo.getReference();
- List<ReferenceType> apiReferenceList = apiSignedInfoType.getReference();
- for (Reference modelRef : modelReferenceList) {
- ReferenceType apiRef = new ReferenceType();
- String refUri = modelRef.getUri();
- if (refUri == null) {
- refUri = "";
- }
- apiRef.setURI(refUri);
-
- List<SignatureTransform> modelSigTransformList = modelRef.getTransforms();
- TransformsType apiTransformsType = apiRef.getTransforms();
- if (apiTransformsType == null) {
- apiTransformsType = new TransformsType();
- apiRef.setTransforms(apiTransformsType);
- }
- List<TransformType> apiTransformList = apiTransformsType.getTransform();
- for (SignatureTransform modelSigTransform : modelSigTransformList) {
- String modelTransformAlgStr = modelSigTransform.getTransform();
- TransformType apiTransform = new TransformType();
- apiTransform.setAlgorithm(modelTransformAlgStr);
-
- List<SignatureTransformDataValue> sigTransformSDVList = modelSigTransform.getSignatureTransformDataValue();
- for (SignatureTransformDataValue sigTransformSDV : sigTransformSDVList) {
- String type = sigTransformSDV.getContentType();
- byte[] xformBytes = sigTransformSDV.getContentBytes();
- Object transformObject = convertDataToTransformContent(type, xformBytes);
- apiTransform.getContent().add(transformObject);
+ List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatureList)
+ throws DispositionReportFaultMessage {
+ apiSignatureList.clear();
+ for (org.apache.juddi.model.Signature modelSig : signatureList) {
+ SignatureType apiSignature = new SignatureType();
+ apiSignature.setId(modelSig.getXmlID());
+
+ SignedInfo modelSignedInfo = modelSig.getSignedInfo();
+ SignedInfoType apiSignedInfoType = new SignedInfoType();
+ apiSignature.setSignedInfo(apiSignedInfoType);
+ // Canonicalization method
+ CanonicalizationMethod modelCanonMethod = modelSignedInfo.getCanonicalizationMethod();
+ CanonicalizationMethodType apiCanonMethod = new CanonicalizationMethodType();
+ apiCanonMethod.setAlgorithm(modelCanonMethod.getAlgorithm());
+ apiSignedInfoType.setCanonicalizationMethod(apiCanonMethod);
+
+ // Signature Method
+ String sigAlg = modelSignedInfo.getSignatureMethod().getAlgorithm();
+ SignatureMethodType apiSigMethod = new SignatureMethodType();
+ apiSigMethod.setAlgorithm(sigAlg);
+ apiSignedInfoType.setSignatureMethod(apiSigMethod);
+
+ // References
+ List<Reference> modelReferenceList = modelSignedInfo.getReference();
+ List<ReferenceType> apiReferenceList = apiSignedInfoType.getReference();
+ for (Reference modelRef : modelReferenceList) {
+ ReferenceType apiRef = new ReferenceType();
+ String refUri = modelRef.getUri();
+ if (refUri == null) {
+ refUri = "";
+ }
+ apiRef.setURI(refUri);
+
+ List<SignatureTransform> modelSigTransformList = modelRef.getTransforms();
+ TransformsType apiTransformsType = apiRef.getTransforms();
+ if (apiTransformsType == null) {
+ apiTransformsType = new TransformsType();
+ apiRef.setTransforms(apiTransformsType);
+ }
+ List<TransformType> apiTransformList = apiTransformsType.getTransform();
+ for (SignatureTransform modelSigTransform : modelSigTransformList) {
+ String modelTransformAlgStr = modelSigTransform.getTransform();
+ TransformType apiTransform = new TransformType();
+ apiTransform.setAlgorithm(modelTransformAlgStr);
+
+ List<SignatureTransformDataValue> sigTransformSDVList = modelSigTransform.getSignatureTransformDataValue();
+ for (SignatureTransformDataValue sigTransformSDV : sigTransformSDVList) {
+ String type = sigTransformSDV.getContentType();
+ byte[] xformBytes = sigTransformSDV.getContentBytes();
+ Object transformObject = convertDataToTransformContent(type, xformBytes);
+ apiTransform.getContent().add(transformObject);
+ }
+
+ apiTransformList.add(apiTransform);
+ }
+
+ String digestMethodStr = modelRef.getDigestMethod();
+ byte[] digestValBytes = modelRef.getDigestValue();
+
+ DigestMethodType apiDigestMethod = new DigestMethodType();
+ apiDigestMethod.setAlgorithm(digestMethodStr);
+ apiRef.setDigestMethod(apiDigestMethod);
+ apiRef.setDigestValue(digestValBytes);
+
+ apiReferenceList.add(apiRef);
}
-
- apiTransformList.add(apiTransform);
- }
-
- String digestMethodStr = modelRef.getDigestMethod();
- byte[] digestValBytes = modelRef.getDigestValue();
-
- DigestMethodType apiDigestMethod = new DigestMethodType();
- apiDigestMethod.setAlgorithm(digestMethodStr);
- apiRef.setDigestMethod(apiDigestMethod);
- apiRef.setDigestValue(digestValBytes);
-
- apiReferenceList.add(apiRef);
- }
-
- // Signature Value
- SignatureValueType apiSignatureValue = new SignatureValueType();
- SignatureValue modelSigValue = modelSig.getSignatureValue();
- apiSignatureValue.setId(modelSigValue.getXmlID());
- apiSignatureValue.setValue(modelSigValue.getValue());
-
- apiSignature.setSignatureValue(apiSignatureValue);
-
- KeyInfoType apiKeyInfo = new KeyInfoType();
- KeyInfo modelKeyInfo = modelSig.getKeyInfo();
- apiKeyInfo.setId(modelKeyInfo.getXmlID());
-
- List<KeyDataValue> modelKeyDataValueList = modelKeyInfo.getKeyDataValue();
- List<Object> apiX509KeyInfoList = apiKeyInfo.getContent();
- mapModelKeyDataValue(modelKeyDataValueList, apiX509KeyInfoList);
- apiSignature.setKeyInfo(apiKeyInfo);
- apiSignatureList.add(apiSignature);
- }
+
+ // Signature Value
+ SignatureValueType apiSignatureValue = new SignatureValueType();
+ SignatureValue modelSigValue = modelSig.getSignatureValue();
+ apiSignatureValue.setId(modelSigValue.getXmlID());
+ apiSignatureValue.setValue(modelSigValue.getValue());
+
+ apiSignature.setSignatureValue(apiSignatureValue);
+
+ KeyInfoType apiKeyInfo = new KeyInfoType();
+ KeyInfo modelKeyInfo = modelSig.getKeyInfo();
+ apiKeyInfo.setId(modelKeyInfo.getXmlID());
+
+ List<KeyDataValue> modelKeyDataValueList = modelKeyInfo.getKeyDataValue();
+ List<Object> apiX509KeyInfoList = apiKeyInfo.getContent();
+ mapModelKeyDataValue(modelKeyDataValueList, apiX509KeyInfoList);
+ apiSignature.setKeyInfo(apiKeyInfo);
+ apiSignatureList.add(apiSignature);
+ }
}
-
+
private static void mapModelKeyDataValue(List<KeyDataValue> modelKeyDataValueList, List<Object> parentKeyDataList) {
- for (KeyDataValue modelKeyDataValue : modelKeyDataValueList) {
- String tagName = modelKeyDataValue.getKeyDataName();
- String dataType = modelKeyDataValue.getKeyDataType();
- byte[] contentBytes = modelKeyDataValue.getKeyDataValueBytes();
- String contentStr = modelKeyDataValue.getKeyDataValueString();
- Object contents = contentBytes != null ? contentBytes : contentStr;
-
- if (contents == null) {
- List<Object> childKeyDataList = new ArrayList<Object>();
- if (dataType.equals(X509DataType.class.getSimpleName())) {
- X509DataType x509DataType = new X509DataType();
- mapModelKeyDataValue(modelKeyDataValue.getKeyDataValueList(), childKeyDataList);
- x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().addAll(childKeyDataList);
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), X509DataType.class, x509DataType);
- parentKeyDataList.add(dataJAXB);
- } else if (dataType.equals(RetrievalMethodType.class.getSimpleName())) {
- RetrievalMethodType retrievalMethodType = new RetrievalMethodType();
- TransformsType transformsType = new TransformsType();
- for (KeyDataValue retrievalMethodKDV : modelKeyDataValue.getKeyDataValueList()) {
- if (retrievalMethodKDV.getKeyDataName().equals("Transform")) {
- TransformType tType = new TransformType();
- tType.setAlgorithm(retrievalMethodKDV.getKeyDataValueString());
-
- for (KeyDataValue transformContentKDV: retrievalMethodKDV.getKeyDataValueList()) {
- String type = transformContentKDV.getKeyDataType();
- byte[] xformBytes = transformContentKDV.getKeyDataValueBytes();
- Object transformObject = convertDataToTransformContent(type, xformBytes);
- tType.getContent().add(transformObject);
+ for (KeyDataValue modelKeyDataValue : modelKeyDataValueList) {
+ String tagName = modelKeyDataValue.getKeyDataName();
+ String dataType = modelKeyDataValue.getKeyDataType();
+ byte[] contentBytes = modelKeyDataValue.getKeyDataValueBytes();
+ String contentStr = modelKeyDataValue.getKeyDataValueString();
+ Object contents = contentBytes != null ? contentBytes : contentStr;
+
+ if (contents == null) {
+ List<Object> childKeyDataList = new ArrayList<Object>();
+ if (dataType.equals(X509DataType.class.getSimpleName())) {
+ X509DataType x509DataType = new X509DataType();
+ mapModelKeyDataValue(modelKeyDataValue.getKeyDataValueList(), childKeyDataList);
+ x509DataType.getX509IssuerSerialOrX509SKIOrX509SubjectName().addAll(childKeyDataList);
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), X509DataType.class, x509DataType);
+ parentKeyDataList.add(dataJAXB);
+ } else if (dataType.equals(RetrievalMethodType.class.getSimpleName())) {
+ RetrievalMethodType retrievalMethodType = new RetrievalMethodType();
+ TransformsType transformsType = new TransformsType();
+ for (KeyDataValue retrievalMethodKDV : modelKeyDataValue.getKeyDataValueList()) {
+ if (retrievalMethodKDV.getKeyDataName().equals("Transform")) {
+ TransformType tType = new TransformType();
+ tType.setAlgorithm(retrievalMethodKDV.getKeyDataValueString());
+
+ for (KeyDataValue transformContentKDV : retrievalMethodKDV.getKeyDataValueList()) {
+ String type = transformContentKDV.getKeyDataType();
+ byte[] xformBytes = transformContentKDV.getKeyDataValueBytes();
+ Object transformObject = convertDataToTransformContent(type, xformBytes);
+ tType.getContent().add(transformObject);
+ }
+
+ transformsType.getTransform().add(tType);
+ } else if (retrievalMethodKDV.getKeyDataName().equals("Type")) {
+ retrievalMethodType.setType(retrievalMethodKDV.getKeyDataValueString());
+ } else if (retrievalMethodKDV.getKeyDataName().equals("URI")) {
+ retrievalMethodType.setURI(retrievalMethodKDV.getKeyDataValueString());
+ } else {
+ throw new RuntimeException("Unrecognized key data type: " + retrievalMethodKDV.getKeyDataType());
+ }
+ }
+ if (transformsType.getTransform() != null && !transformsType.getTransform().isEmpty()) {
+ retrievalMethodType.setTransforms(transformsType);
+ }
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), RetrievalMethodType.class, retrievalMethodType);
+ parentKeyDataList.add(dataJAXB);
+ } else if (dataType.equals(PGPDataType.class.getSimpleName())) {
+ PGPDataType pgpDataType = new PGPDataType();
+
+ for (KeyDataValue pgpDataKDV : modelKeyDataValue.getKeyDataValueList()) {
+ String pgpDataTagName = pgpDataKDV.getKeyDataName();
+ Object pgpDataContents = pgpDataKDV.getKeyDataValueBytes() != null ? pgpDataKDV.getKeyDataValueBytes() : pgpDataKDV.getKeyDataValueString();
+ Class pgpDataClazz = pgpDataContents.getClass();
+ JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", pgpDataTagName), pgpDataClazz, pgpDataContents);
+ pgpDataType.getContent().add(jaxb);
+ }
+
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), PGPDataType.class, pgpDataType);
+ parentKeyDataList.add(dataJAXB);
+ } else if (dataType.equals(SPKIDataType.class.getSimpleName())) {
+ SPKIDataType spkiDataType = new SPKIDataType();
+
+ for (KeyDataValue spkiDataKDV : modelKeyDataValue.getKeyDataValueList()) {
+ String spkiDataTagName = spkiDataKDV.getKeyDataName();
+ Object spkiDataContents = spkiDataKDV.getKeyDataValueBytes() != null ? spkiDataKDV.getKeyDataValueBytes() : spkiDataKDV.getKeyDataValueString();
+ Class spkiDataClazz = spkiDataContents.getClass();
+ JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", spkiDataTagName), spkiDataClazz, spkiDataContents);
+ spkiDataType.getSPKISexpAndAny().add(jaxb);
+ }
+
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), SPKIDataType.class, spkiDataType);
+ parentKeyDataList.add(dataJAXB);
+ } else if (dataType.equals(KeyValueType.class.getSimpleName())) {
+ KeyValueType keyValueType = new KeyValueType();
+ for (KeyDataValue keyValueDataKDV : modelKeyDataValue.getKeyDataValueList()) {
+ for (KeyDataValue keyValueDataChildKDV : keyValueDataKDV.getKeyDataValueList()) {
+ String keyDataDataType = keyValueDataChildKDV.getKeyDataType();
+ if (keyDataDataType.equals("DSAKeyValueType")) {
+ DSAKeyValueType dsaKeyValueType = new DSAKeyValueType();
+ for (KeyDataValue dsaKDV : keyValueDataChildKDV.getKeyDataValueList()) {
+ if ("G".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setG(dsaKDV.getKeyDataValueBytes());
+ } else if ("P".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setP(dsaKDV.getKeyDataValueBytes());
+ } else if ("Q".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setQ(dsaKDV.getKeyDataValueBytes());
+ } else if ("Y".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setY(dsaKDV.getKeyDataValueBytes());
+ } else if ("J".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setJ(dsaKDV.getKeyDataValueBytes());
+ } else if ("Seed".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setSeed(dsaKDV.getKeyDataValueBytes());
+ } else if ("PgenCounter".equals(dsaKDV.getKeyDataName())) {
+ dsaKeyValueType.setPgenCounter(dsaKDV.getKeyDataValueBytes());
+ } else {
+ throw new RuntimeException("Unrecognized dsa type: " + dsaKDV.getKeyDataName());
+ }
+ }
+ JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", keyValueDataChildKDV.getKeyDataName()), DSAKeyValueType.class, dsaKeyValueType);
+ keyValueType.getContent().add(jaxb);
+ } else if (keyDataDataType.equals("RSAKeyValueType")) {
+ RSAKeyValueType rsaKeyValueType = new RSAKeyValueType();
+ for (KeyDataValue rsaKDV : keyValueDataChildKDV.getKeyDataValueList()) {
+ if ("Exponent".equals(rsaKDV.getKeyDataName())) {
+ rsaKeyValueType.setExponent(rsaKDV.getKeyDataValueBytes());
+ } else if ("Modulus".equals(rsaKDV.getKeyDataName())) {
+ rsaKeyValueType.setModulus(rsaKDV.getKeyDataValueBytes());
+ } else {
+ throw new RuntimeException("Unrecognized dsa type: " + rsaKDV.getKeyDataName());
+ }
+ }
+ JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", keyValueDataChildKDV.getKeyDataName()), RSAKeyValueType.class, rsaKeyValueType);
+ keyValueType.getContent().add(jaxb);
+ } else {
+ throw new RuntimeException("Unrecognized element: " + keyDataDataType);
+ }
+ }
+ }
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), KeyValueType.class, keyValueType);
+ parentKeyDataList.add(dataJAXB);
+ } else {
+ throw new RuntimeException("Unrecognized type: " + dataType);
+ }
+ } else {
+ if (dataType != null && dataType.equals(X509IssuerSerialType.class.getSimpleName())) {
+ X509IssuerSerialType x509IssuerSerialType = new X509IssuerSerialType();
+ x509IssuerSerialType.setX509IssuerName(contentStr);
+ x509IssuerSerialType.setX509SerialNumber(new BigInteger(contentBytes));
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), X509IssuerSerialType.class, x509IssuerSerialType);
+ parentKeyDataList.add(dataJAXB);
+ } else {
+ JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), contents.getClass(), contents);
+ parentKeyDataList.add(dataJAXB);
}
-
- transformsType.getTransform().add(tType);
- } else if (retrievalMethodKDV.getKeyDataName().equals("Type")) {
- retrievalMethodType.setType(retrievalMethodKDV.getKeyDataValueString());
- } else if (retrievalMethodKDV.getKeyDataName().equals("URI")) {
- retrievalMethodType.setURI(retrievalMethodKDV.getKeyDataValueString());
- } else {
- throw new RuntimeException("Unrecognized key data type: " + retrievalMethodKDV.getKeyDataType());
- }
- }
- if (transformsType.getTransform() != null && !transformsType.getTransform().isEmpty()) {
- retrievalMethodType.setTransforms(transformsType);
}
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), RetrievalMethodType.class, retrievalMethodType);
- parentKeyDataList.add(dataJAXB);
- } else if (dataType.equals(PGPDataType.class.getSimpleName())) {
- PGPDataType pgpDataType = new PGPDataType();
-
- for (KeyDataValue pgpDataKDV : modelKeyDataValue.getKeyDataValueList()) {
- String pgpDataTagName = pgpDataKDV.getKeyDataName();
- Object pgpDataContents = pgpDataKDV.getKeyDataValueBytes() != null ? pgpDataKDV.getKeyDataValueBytes() : pgpDataKDV.getKeyDataValueString();
- Class pgpDataClazz = pgpDataContents.getClass();
- JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", pgpDataTagName), pgpDataClazz, pgpDataContents);
- pgpDataType.getContent().add(jaxb);
+ }
+ }
+
+ public static void mapBusinessNames(List<org.apache.juddi.model.BusinessName> modelNameList,
+ List<org.uddi.api_v3.Name> apiNameList)
+ throws DispositionReportFaultMessage {
+ apiNameList.clear();
+
+ for (org.apache.juddi.model.BusinessName modelName : modelNameList) {
+ org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
+ apiName.setLang(modelName.getLangCode());
+ apiName.setValue(modelName.getName());
+ apiNameList.add(apiName);
+ }
+ }
+
+ public static void mapBusinessDescriptions(List<org.apache.juddi.model.BusinessDescr> modelDescList,
+ List<org.uddi.api_v3.Description> apiDescList)
+ throws DispositionReportFaultMessage {
+ apiDescList.clear();
+
+ for (org.apache.juddi.model.BusinessDescr modelDesc : modelDescList) {
+ org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
+ apiDesc.setLang(modelDesc.getLangCode());
+ apiDesc.setValue(modelDesc.getDescr());
+ apiDescList.add(apiDesc);
+ }
+ }
+
+ public static void mapDiscoveryUrls(List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
+ org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
+ org.uddi.api_v3.BusinessEntity apiBusinessEntity)
+ throws DispositionReportFaultMessage {
+ if (modelDiscUrlList == null || modelDiscUrlList.size() == 0) {
+ return;
+ }
+
+ if (apiDiscUrls == null) {
+ apiDiscUrls = new org.uddi.api_v3.DiscoveryURLs();
+ }
+
+ List<org.uddi.api_v3.DiscoveryURL> apiDiscUrlList = apiDiscUrls.getDiscoveryURL();
+ apiDiscUrlList.clear();
+
+ for (org.apache.juddi.model.DiscoveryUrl modelDiscUrl : modelDiscUrlList) {
+ org.uddi.api_v3.DiscoveryURL apiDiscUrl = new org.uddi.api_v3.DiscoveryURL();
+ apiDiscUrl.setUseType(modelDiscUrl.getUseType());
+ String discoveryURL = modelDiscUrl.getUrl();
+ try {
+ String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
+ if (baseUrl == null) {
+ logger.warn("Token '" + Property.JUDDI_BASE_URL + "' not found in the juddiv3.xml, defaulting to '"
+ + Property.DEFAULT_BASE_URL + "'");
+ baseUrl = Property.DEFAULT_BASE_URL;
+ }
+ discoveryURL = discoveryURL.replaceAll("\\$\\{" + Property.JUDDI_BASE_URL + "\\}", baseUrl);
+
+ baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
+ if (baseUrl == null) {
+ logger.warn("Token '" + Property.JUDDI_BASE_URL_SECURE + "' not found in the juddiv3.xml, defaulting to '"
+ + Property.JUDDI_BASE_URL_SECURE + "'");
+ baseUrl = Property.DEFAULT_BASE_URL_SECURE;
+ }
+ discoveryURL = discoveryURL.replaceAll("\\$\\{" + Property.JUDDI_BASE_URL_SECURE + "\\}", baseUrl);
+
+ } catch (ConfigurationException e) {
+ logger.error(e.getMessage(), e);
}
-
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), PGPDataType.class, pgpDataType);
- parentKeyDataList.add(dataJAXB);
- } else if (dataType.equals(SPKIDataType.class.getSimpleName())) {
- SPKIDataType spkiDataType = new SPKIDataType();
-
- for (KeyDataValue spkiDataKDV : modelKeyDataValue.getKeyDataValueList()) {
- String spkiDataTagName = spkiDataKDV.getKeyDataName();
- Object spkiDataContents = spkiDataKDV.getKeyDataValueBytes() != null ? spkiDataKDV.getKeyDataValueBytes() : spkiDataKDV.getKeyDataValueString();
- Class spkiDataClazz = spkiDataContents.getClass();
- JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", spkiDataTagName), spkiDataClazz, spkiDataContents);
- spkiDataType.getSPKISexpAndAny().add(jaxb);
+ apiDiscUrl.setValue(discoveryURL);
+ apiDiscUrlList.add(apiDiscUrl);
+ }
+ apiBusinessEntity.setDiscoveryURLs(apiDiscUrls);
+ }
+
+ public static void mapContacts(List<org.apache.juddi.model.Contact> modelContactList,
+ org.uddi.api_v3.Contacts apiContacts,
+ org.uddi.api_v3.BusinessEntity apiBusinessEntity)
+ throws DispositionReportFaultMessage {
+ if (modelContactList == null || modelContactList.size() == 0) {
+ return;
+ }
+
+ if (apiContacts == null) {
+ apiContacts = new org.uddi.api_v3.Contacts();
+ }
+
+ List<org.uddi.api_v3.Contact> apiContactList = apiContacts.getContact();
+ apiContactList.clear();
+
+ for (org.apache.juddi.model.Contact modelContact : modelContactList) {
+ org.uddi.api_v3.Contact apiContact = new org.uddi.api_v3.Contact();
+ apiContact.setUseType(modelContact.getUseType());
+
+ mapPersonNames(modelContact.getPersonNames(), apiContact.getPersonName());
+ mapContactDescriptions(modelContact.getContactDescrs(), apiContact.getDescription());
+ mapContactEmails(modelContact.getEmails(), apiContact.getEmail());
+ mapContactPhones(modelContact.getPhones(), apiContact.getPhone());
+ mapContactAddresses(modelContact.getAddresses(), apiContact.getAddress());
+
+ apiContactList.add(apiContact);
+ }
+ apiBusinessEntity.setContacts(apiContacts);
+ }
+
+ public static void mapContactDescriptions(List<org.apache.juddi.model.ContactDescr> modelDescList,
+ List<org.uddi.api_v3.Description> apiDescList)
+ throws DispositionReportFaultMessage {
+ apiDescList.clear();
+
+ for (org.apache.juddi.model.ContactDescr modelDesc : modelDescList) {
+ org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
+ apiDesc.setLang(modelDesc.getLangCode());
+ apiDesc.setValue(modelDesc.getDescr());
+ apiDescList.add(apiDesc);
+ }
+ }
+
+ public static void mapPersonNames(List<org.apache.juddi.model.PersonName> modelPersonNameList,
+ List<org.uddi.api_v3.PersonName> apiPersonNameList)
+ throws DispositionReportFaultMessage {
+ apiPersonNameList.clear();
+
+ for (org.apache.juddi.model.PersonName personName : modelPersonNameList) {
+ org.uddi.api_v3.PersonName apiPersonName = new org.uddi.api_v3.PersonName();
+ apiPersonName.setLang(personName.getLangCode());
+ apiPersonName.setValue(personName.getName());
+ apiPersonNameList.add(apiPersonName);
+ }
+ }
+
+ public static void mapContactEmails(List<org.apache.juddi.model.Email> modelEmailList,
+ List<org.uddi.api_v3.Email> apiEmailList)
+ throws DispositionReportFaultMessage {
+ apiEmailList.clear();
+
+ for (org.apache.juddi.model.Email modelEmail : modelEmailList) {
+ org.uddi.api_v3.Email apiEmail = new org.uddi.api_v3.Email();
+ apiEmail.setUseType(modelEmail.getUseType());
+ apiEmail.setValue(modelEmail.getEmailAddress());
+ apiEmailList.add(apiEmail);
+ }
+ }
+
+ public static void mapContactPhones(List<org.apache.juddi.model.Phone> modelPhoneList,
+ List<org.uddi.api_v3.Phone> apiPhoneList)
+ throws DispositionReportFaultMessage {
+ apiPhoneList.clear();
+
+ for (org.apache.juddi.model.Phone modelPhone : modelPhoneList) {
+ org.uddi.api_v3.Phone apiPhone = new org.uddi.api_v3.Phone();
+ apiPhone.setUseType(modelPhone.getUseType());
+ apiPhone.setValue(modelPhone.getPhoneNumber());
+ apiPhoneList.add(apiPhone);
+ }
+ }
+
+ public static void mapContactAddresses(List<org.apache.juddi.model.Address> modelAddressList,
+ List<org.uddi.api_v3.Address> apiAddressList)
+ throws DispositionReportFaultMessage {
+ apiAddressList.clear();
+
+ for (org.apache.juddi.model.Address modelAddress : modelAddressList) {
+ org.uddi.api_v3.Address apiAddress = new org.uddi.api_v3.Address();
+ apiAddress.setUseType(modelAddress.getUseType());
+ apiAddress.setLang("");
+ apiAddress.setSortCode(modelAddress.getSortCode());
+ apiAddress.setTModelKey(modelAddress.getTmodelKey());
+
+ mapAddressLines(modelAddress.getAddressLines(), apiAddress.getAddressLine());
+
+ apiAddressList.add(apiAddress);
+ }
+ }
+
+ public static void mapAddressLines(List<org.apache.juddi.model.AddressLine> modelAddressLineList,
+ List<org.uddi.api_v3.AddressLine> apiAddressLineList)
+ throws DispositionReportFaultMessage {
+ apiAddressLineList.clear();
+
+ for (org.apache.juddi.model.AddressLine modelAddressLine : modelAddressLineList) {
+ org.uddi.api_v3.AddressLine apiAddressLine = new org.uddi.api_v3.AddressLine();
+ apiAddressLine.setKeyName(modelAddressLine.getKeyName());
+ apiAddressLine.setKeyValue(modelAddressLine.getKeyValue());
+ apiAddressLine.setValue(modelAddressLine.getLine());
+ apiAddressLineList.add(apiAddressLine);
+ }
+ }
+
+ public static void mapBusinessIdentifiers(List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
+ org.uddi.api_v3.IdentifierBag apiIdentifierBag,
+ org.uddi.api_v3.BusinessEntity apiBusinessEntity)
+ throws DispositionReportFaultMessage {
+ if (modelIdentifierList == null || modelIdentifierList.size() == 0) {
+ return;
+ }
+
+ if (apiIdentifierBag == null) {
+ apiIdentifierBag = new org.uddi.api_v3.IdentifierBag();
+ }
+
+ List<org.uddi.api_v3.KeyedReference> apiKeyedRefList = apiIdentifierBag.getKeyedReference();
+ apiKeyedRefList.clear();
+
+ for (org.apache.juddi.model.BusinessIdentifier modelIdentifier : modelIdentifierList) {
+ org.uddi.api_v3.KeyedReference apiKeyedRef = new org.uddi.api_v3.KeyedReference();
+ apiKeyedRef.setTModelKey(modelIdentifier.getTmodelKeyRef());
+ apiKeyedRef.setKeyName(modelIdentifier.getKeyName());
+ apiKeyedRef.setKeyValue(modelIdentifier.getKeyValue());
+ apiKeyedRefList.add(apiKeyedRef);
+ }
+ apiBusinessEntity.setIdentifierBag(apiIdentifierBag);
+ }
+
+ public static void mapBusinessServices(List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
+ List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
+ org.uddi.api_v3.BusinessServices apiBusinessServices,
+ org.uddi.api_v3.BusinessEntity apiBusinessEntity)
+ throws DispositionReportFaultMessage {
+
+ if (apiBusinessServices == null) {
+ apiBusinessServices = new org.uddi.api_v3.BusinessServices();
+ }
+
+ List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = apiBusinessServices.getBusinessService();
+ apiBusinessServiceList.clear();
+
+ if (modelBusinessServiceList != null && modelBusinessServiceList.size() > 0) {
+ for (org.apache.juddi.model.BusinessService modelBusinessService : modelBusinessServiceList) {
+ org.uddi.api_v3.BusinessService apiBusinessService = new org.uddi.api_v3.BusinessService();
+ mapBusinessService(modelBusinessService, apiBusinessService);
+ apiBusinessServiceList.add(apiBusinessService);
}
-
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), SPKIDataType.class, spkiDataType);
- parentKeyDataList.add(dataJAXB);
- } else if (dataType.equals(KeyValueType.class.getSimpleName())) {
- KeyValueType keyValueType = new KeyValueType();
- for (KeyDataValue keyValueDataKDV : modelKeyDataValue.getKeyDataValueList()) {
- for (KeyDataValue keyValueDataChildKDV : keyValueDataKDV.getKeyDataValueList()) {
- String keyDataDataType = keyValueDataChildKDV.getKeyDataType();
- if (keyDataDataType.equals("DSAKeyValueType")) {
- DSAKeyValueType dsaKeyValueType = new DSAKeyValueType();
- for (KeyDataValue dsaKDV : keyValueDataChildKDV.getKeyDataValueList()) {
- if ("G".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setG(dsaKDV.getKeyDataValueBytes());
- } else if ("P".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setP(dsaKDV.getKeyDataValueBytes());
- } else if ("Q".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setQ(dsaKDV.getKeyDataValueBytes());
- } else if ("Y".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setY(dsaKDV.getKeyDataValueBytes());
- } else if ("J".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setJ(dsaKDV.getKeyDataValueBytes());
- } else if ("Seed".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setSeed(dsaKDV.getKeyDataValueBytes());
- } else if ("PgenCounter".equals(dsaKDV.getKeyDataName())) {
- dsaKeyValueType.setPgenCounter(dsaKDV.getKeyDataValueBytes());
- } else {
- throw new RuntimeException("Unrecognized dsa type: " + dsaKDV.getKeyDataName());
- }
- }
- JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", keyValueDataChildKDV.getKeyDataName()), DSAKeyValueType.class, dsaKeyValueType);
- keyValueType.getContent().add(jaxb);
- } else if (keyDataDataType.equals("RSAKeyValueType")) {
- RSAKeyValueType rsaKeyValueType = new RSAKeyValueType();
- for (KeyDataValue rsaKDV : keyValueDataChildKDV.getKeyDataValueList()) {
- if ("Exponent".equals(rsaKDV.getKeyDataName())) {
- rsaKeyValueType.setExponent(rsaKDV.getKeyDataValueBytes());
- } else if ("Modulus".equals(rsaKDV.getKeyDataName())) {
- rsaKeyValueType.setModulus(rsaKDV.getKeyDataValueBytes());
- } else {
- throw new RuntimeException("Unrecognized dsa type: " + rsaKDV.getKeyDataName());
- }
- }
- JAXBElement jaxb = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", keyValueDataChildKDV.getKeyDataName()), RSAKeyValueType.class, rsaKeyValueType);
- keyValueType.getContent().add(jaxb);
- } else {
- throw new RuntimeException("Unrecognized element: " + keyDataDataType);
- }
- }
+ }
+
+ if (modelServiceProjectionList != null && modelServiceProjectionList.size() > 0) {
+ for (org.apache.juddi.model.ServiceProjection modelServiceProjection : modelServiceProjectionList) {
+ org.uddi.api_v3.BusinessService apiBusinessService = new org.uddi.api_v3.BusinessService();
+ mapBusinessService(modelServiceProjection.getBusinessService(), apiBusinessService);
+ apiBusinessServiceList.add(apiBusinessService);
}
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), KeyValueType.class, keyValueType);
- parentKeyDataList.add(dataJAXB);
- } else {
- throw new RuntimeException("Unrecognized type: " + dataType);
- }
- } else {
- if (dataType!=null && dataType.equals(X509IssuerSerialType.class.getSimpleName())) {
- X509IssuerSerialType x509IssuerSerialType = new X509IssuerSerialType();
- x509IssuerSerialType.setX509IssuerName(contentStr);
- x509IssuerSerialType.setX509SerialNumber(new BigInteger(contentBytes));
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), X509IssuerSerialType.class, x509IssuerSerialType);
- parentKeyDataList.add(dataJAXB);
- } else {
- JAXBElement dataJAXB = new JAXBElement(new QName("http://www.w3.org/2000/09/xmldsig#", tagName), contents.getClass(), contents);
- parentKeyDataList.add(dataJAXB);
- }
- }
- }
+ }
+
+ if (apiBusinessServiceList.size() > 0) {
+ apiBusinessEntity.setBusinessServices(apiBusinessServices);
+ }
}
-
- public static void mapBusinessNames(List<org.apache.juddi.model.BusinessName> modelNameList,
- List<org.uddi.api_v3.Name> apiNameList)
- throws DispositionReportFaultMessage {
- apiNameList.clear();
-
- for (org.apache.juddi.model.BusinessName modelName : modelNameList) {
- org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
- apiName.setLang(modelName.getLangCode());
- apiName.setValue(modelName.getName());
- apiNameList.add(apiName);
- }
- }
-
- public static void mapBusinessDescriptions(List<org.apache.juddi.model.BusinessDescr> modelDescList,
- List<org.uddi.api_v3.Description> apiDescList)
- throws DispositionReportFaultMessage {
- apiDescList.clear();
-
- for (org.apache.juddi.model.BusinessDescr modelDesc : modelDescList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelDesc.getLangCode());
- apiDesc.setValue(modelDesc.getDescr());
- apiDescList.add(apiDesc);
- }
- }
-
- public static void mapDiscoveryUrls(List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
- org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
- org.uddi.api_v3.BusinessEntity apiBusinessEntity)
- throws DispositionReportFaultMessage {
- if (modelDiscUrlList == null || modelDiscUrlList.size() == 0)
- return;
-
- if (apiDiscUrls == null)
- apiDiscUrls = new org.uddi.api_v3.DiscoveryURLs();
-
- List<org.uddi.api_v3.DiscoveryURL> apiDiscUrlList = apiDiscUrls.getDiscoveryURL();
- apiDiscUrlList.clear();
-
- for (org.apache.juddi.model.DiscoveryUrl modelDiscUrl : modelDiscUrlList) {
- org.uddi.api_v3.DiscoveryURL apiDiscUrl = new org.uddi.api_v3.DiscoveryURL();
- apiDiscUrl.setUseType(modelDiscUrl.getUseType());
- String discoveryURL = modelDiscUrl.getUrl();
- try {
- String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
- if (baseUrl==null) {
- logger.warn("Token '"+Property.JUDDI_BASE_URL+"' not found in the juddiv3.xml, defaulting to '"
- + Property.DEFAULT_BASE_URL + "'");
- baseUrl = Property.DEFAULT_BASE_URL;
- }
- discoveryURL = discoveryURL.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL+"\\}", baseUrl);
-
- baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
- if (baseUrl==null) {
- logger.warn("Token '"+Property.JUDDI_BASE_URL_SECURE+"' not found in the juddiv3.xml, defaulting to '"
- + Property.JUDDI_BASE_URL_SECURE + "'");
- baseUrl = Property.DEFAULT_BASE_URL_SECURE;
- }
- discoveryURL = discoveryURL.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL_SECURE+"\\}", baseUrl);
-
- } catch (ConfigurationException e) {
- logger.error(e.getMessage(),e);
- }
- apiDiscUrl.setValue(discoveryURL);
- apiDiscUrlList.add(apiDiscUrl);
- }
- apiBusinessEntity.setDiscoveryURLs(apiDiscUrls);
- }
-
- public static void mapContacts(List<org.apache.juddi.model.Contact> modelContactList,
- org.uddi.api_v3.Contacts apiContacts,
- org.uddi.api_v3.BusinessEntity apiBusinessEntity)
- throws DispositionReportFaultMessage {
- if (modelContactList == null || modelContactList.size() == 0)
- return;
-
- if (apiContacts == null)
- apiContacts = new org.uddi.api_v3.Contacts();
-
- List<org.uddi.api_v3.Contact> apiContactList = apiContacts.getContact();
- apiContactList.clear();
-
- for (org.apache.juddi.model.Contact modelContact : modelContactList) {
- org.uddi.api_v3.Contact apiContact = new org.uddi.api_v3.Contact();
- apiContact.setUseType(modelContact.getUseType());
-
- mapPersonNames(modelContact.getPersonNames(), apiContact.getPersonName());
- mapContactDescriptions(modelContact.getContactDescrs(), apiContact.getDescription());
- mapContactEmails(modelContact.getEmails(), apiContact.getEmail());
- mapContactPhones(modelContact.getPhones(), apiContact.getPhone());
- mapContactAddresses(modelContact.getAddresses(), apiContact.getAddress());
-
- apiContactList.add(apiContact);
- }
- apiBusinessEntity.setContacts(apiContacts);
- }
-
- public static void mapContactDescriptions(List<org.apache.juddi.model.ContactDescr> modelDescList,
- List<org.uddi.api_v3.Description> apiDescList)
- throws DispositionReportFaultMessage {
- apiDescList.clear();
-
- for (org.apache.juddi.model.ContactDescr modelDesc : modelDescList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelDesc.getLangCode());
- apiDesc.setValue(modelDesc.getDescr());
- apiDescList.add(apiDesc);
- }
- }
-
- public static void mapPersonNames(List<org.apache.juddi.model.PersonName> modelPersonNameList,
- List<org.uddi.api_v3.PersonName> apiPersonNameList)
- throws DispositionReportFaultMessage {
- apiPersonNameList.clear();
-
- for (org.apache.juddi.model.PersonName personName : modelPersonNameList) {
- org.uddi.api_v3.PersonName apiPersonName = new org.uddi.api_v3.PersonName();
- apiPersonName.setLang(personName.getLangCode());
- apiPersonName.setValue(personName.getName());
- apiPersonNameList.add(apiPersonName);
- }
- }
-
- public static void mapContactEmails(List<org.apache.juddi.model.Email> modelEmailList,
- List<org.uddi.api_v3.Email> apiEmailList)
- throws DispositionReportFaultMessage {
- apiEmailList.clear();
-
- for (org.apache.juddi.model.Email modelEmail : modelEmailList) {
- org.uddi.api_v3.Email apiEmail = new org.uddi.api_v3.Email();
- apiEmail.setUseType(modelEmail.getUseType());
- apiEmail.setValue(modelEmail.getEmailAddress());
- apiEmailList.add(apiEmail);
- }
- }
-
- public static void mapContactPhones(List<org.apache.juddi.model.Phone> modelPhoneList,
- List<org.uddi.api_v3.Phone> apiPhoneList)
- throws DispositionReportFaultMessage {
- apiPhoneList.clear();
-
- for (org.apache.juddi.model.Phone modelPhone : modelPhoneList) {
- org.uddi.api_v3.Phone apiPhone = new org.uddi.api_v3.Phone();
- apiPhone.setUseType(modelPhone.getUseType());
- apiPhone.setValue(modelPhone.getPhoneNumber());
- apiPhoneList.add(apiPhone);
- }
- }
-
- public static void mapContactAddresses(List<org.apache.juddi.model.Address> modelAddressList,
- List<org.uddi.api_v3.Address> apiAddressList)
- throws DispositionReportFaultMessage {
- apiAddressList.clear();
-
- for (org.apache.juddi.model.Address modelAddress : modelAddressList) {
- org.uddi.api_v3.Address apiAddress = new org.uddi.api_v3.Address();
- apiAddress.setUseType(modelAddress.getUseType());
- apiAddress.setLang("");
- apiAddress.setSortCode(modelAddress.getSortCode());
- apiAddress.setTModelKey(modelAddress.getTmodelKey());
-
- mapAddressLines(modelAddress.getAddressLines(), apiAddress.getAddressLine());
-
- apiAddressList.add(apiAddress);
- }
- }
-
- public static void mapAddressLines(List<org.apache.juddi.model.AddressLine> modelAddressLineList,
- List<org.uddi.api_v3.AddressLine> apiAddressLineList)
- throws DispositionReportFaultMessage {
- apiAddressLineList.clear();
-
- for (org.apache.juddi.model.AddressLine modelAddressLine : modelAddressLineList) {
- org.uddi.api_v3.AddressLine apiAddressLine = new org.uddi.api_v3.AddressLine();
- apiAddressLine.setKeyName(modelAddressLine.getKeyName());
- apiAddressLine.setKeyValue(modelAddressLine.getKeyValue());
- apiAddressLine.setValue(modelAddressLine.getLine());
- apiAddressLineList.add(apiAddressLine);
- }
- }
-
- public static void mapBusinessIdentifiers(List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
- org.uddi.api_v3.IdentifierBag apiIdentifierBag,
- org.uddi.api_v3.BusinessEntity apiBusinessEntity)
- throws DispositionReportFaultMessage {
- if (modelIdentifierList == null || modelIdentifierList.size() == 0)
- return;
-
- if (apiIdentifierBag == null)
- apiIdentifierBag = new org.uddi.api_v3.IdentifierBag();
-
- List<org.uddi.api_v3.KeyedReference> apiKeyedRefList = apiIdentifierBag.getKeyedReference();
- apiKeyedRefList.clear();
-
- for (org.apache.juddi.model.BusinessIdentifier modelIdentifier : modelIdentifierList) {
- org.uddi.api_v3.KeyedReference apiKeyedRef = new org.uddi.api_v3.KeyedReference();
- apiKeyedRef.setTModelKey(modelIdentifier.getTmodelKeyRef());
- apiKeyedRef.setKeyName(modelIdentifier.getKeyName());
- apiKeyedRef.setKeyValue(modelIdentifier.getKeyValue());
- apiKeyedRefList.add(apiKeyedRef);
- }
- apiBusinessEntity.setIdentifierBag(apiIdentifierBag);
- }
-
- public static void mapBusinessServices(List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
- List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
- org.uddi.api_v3.BusinessServices apiBusinessServices,
- org.uddi.api_v3.BusinessEntity apiBusinessEntity)
- throws DispositionReportFaultMessage {
-
- if (apiBusinessServices == null)
- apiBusinessServices = new org.uddi.api_v3.BusinessServices();
-
- List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = apiBusinessServices.getBusinessService();
- apiBusinessServiceList.clear();
-
- if (modelBusinessServiceList != null && modelBusinessServiceList.size() > 0) {
- for (org.apache.juddi.model.BusinessService modelBusinessService : modelBusinessServiceList) {
- org.uddi.api_v3.BusinessService apiBusinessService = new org.uddi.api_v3.BusinessService();
- mapBusinessService(modelBusinessService, apiBusinessService);
- apiBusinessServiceList.add(apiBusinessService);
- }
- }
-
-
- if (modelServiceProjectionList != null && modelServiceProjectionList.size() > 0) {
- for (org.apache.juddi.model.ServiceProjection modelServiceProjection : modelServiceProjectionList) {
- org.uddi.api_v3.BusinessService apiBusinessService = new org.uddi.api_v3.BusinessService();
- mapBusinessService(modelServiceProjection.getBusinessService(), apiBusinessService);
- apiBusinessServiceList.add(apiBusinessService);
- }
- }
-
- if (apiBusinessServiceList.size() > 0)
- apiBusinessEntity.setBusinessServices(apiBusinessServices);
- }
-
- public static void mapBusinessService(org.apache.juddi.model.BusinessService modelBusinessService,
- org.uddi.api_v3.BusinessService apiBusinessService)
- throws DispositionReportFaultMessage {
-
- apiBusinessService.setBusinessKey(modelBusinessService.getBusinessEntity().getEntityKey());
- apiBusinessService.setServiceKey(modelBusinessService.getEntityKey());
-
- mapServiceNames(modelBusinessService.getServiceNames(), apiBusinessService.getName());
- mapServiceDescriptions(modelBusinessService.getServiceDescrs(), apiBusinessService.getDescription());
- mapBindingTemplates(modelBusinessService.getBindingTemplates(), apiBusinessService.getBindingTemplates(), apiBusinessService);
- apiBusinessService.setCategoryBag(mapCategoryBag(modelBusinessService.getCategoryBag(), apiBusinessService.getCategoryBag()));
+
+ public static void mapBusinessService(org.apache.juddi.model.BusinessService modelBusinessService,
+ org.uddi.api_v3.BusinessService apiBusinessService)
+ throws DispositionReportFaultMessage {
+
+ apiBusinessService.setBusinessKey(modelBusinessService.getBusinessEntity().getEntityKey());
+ apiBusinessService.setServiceKey(modelBusinessService.getEntityKey());
+
+ mapServiceNames(modelBusinessService.getServiceNames(), apiBusinessService.getName());
+ mapServiceDescriptions(modelBusinessService.getServiceDescrs(), apiBusinessService.getDescription());
+ mapBindingTemplates(modelBusinessService.getBindingTemplates(), apiBusinessService.getBindingTemplates(), apiBusinessService);
+ apiBusinessService.setCategoryBag(mapCategoryBag(modelBusinessService.getCategoryBag(), apiBusinessService.getCategoryBag()));
mapSignature(modelBusinessService.getSignatures(), apiBusinessService.getSignature());
- }
-
- public static void mapServiceNames(List<org.apache.juddi.model.ServiceName> modelNameList,
- List<org.uddi.api_v3.Name> apiNameList)
- throws DispositionReportFaultMessage {
- apiNameList.clear();
-
- for (org.apache.juddi.model.ServiceName modelName : modelNameList) {
- org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
- apiName.setLang(modelName.getLangCode());
- apiName.setValue(modelName.getName());
- apiNameList.add(apiName);
- }
- }
-
- public static void mapServiceDescriptions(List<org.apache.juddi.model.ServiceDescr> modelDescList,
- List<org.uddi.api_v3.Description> apiDescList)
- throws DispositionReportFaultMessage {
- apiDescList.clear();
-
- for (org.apache.juddi.model.ServiceDescr modelDesc : modelDescList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelDesc.getLangCode());
- apiDesc.setValue(modelDesc.getDescr());
- apiDescList.add(apiDesc);
- }
- }
-
- public static void mapBindingTemplates(List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
- org.uddi.api_v3.BindingTemplates apiBindingTemplates,
- org.uddi.api_v3.BusinessService apiBusinessService)
- throws DispositionReportFaultMessage {
- if (modelBindingTemplateList == null || modelBindingTemplateList.size() == 0)
- return;
-
- if (apiBindingTemplates == null)
- apiBindingTemplates = new org.uddi.api_v3.BindingTemplates();
-
- List<org.uddi.api_v3.BindingTemplate> apiBindingTemplateList = apiBindingTemplates.getBindingTemplate();
- apiBindingTemplateList.clear();
-
- for (org.apache.juddi.model.BindingTemplate modelBindingTemplate : modelBindingTemplateList) {
- org.uddi.api_v3.BindingTemplate apiBindingTemplate = new org.uddi.api_v3.BindingTemplate();
- mapBindingTemplate(modelBindingTemplate, apiBindingTemplate);
- apiBindingTemplateList.add(apiBindingTemplate);
- }
- apiBusinessService.setBindingTemplates(apiBindingTemplates);
- }
-
- public static void mapBindingTemplate(org.apache.juddi.model.BindingTemplate modelBindingTemplate,
- org.uddi.api_v3.BindingTemplate apiBindingTemplate)
- throws DispositionReportFaultMessage {
-
- apiBindingTemplate.setServiceKey(modelBindingTemplate.getBusinessService().getEntityKey());
- apiBindingTemplate.setBindingKey(modelBindingTemplate.getEntityKey());
- org.uddi.api_v3.AccessPoint apiAccessPoint = new org.uddi.api_v3.AccessPoint();
- apiAccessPoint.setUseType(modelBindingTemplate.getAccessPointType());
- String accessPointValue = modelBindingTemplate.getAccessPointUrl();
- if (accessPointValue!=null) {
- try {
- String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
- if (baseUrl==null) {
- logger.warn("Token '"+Property.JUDDI_BASE_URL+"' not found in the juddiv3.xml, defaulting to '"
- + Property.DEFAULT_BASE_URL + "'");
- baseUrl = Property.DEFAULT_BASE_URL;
- }
- accessPointValue = accessPointValue.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL+"\\}", baseUrl);
-
- baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
- if (baseUrl==null) {
- logger.warn("Token '"+Property.JUDDI_BASE_URL_SECURE+"' not found in the juddiv3.xml, defaulting to '"
- + Property.JUDDI_BASE_URL_SECURE + "'");
- baseUrl = Property.DEFAULT_BASE_URL_SECURE;
- }
- accessPointValue = accessPointValue.replaceAll("\\$\\{"+Property.JUDDI_BASE_URL_SECURE+"\\}", baseUrl);
- } catch (ConfigurationException e) {
- logger.error(e.getMessage(),e);
- }
- }
- apiAccessPoint.setValue(accessPointValue);
- apiBindingTemplate.setAccessPoint(apiAccessPoint);
- if (modelBindingTemplate.getHostingRedirector()!=null) {
- org.uddi.api_v3.HostingRedirector apiHost = new org.uddi.api_v3.HostingRedirector();
- apiHost.setBindingKey(modelBindingTemplate.getHostingRedirector());
- apiBindingTemplate.setHostingRedirector(apiHost);
- }
- mapTModelInstanceDetails(modelBindingTemplate.getTmodelInstanceInfos(), apiBindingTemplate.getTModelInstanceDetails(),apiBindingTemplate);
- mapBindingDescriptions(modelBindingTemplate.getBindingDescrs(), apiBindingTemplate.getDescription());
-
- apiBindingTemplate.setCategoryBag(mapCategoryBag(modelBindingTemplate.getCategoryBag(), apiBindingTemplate.getCategoryBag()));
+ }
+
+ public static void mapServiceNames(List<org.apache.juddi.model.ServiceName> modelNameList,
+ List<org.uddi.api_v3.Name> apiNameList)
+ throws DispositionReportFaultMessage {
+ apiNameList.clear();
+
+ for (org.apache.juddi.model.ServiceName modelName : modelNameList) {
+ org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
+ apiName.setLang(modelName.getLangCode());
+ apiName.setValue(modelName.getName());
+ apiNameList.add(apiName);
+ }
+ }
+
+ public static void mapServiceDescriptions(List<org.apache.juddi.model.ServiceDescr> modelDescList,
+ List<org.uddi.api_v3.Description> apiDescList)
+ throws DispositionReportFaultMessage {
+ apiDescList.clear();
+
+ for (org.apache.juddi.model.ServiceDescr modelDesc : modelDescList) {
+ org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
+ apiDesc.setLang(modelDesc.getLangCode());
+ apiDesc.setValue(modelDesc.getDescr());
+ apiDescList.add(apiDesc);
+ }
+ }
+
+ public static void mapBindingTemplates(List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
+ org.uddi.api_v3.BindingTemplates apiBindingTemplates,
+ org.uddi.api_v3.BusinessService apiBusinessService)
+ throws DispositionReportFaultMessage {
+ if (modelBindingTemplateList == null || modelBindingTemplateList.size() == 0) {
+ return;
+ }
+
+ if (apiBindingTemplates == null) {
+ apiBindingTemplates = new org.uddi.api_v3.BindingTemplates();
+ }
+
+ List<org.uddi.api_v3.BindingTemplate> apiBindingTemplateList = apiBindingTemplates.getBindingTemplate();
+ apiBindingTemplateList.clear();
+
+ for (org.apache.juddi.model.BindingTemplate modelBindingTemplate : modelBindingTemplateList) {
+ org.uddi.api_v3.BindingTemplate apiBindingTemplate = new org.uddi.api_v3.BindingTemplate();
+ mapBindingTemplate(modelBindingTemplate, apiBindingTemplate);
+ apiBindingTemplateList.add(apiBindingTemplate);
+ }
+ apiBusinessService.setBindingTemplates(apiBindingTemplates);
+ }
+
+ public static void mapBindingTemplate(org.apache.juddi.model.BindingTemplate modelBindingTemplate,
+ org.uddi.api_v3.BindingTemplate apiBindingTemplate)
+ throws DispositionReportFaultMessage {
+
+ apiBindingTemplate.setServiceKey(modelBindingTemplate.getBusinessService().getEntityKey());
+ apiBindingTemplate.setBindingKey(modelBindingTemplate.getEntityKey());
+ org.uddi.api_v3.AccessPoint apiAccessPoint = new org.uddi.api_v3.AccessPoint();
+ apiAccessPoint.setUseType(modelBindingTemplate.getAccessPointType());
+ String accessPointValue = modelBindingTemplate.getAccessPointUrl();
+ if (accessPointValue != null) {
+ try {
+ String baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL);
+ if (baseUrl == null) {
+ logger.warn("Token '" + Property.JUDDI_BASE_URL + "' not found in the juddiv3.xml, defaulting to '"
+ + Property.DEFAULT_BASE_URL + "'");
+ baseUrl = Property.DEFAULT_BASE_URL;
+ }
+ accessPointValue = accessPointValue.replaceAll("\\$\\{" + Property.JUDDI_BASE_URL + "\\}", baseUrl);
+
+ baseUrl = AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE);
+ if (baseUrl == null) {
+ logger.warn("Token '" + Property.JUDDI_BASE_URL_SECURE + "' not found in the juddiv3.xml, defaulting to '"
+ + Property.JUDDI_BASE_URL_SECURE + "'");
+ baseUrl = Property.DEFAULT_BASE_URL_SECURE;
+ }
+ accessPointValue = accessPointValue.replaceAll("\\$\\{" + Property.JUDDI_BASE_URL_SECURE + "\\}", baseUrl);
+ } catch (ConfigurationException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ apiAccessPoint.setValue(accessPointValue);
+ apiBindingTemplate.setAccessPoint(apiAccessPoint);
+ if (modelBindingTemplate.getHostingRedirector() != null) {
+ org.uddi.api_v3.HostingRedirector apiHost = new org.uddi.api_v3.HostingRedirector();
+ apiHost.setBindingKey(modelBindingTemplate.getHostingRedirector());
+ apiBindingTemplate.setHostingRedirector(apiHost);
+ }
+ mapTModelInstanceDetails(modelBindingTemplate.getTmodelInstanceInfos(), apiBindingTemplate.getTModelInstanceDetails(), apiBindingTemplate);
+ mapBindingDescriptions(modelBindingTemplate.getBindingDescrs(), apiBindingTemplate.getDescription());
+
+ apiBindingTemplate.setCategoryBag(mapCategoryBag(modelBindingTemplate.getCategoryBag(), apiBindingTemplate.getCategoryBag()));
mapSignature(modelBindingTemplate.getSignatures(), apiBindingTemplate.getSignature());
- }
-
- public static void mapBindingDescriptions(List<org.apache.juddi.model.BindingDescr> modelDescList,
- List<org.uddi.api_v3.Description> apiDescList)
- throws DispositionReportFaultMessage {
- apiDescList.clear();
-
- for (org.apache.juddi.model.BindingDescr modelDesc : modelDescList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelDesc.getLangCode());
- apiDesc.setValue(modelDesc.getDescr());
- apiDescList.add(apiDesc);
- }
- }
-
- public static org.uddi.api_v3.CategoryBag mapCategoryBag(org.apache.juddi.model.CategoryBag modelCategoryBag,
- org.uddi.api_v3.CategoryBag apiCategoryBag)
- throws DispositionReportFaultMessage {
-
- if (modelCategoryBag != null) {
- if (apiCategoryBag == null)
- apiCategoryBag = new org.uddi.api_v3.CategoryBag();
-
- for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelCategoryBag.getKeyedReferences()) {
- org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
- apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
- apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
- apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
- apiCategoryBag.getKeyedReference().add(apiKeyedReference);
- }
- for (org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup : modelCategoryBag.getKeyedReferenceGroups()) {
- org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = new org.uddi.api_v3.KeyedReferenceGroup();
-
- mapKeyedReferenceGroup(modelKeyedReferenceGroup, apiKeyedReferenceGroup);
-
- apiCategoryBag.getKeyedReferenceGroup().add(apiKeyedReferenceGroup);
- }
- }
- return apiCategoryBag;
- }
-
- public static void mapKeyedReferenceGroup(org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
- org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup)
- throws DispositionReportFaultMessage {
-
- apiKeyedReferenceGroup.setTModelKey(modelKeyedReferenceGroup.getTmodelKey());
-
- for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelKeyedReferenceGroup.getKeyedReferences()) {
- org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
- apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
- apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
- apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
- apiKeyedReferenceGroup.getKeyedReference().add(apiKeyedReference);
- }
-
- }
-
- public static void mapTModelInstanceDetails(List<org.apache.juddi.model.TmodelInstanceInfo> modelTModelInstInfoList,
- org.uddi.api_v3.TModelInstanceDetails apiTModelInstDetails,
- org.uddi.api_v3.BindingTemplate apiBindingTemplate)
- throws DispositionReportFaultMessage {
- if (modelTModelInstInfoList == null || modelTModelInstInfoList.size() == 0)
- return;
-
- if (apiTModelInstDetails == null)
- apiTModelInstDetails = new org.uddi.api_v3.TModelInstanceDetails();
-
- List<org.uddi.api_v3.TModelInstanceInfo> apiTModelInstInfoList = apiTModelInstDetails.getTModelInstanceInfo();
- apiTModelInstInfoList.clear();
-
- for (org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo : modelTModelInstInfoList) {
- org.uddi.api_v3.TModelInstanceInfo apiTModelInstInfo = new org.uddi.api_v3.TModelInstanceInfo();
- apiTModelInstInfo.setTModelKey(modelTModelInstInfo.getTmodelKey());
- mapTModelInstanceInfoDescriptions(modelTModelInstInfo.getTmodelInstanceInfoDescrs(), apiTModelInstInfo.getDescription());
- mapInstanceDetails(modelTModelInstInfo, apiTModelInstInfo.getInstanceDetails(), apiTModelInstInfo);
-
- apiTModelInstInfoList.add(apiTModelInstInfo);
- }
- apiBindingTemplate.setTModelInstanceDetails(apiTModelInstDetails);
- }
-
- public static void mapTModelInstanceInfoDescriptions(List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
- List<org.uddi.api_v3.Description> apiDescList)
- throws DispositionReportFaultMessage {
- apiDescList.clear();
-
- for (org.apache.juddi.model.TmodelInstanceInfoDescr modelDesc : modelDescList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelDesc.getLangCode());
- apiDesc.setValue(modelDesc.getDescr());
- apiDescList.add(apiDesc);
- }
- }
-
- public static void mapInstanceDetails(org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo,
- org.uddi.api_v3.InstanceDetails apiInstanceDetails,
- org.uddi.api_v3.TModelInstanceInfo apiTModelInstInfo)
- throws DispositionReportFaultMessage {
- if (modelTModelInstInfo == null ||
- (modelTModelInstInfo.getInstanceParms() == null && modelTModelInstInfo.getOverviewDocs().size() == 0))
- return;
-
- if (apiInstanceDetails == null)
- apiInstanceDetails = new org.uddi.api_v3.InstanceDetails();
-
- //InstanceParms
- apiInstanceDetails.setInstanceParms(modelTModelInstInfo.getInstanceParms());
- //Descriptions
- List<org.apache.juddi.model.InstanceDetailsDescr> modelInstDetailsDescrList = modelTModelInstInfo.getInstanceDetailsDescrs();
- for (org.apache.juddi.model.InstanceDetailsDescr modelInstDetailDescr : modelInstDetailsDescrList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(modelInstDetailDescr.getLangCode());
- apiDesc.setValue(modelInstDetailDescr.getDescr());
- apiInstanceDetails.getDescription().add(apiDesc);
- }
- //OverviewDoc
- mapOverviewDocs(modelTModelInstInfo.getOverviewDocs(),apiInstanceDetails,null);
-
- apiTModelInstInfo.setInstanceDetails(apiInstanceDetails);
- }
-
- public static void mapOverviewDocs(List<org.apache.juddi.model.OverviewDoc> modelOverviewDocs,
- org.uddi.api_v3.InstanceDetails apiInstanceDetails,
- org.uddi.api_v3.TModel apiTModel)
- {
- for (OverviewDoc modelOverviewDoc : modelOverviewDocs) {
- org.uddi.api_v3.OverviewDoc apiOverviewDoc = new org.uddi.api_v3.OverviewDoc();
-
- //Descriptions
- List<org.apache.juddi.model.OverviewDocDescr> overviewDocDescrList = modelOverviewDoc.getOverviewDocDescrs();
- for (org.apache.juddi.model.OverviewDocDescr overviewDocDescr : overviewDocDescrList) {
- org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
- apiDesc.setLang(overviewDocDescr.getLangCode());
- apiDesc.setValue(overviewDocDescr.getDescr());
- apiOverviewDoc.getDescription().add(apiDesc);
- }
- //OverviewURL
- org.uddi.api_v3.OverviewURL apiOverviewURL = new org.uddi.api_v3.OverviewURL();
- apiOverviewURL.setUseType(modelOverviewDoc.getOverviewUrlUseType());
- apiOverviewURL.setValue(modelOverviewDoc.getOverviewUrl());
- apiOverviewDoc.setOverviewURL(apiOverviewURL);
- //Set the entity on the apiOverviewDoc
- if (apiInstanceDetails!=null) {
- apiInstanceDetails.getOverviewDoc().add(apiOverviewDoc);
- } else {
- apiTModel.getOverviewDoc().add(apiOverviewDoc);
- }
- }
- }
-
-
- public static void mapTModel(org.apache.juddi.model.Tmodel modelTModel,
- org.uddi.api_v3.TModel apiTModel)
- throws DispositionReportFaultMessage {
-
- apiTModel.setTModelKey(modelTModel.getEntityKey());
- org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
- apiName.setValue(modelTModel.getName());
- apiName.setLang(modelTModel.getLangCode());
- apiTModel.setName(apiName);
- apiTModel.setDeleted(modelTModel.getDeleted());
-
- mapTModelDescriptions(modelTModel.getTmodelDescrs(), apiTModel.getDescription());
-
- mapTModelIdentifiers(modelTModel.getTmodelIdentifiers(), apiTModel.getIdentifierBag(), apiTModel);
- apiTModel.setCategoryBag(mapCategoryBag(modelTModel.getCategoryBag(), apiTModel.getCategoryBag()));
-
- mapOverviewDocs(modelTModel.getOverviewDocs(), null, apiTModel);
+ }
+
+ public static void mapBindingDescriptions(List<org.apache.juddi.model.BindingDescr> modelDescList,
+ List<org.uddi.api_v3.Description> apiDescList)
+ throws DispositionReportFaultMessage {
+ apiDescList.clear();
+
+ for (org.apache.juddi.model.BindingDescr modelDesc : modelDescList) {
+ org.uddi.api_v3.Description apiDesc = new org.uddi.api_v3.Description();
+ apiDesc.setLang(modelDesc.getLangCode());
+ apiDesc.setValue(modelDesc.getDescr());
+ apiDescList.add(apiDesc);
+ }
+ }
+
+ public static org.uddi.api_v3.CategoryBag mapCategoryBag(org.apache.juddi.model.CategoryBag modelCategoryBag,
+ org.uddi.api_v3.CategoryBag apiCategoryBag)
+ throws DispositionReportFaultMessage {
+
+ if (modelCategoryBag != null) {
+ if (apiCategoryBag == null) {
+ apiCategoryBag = new org.uddi.api_v3.CategoryBag();
+ }
+
+ for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelCategoryBag.getKeyedReferences()) {
+ org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
+ apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
+ apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
+ apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
+ apiCategoryBag.getKeyedReference().add(apiKeyedReference);
+ }
+ for (org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup : modelCategoryBag.getKeyedReferenceGroups()) {
+ org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = new org.uddi.api_v3.KeyedReferenceGroup();
+
+ mapKeyedReferenceGroup(modelKeyedReferenceGroup, apiKeyedReferenceGroup);
+
+ apiCategoryBag.getKeyedReferenceGroup().add(apiKeyedReferenceGroup);
+ }
+ }
+ return apiCategoryBag;
+ }
+
+ public static void mapKeyedReferenceGroup(org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
+ org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup)
+ throws DispositionReportFaultMessage {
+
+ apiKeyedReferenceGroup.setTModelKey(modelKeyedReferenceGroup.getTmodelKey());
+
+ for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelKeyedReferenceGroup.getKeyedReferences()) {
+ org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
+ apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[17/28] juddi git commit: JUDDI-241 get/set replication cfg now works
for all sub elements. notify changes works,
however getChangeRecords fails when called from within the tomcat container.
Posted by al...@apache.org.
JUDDI-241 get/set replication cfg now works for all sub elements. notify changes works, however getChangeRecords fails when called from within the tomcat container.
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/22a846dd
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/22a846dd
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/22a846dd
Branch: refs/heads/master
Commit: 22a846ddb5fe2c79b23967a81899c214312fc2be
Parents: 03dce36
Author: Alex <al...@apache.org>
Authored: Sun Nov 23 19:52:30 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sun Nov 23 19:52:30 2014 -0500
----------------------------------------------------------------------
.../src/test/resources/META-INF/persistence.xml | 3 +-
.../juddi/api/impl/AuthenticatedService.java | 5 +
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 83 +-
.../juddi/api/impl/UDDIReplicationImpl.java | 1088 ++++++++++--------
.../apache/juddi/mapping/MappingApiToModel.java | 333 +++---
.../apache/juddi/mapping/MappingModelToApi.java | 27 +-
.../java/org/apache/juddi/model/Contact.java | 11 +
.../org/apache/juddi/model/ControlMessage.java | 30 +
.../main/java/org/apache/juddi/model/Edge.java | 41 +-
.../juddi/model/EdgeReceiverAlternate.java | 68 ++
.../main/java/org/apache/juddi/model/Node.java | 328 +++---
.../java/org/apache/juddi/model/Operator.java | 31 +-
.../juddi/model/ReplicationConfiguration.java | 46 +-
.../model/ReplicationConfigurationNode.java | 72 ++
.../juddi/replication/ReplicationNotifier.java | 84 +-
.../apache/juddi/validation/ValidateNode.java | 5 +-
.../juddi/validation/ValidateReplication.java | 49 +-
.../src/main/resources/messages.properties | 4 +-
.../juddi/api/impl/API_160_ReplicationTest.java | 138 ++-
.../apache/juddi/api/runtime/CLIServerTest.java | 119 ++
.../apache/juddi/api/runtime/juddiTestimpl.java | 188 +++
.../apache/juddi/api/runtime/replicantImpl.java | 70 ++
.../replication/ReplicationNotifierTest.java | 5 -
.../src/test/resources/META-INF/persistence.xml | 3 +
juddi-core/src/test/resources/META-INF/uddi.xml | 24 +
.../src/main/resources/META-INF/persistence.xml | 3 +-
.../org/apache/juddi/samples/EntryPoint.java | 89 +-
.../apache/juddi/samples/JuddiAdminService.java | 237 +++-
.../apache/juddi/samples/UddiReplication.java | 4 +-
.../resources/META-INF/simple-publish-uddi.xml | 27 +-
.../src/test/resources/META-INF/persistence.xml | 3 +-
.../WEB-INF/classes/META-INF/persistence.xml | 2 +
.../WEB-INF/classes/META-INF/persistence.xml | 2 +
.../WEB-INF/classes/META-INF/persistence.xml | 2 +
.../WEB-INF/classes/META-INF/persistence.xml | 3 +
pom.xml | 2 +-
uddi-ws/pom.xml | 73 +-
.../java/org/apache/juddi/repl_v3/EdgeExt.java | 36 -
.../main/java/org/uddi/api_v3/GetAuthToken.java | 128 ++-
.../org/uddi/repl_v3/CommunicationGraph.java | 1 +
.../main/java/org/uddi/repl_v3/Operator.java | 300 ++---
.../uddi/repl_v3/ReplicationConfiguration.java | 17 +-
.../v3_service/UDDIReplicationPortType.java | 38 +-
.../juddi/api_v3/GetPublisherDetailTest.java | 33 +
44 files changed, 2516 insertions(+), 1339 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml b/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
index 7bf55b0..f42c65f 100644
--- a/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
+++ b/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
@@ -78,7 +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.ReplicationMessage</class>
+ <class>org.apache.juddi.model.ReplicationConfigurationNode</class>
+ <class>org.apache.juddi.model.EdgeReceiverAlternate</class>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='dropDB,add')"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
index d69afbf..767cbee 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
@@ -50,10 +50,15 @@ public abstract class AuthenticatedService {
public static final int AUTHTOKEN_RETIRED = 0;
static final Log logger = LogFactory.getLog(AuthenticatedService.class);
protected String node = "UNDEFINED_NODE_NAME";
+ protected String baseUrlSSL="UNDEFINED";
+ protected String baseUrl="UNDEFINED";
public AuthenticatedService(){
try {
node = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID, "UNDEFINED_NODE_NAME");
+ node=node.trim();
+ baseUrlSSL=AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL_SECURE, Property.DEFAULT_BASE_URL_SECURE);
+ baseUrlSSL=AppConfig.getConfiguration().getString(Property.JUDDI_BASE_URL, Property.DEFAULT_BASE_URL);
} catch (ConfigurationException ex) {
logger.fatal(null, ex);
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index 268616e..dd201fe 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -19,6 +19,7 @@ package org.apache.juddi.api.impl;
import java.io.StringWriter;
import java.math.BigInteger;
import java.rmi.RemoteException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -30,6 +31,7 @@ import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
+import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import javax.xml.ws.Holder;
@@ -73,7 +75,6 @@ import org.apache.juddi.model.ClientSubscriptionInfo;
import org.apache.juddi.model.Node;
import org.apache.juddi.model.Publisher;
import org.apache.juddi.model.ReplicationConfiguration;
-import org.apache.juddi.model.SubscriptionMatch;
import org.apache.juddi.model.Tmodel;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.subscription.NotificationList;
@@ -89,19 +90,24 @@ import org.apache.juddi.validation.ValidateNode;
import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidatePublisher;
import org.apache.juddi.validation.ValidateReplication;
-import org.apache.juddi.validation.ValidateSubscription;
import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.BusinessInfo;
import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.Contact;
import org.uddi.api_v3.DeleteTModel;
import org.uddi.api_v3.DispositionReport;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.InfoSelection;
+import org.uddi.api_v3.KeyType;
+import org.uddi.api_v3.PersonName;
import org.uddi.api_v3.RegisteredInfo;
import org.uddi.api_v3.Result;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModelInfo;
import org.uddi.api_v3.TModelInfos;
+import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.Operator;
+import org.uddi.repl_v3.OperatorStatusType;
import org.uddi.sub_v3.GetSubscriptionResults;
import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionResultsList;
@@ -119,7 +125,7 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
*/
@WebService(serviceName = "JUDDIApiService",
endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
- targetNamespace = "urn:juddi-apache-org:v3_service")
+ targetNamespace = "urn:juddi-apache-org:v3_service", wsdlLocation = "classpath:/juddi_api_v1.wsdl")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
private Log log = LogFactory.getLog(this.getClass());
@@ -786,6 +792,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws RemoteException
*/
@SuppressWarnings("unchecked")
+ @Override
public SyncSubscriptionDetail invokeSyncSubscription(
SyncSubscription body) throws DispositionReportFaultMessage,
RemoteException {
@@ -1273,30 +1280,42 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
if (!((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
}
- new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration,em);
+ new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration, em, node);
org.apache.juddi.model.ReplicationConfiguration model = null;
try {
model = (ReplicationConfiguration) em.createQuery("select c FROM ReplicationConfiguration c order by c.serialNumber desc").getSingleResult();
} catch (Exception ex) {
}
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
if (model == null) {
+ //this is a brand new configuration
model = new ReplicationConfiguration();
- MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model,em);
model.setSerialNumber(System.currentTimeMillis());
+ model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
em.persist(model);
+ //if (newReplicationNode(model)){
+ //tell the replication notifier to start transfering with
+ //the first change record
+ //}
} else {
- //long oldid = model.getSerialNumber();
- em.remove(model);
+ //a config exists, remove it, add the new one
+ //spec doesn't appear to mention if recording a change history on the config is required
+ //assuming not.
+ //em.remove(model);
model = new ReplicationConfiguration();
MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
model.setSerialNumber(System.currentTimeMillis());
- em.persist(model);
+
+ model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
+ em.merge(model);
}
tx.commit();
+ //UDDIReplicationImpl.notifyConfigurationChange(replicationConfiguration);
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
QueryStatus.SUCCESS, procTime);
@@ -1305,14 +1324,22 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
QueryStatus.FAILED, procTime);
throw drfm;
- } finally {
+ } catch (Exception ex){
+ logger.error(ex,ex);
+ JAXB.marshal(replicationConfiguration, System.out);
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
+ }
+ finally {
if (tx.isActive()) {
tx.rollback();
}
em.close();
}
+ DispositionReport d = new DispositionReport();
+ Result res = new Result();
- return new DispositionReport();
+ d.getResult().add(res);
+ return d;
}
@Override
@@ -1335,7 +1362,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
sql.toString();
Query qry = em.createQuery(sql.toString());
qry.setMaxResults(1);
-
+
org.apache.juddi.model.ReplicationConfiguration resultList = (org.apache.juddi.model.ReplicationConfiguration) qry.getSingleResult();
MappingModelToApi.mapReplicationConfiguration(resultList, r);
tx.commit();
@@ -1347,15 +1374,36 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
QueryStatus.FAILED, procTime);
throw drfm;
- } catch (Exception ex){
- //possible that there is no config to return
- r.setCommunicationGraph(null);
- logger.warn("Error caught, is there a replication config is avaiable?", ex);
+ } catch (Exception ex) {
+ //possible that there is no config to return
+ r.setCommunicationGraph(new CommunicationGraph());
+ Operator op = new Operator();
+ op.setOperatorNodeID(node);
+ op.setSoapReplicationURL(baseUrlSSL + "/services/replication");
+ //TODO lookup from the root business
+
+ 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(node);
+ r.getCommunicationGraph().getControlledMessage().add("*");
+ logger.warn("Error caught, is there a replication config is avaiable? Returning a default config (no replication): " + ex.getMessage());
+ logger.debug("Error caught, is there a replication config is avaiable? Returning a default config (no replication): ", ex);
long procTime = System.currentTimeMillis() - startTime;
+ r.setSerialNumber(0);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
+ r.setTimeOfConfigurationUpdate(sdf.format(new Date()));
+ r.setRegistryContact(new org.uddi.repl_v3.ReplicationConfiguration.RegistryContact());
+ //TODO pull from root business
+ r.getRegistryContact().setContact(new Contact());
+ r.getRegistryContact().getContact().getPersonName().add(new PersonName("Unknown", null));
+
serviceCounter.update(JUDDIQuery.GET_REPLICATION_NODES,
QueryStatus.FAILED, procTime);
-
- }finally {
+
+ } finally {
if (tx.isActive()) {
tx.rollback();
}
@@ -1364,6 +1412,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
r.setMaximumTimeToGetChanges(BigInteger.ONE);
r.setMaximumTimeToSyncRegistry(BigInteger.ONE);
+ JAXB.marshal(r, System.out);
return r;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 15ed7a8..3971e6b 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -28,11 +28,19 @@ import java.util.TimerTask;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
+import javax.xml.bind.JAXB;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
import org.apache.commons.configuration.ConfigurationException;
import static org.apache.juddi.api.impl.AuthenticatedService.logger;
import org.apache.juddi.api.util.QueryStatus;
@@ -45,6 +53,7 @@ import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.model.BusinessEntity;
import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.Node;
+import org.apache.juddi.model.Operator;
import org.apache.juddi.model.Tmodel;
import static org.apache.juddi.replication.ReplicationNotifier.FetchEdges;
import org.apache.juddi.v3.client.UDDIService;
@@ -75,562 +84,625 @@ import org.uddi.v3_service.UDDIReplicationPortType;
* <li>do_ping</li>
* <li>get_highWaterMarks</li>
*
- * @author <a href="mailto:alexoree@apache.org">Alex O'Ree<a/>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
+@WebService(serviceName = "UDDI_Replication_PortType", targetNamespace = "urn:uddi-org:repl_v3_portType",
+ endpointInterface = "org.uddi.v3_service.UDDIReplicationPortType")
+@XmlSeeAlso({
+ org.uddi.custody_v3.ObjectFactory.class,
+ org.uddi.repl_v3.ObjectFactory.class,
+ org.uddi.subr_v3.ObjectFactory.class,
+ org.uddi.api_v3.ObjectFactory.class,
+ org.uddi.vscache_v3.ObjectFactory.class,
+ org.uddi.vs_v3.ObjectFactory.class,
+ org.uddi.sub_v3.ObjectFactory.class,
+ org.w3._2000._09.xmldsig_.ObjectFactory.class,
+ org.uddi.policy_v3.ObjectFactory.class,
+ org.uddi.policy_v3_instanceparms.ObjectFactory.class
+})
public class UDDIReplicationImpl extends AuthenticatedService implements UDDIReplicationPortType {
-
- private UDDIServiceCounter serviceCounter;
-
- private static PullTimerTask timer = null;
- private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
-
- private static UDDIPublicationImpl pub = null;
-
- public UDDIReplicationImpl() {
- super();
- if (pub == null) {
- pub = new UDDIPublicationImpl();
- }
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
- Init();
- try {
- startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
- } catch (ConfigurationException ex) {
- logger.fatal(ex);
- }
-
- }
-
- private synchronized void Init() {
- if (queue == null) {
- queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
+
+ static void notifyConfigurationChange(ReplicationConfiguration oldConfig, ReplicationConfiguration newConfig) {
+
+ //if the config is different
}
- timer = new PullTimerTask();
-
- }
-
- private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
- if (changesAlreadySeen != null) {
- for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
- if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
- && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
- return true;
+
+ private UDDIServiceCounter serviceCounter;
+
+ private static PullTimerTask timer = null;
+ private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+
+ private static UDDIPublicationImpl pub = null;
+
+ public UDDIReplicationImpl() {
+ super();
+ if (pub == null) {
+ pub = new UDDIPublicationImpl();
+ }
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
+ Init();
+ try {
+ startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ interval = 5000;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ } catch (ConfigurationException ex) {
+ logger.fatal(ex);
}
- }
+
}
- return false;
- }
-
- private class PullTimerTask extends TimerTask {
-
- private Timer timer = null;
-
- public PullTimerTask() {
- super();
- timer = new Timer(true);
- timer.scheduleAtFixedRate(this, startBuffer, interval);
+
+ private synchronized void Init() {
+ if (queue == null) {
+ queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
+ }
+ timer = new PullTimerTask();
+
}
-
- @Override
- public void run() {
-
- //ok someone told me there's a change available
- while (!queue.isEmpty()) {
- NotifyChangeRecordsAvailable poll = queue.poll();
- if (poll != null) {
- UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
- try {
- //ok now get all the changes
- List<ChangeRecord> records
- = replicationClient.getChangeRecords(node,
- null, null, poll.getChangesAvailable());
- //ok now we need to persist the change records
- for (int i = 0; i < records.size(); i++) {
- PersistChangeRecord(records.get(i));
+
+ private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
+ if (changesAlreadySeen != null) {
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
+ && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
+ return true;
+ }
}
- } catch (Exception ex) {
- logger.equals(ex);
- }
}
- }
- }
-
- @Override
- public boolean cancel() {
- timer.cancel();
- return super.cancel();
+ return false;
}
/**
- * someone told me there's a change available, we retrieved it and are
- * processing the changes locally
- *
- * @param rec
+ * handles when a remote node tells me that there's an update(s)
+ * available
*/
- private void PersistChangeRecord(ChangeRecord rec) {
- if (rec == null) {
- return;
- }
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- /**
- * In nodes that support pre-bundled replication responses, the
- * recipient of the get_changeRecords message MAY return more change
- * records than requested by the caller. In this scenario, the
- * caller MUST also be prepared to deal with such redundant changes
- * where a USN is less than the USN specified in the
- * changesAlreadySeen highWaterMarkVector.
- */
- try {
- tx.begin();
- //the change record rec must also be persisted!!
- em.persist(MappingApiToModel.mapChangeRecord(rec));
- //<editor-fold defaultstate="collapsed" desc="delete a record">
-
- if (rec.getChangeRecordDelete() != null) {
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
- //delete a binding template
- pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
- //delete a business
- pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
- //delete a service
- pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
- }
- if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getTModelKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getTModelKey())) {
- //delete a tmodel
- /**
- * The changeRecordDelete for a tModel does not
- * correspond to any API described in this specification
- * and should only appear in the replication stream as
- * the result of an administrative function to
- * permanently remove a tModel.
- */
- pub.deleteTModel(rec.getChangeRecordDelete().getTModelKey(), em);
- }
+ private class PullTimerTask extends TimerTask {
+
+ private Timer timer = null;
+
+ public PullTimerTask() {
+ super();
+ timer = new Timer(true);
+ timer.scheduleAtFixedRate(this, startBuffer, interval);
}
- if (rec.getChangeRecordDeleteAssertion() != null && rec.getChangeRecordDeleteAssertion().getPublisherAssertion() != null) {
- //delete a pa template
- pub.deletePublisherAssertion(rec.getChangeRecordDeleteAssertion().getPublisherAssertion(), em);
+
+ @Override
+ public void run() {
+
+ logger.info("Replication change puller thread started. Queue size: " + queue.size());
+ //ok someone told me there's a change available
+ while (!queue.isEmpty()) {
+ NotifyChangeRecordsAvailable poll = queue.poll();
+ if (poll != null) {
+ UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
+ if (replicationClient == null) {
+ logger.fatal("unable to obtain a replication client to node " + poll.getNotifyingNode());
+ }
+ try {
+ //get the high water marks for this node
+ //ok now get all the changes
+ logger.info("fetching updates...");
+
+ List<ChangeRecord> records
+ = replicationClient.getChangeRecords(node,
+ poll.getChangesAvailable(), BigInteger.valueOf(100), null);
+ //ok now we need to persist the change records
+ logger.info("Change records retrieved " + records.size());
+ for (int i = 0; i < records.size(); i++) {
+ PersistChangeRecord(records.get(i));
+ }
+ } catch (Exception ex) {
+ logger.error("Error caught fetching replication changes from " + poll.getNotifyingNode(), ex);
+ }
+ } else {
+ logger.warn("weird, popped an object from the queue but it was null.");
+ }
+ }
+ }
+
+ @Override
+ public boolean cancel() {
+ timer.cancel();
+ return super.cancel();
}
+ /**
+ * someone told me there's a change available, we retrieved it
+ * and are processing the changes locally
+ *
+ * @param rec
+ */
+ private void PersistChangeRecord(ChangeRecord rec) {
+ if (rec == null) {
+ return;
+ }
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ /**
+ * In nodes that support pre-bundled replication
+ * responses, the recipient of the get_changeRecords
+ * message MAY return more change records than requested
+ * by the caller. In this scenario, the caller MUST also
+ * be prepared to deal with such redundant changes where
+ * a USN is less than the USN specified in the
+ * changesAlreadySeen highWaterMarkVector.
+ */
+ try {
+ tx.begin();
+ //the change record rec must also be persisted!!
+ em.persist(MappingApiToModel.mapChangeRecord(rec));
+ //<editor-fold defaultstate="collapsed" desc="delete a record">
+
+ if (rec.getChangeRecordDelete() != null) {
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
+ //delete a binding template
+ pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
+ //delete a business
+ pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
+ //delete a service
+ pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getTModelKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getTModelKey())) {
+ //delete a tmodel
+ /**
+ * The changeRecordDelete for a
+ * tModel does not correspond to
+ * any API described in this
+ * specification and should only
+ * appear in the replication
+ * stream as the result of an
+ * administrative function to
+ * permanently remove a tModel.
+ */
+ pub.deleteTModel(rec.getChangeRecordDelete().getTModelKey(), em);
+ }
+ }
+ if (rec.getChangeRecordDeleteAssertion() != null && rec.getChangeRecordDeleteAssertion().getPublisherAssertion() != null) {
+ //delete a pa template
+ pub.deletePublisherAssertion(rec.getChangeRecordDeleteAssertion().getPublisherAssertion(), em);
+ }
+
//</editor-fold>
- //<editor-fold defaultstate="collapsed" desc="New Data">
- if (rec.getChangeRecordNewData() != null) {
-
- if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
- throw new Exception("Inbound replication data is missiong node id!");
- }
-
- //The operationalInfo element MUST contain the operational information associated with the indicated new data.
- if (rec.getChangeRecordNewData().getOperationalInfo() == null) {
- logger.warn("Inbound replication data does not have the required OperationalInfo element and is NOT spec compliant. Data will be ignored");
- } else {
- if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
+ //<editor-fold defaultstate="collapsed" desc="New Data">
+ if (rec.getChangeRecordNewData() != null) {
+
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
+ throw new Exception("Inbound replication data is missiong node id!");
+ }
+
+ //The operationalInfo element MUST contain the operational information associated with the indicated new data.
+ if (rec.getChangeRecordNewData().getOperationalInfo() == null) {
+ logger.warn("Inbound replication data does not have the required OperationalInfo element and is NOT spec compliant. Data will be ignored");
+ } else {
+ if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
//fetch the binding template if it exists already
- //if it exists,
- // confirm the owning node, it shouldn't be the local node id, if it is, throw
- // the owning node should be the same as it was before
-
- BusinessService model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBindingTemplate().getServiceKey());
- if (model == null) {
- logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet");
- } else {
- ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
-
- org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
- MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
- em.persist(model);
- }
-
- } else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
-
- BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
- if (model == null) {
- model = new BusinessEntity();
- } else {
- ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
- }
- MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
-
- }
- if (rec.getChangeRecordNewData().getBusinessService() != null) {
- BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessService().getBusinessKey());
- if (find == null) {
- logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
- } else {
- org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
- MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
- }
-
- } else if (rec.getChangeRecordNewData().getTModel() != null) {
- Tmodel model = new Tmodel();
- MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
-
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
-
- em.persist(model);
- }
-
- }
-
- }
+ //if it exists,
+ // confirm the owning node, it shouldn't be the local node id, if it is, throw
+ // the owning node should be the same as it was before
+
+ BusinessService model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBindingTemplate().getServiceKey());
+ if (model == null) {
+ logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet");
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+
+ org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
+ MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
+
+ BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
+ if (model == null) {
+ model = new BusinessEntity();
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+ }
+ MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+
+ }
+ if (rec.getChangeRecordNewData().getBusinessService() != null) {
+ BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessService().getBusinessKey());
+ if (find == null) {
+ logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
+ } else {
+ org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
+ MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getTModel() != null) {
+ Tmodel model = new Tmodel();
+ MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
+
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ }
+
+ }
//</editor-fold>
// changeRecordNull no action needed
- // changeRecordHide tmodel only
- //<editor-fold defaultstate="collapsed" desc="hide tmodel">
- if (rec.getChangeRecordHide() != null) {
- /*
- A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
+ // changeRecordHide tmodel only
+ //<editor-fold defaultstate="collapsed" desc="hide tmodel">
+ if (rec.getChangeRecordHide() != null) {
+ /*
+ A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
- The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
- */
- String key = rec.getChangeRecordHide().getTModelKey();
- org.apache.juddi.model.Tmodel existing = em.find(org.apache.juddi.model.Tmodel.class, key);
- if (existing == null) {
- logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
- } else {
- existing.setDeleted(true);
- existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
- existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
- em.persist(existing);
- }
- }
+ The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
+ */
+ String key = rec.getChangeRecordHide().getTModelKey();
+ org.apache.juddi.model.Tmodel existing = em.find(org.apache.juddi.model.Tmodel.class, key);
+ if (existing == null) {
+ logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
+ } else {
+ existing.setDeleted(true);
+ existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ em.persist(existing);
+ }
+ }
//</editor-fold>
- //<editor-fold defaultstate="collapsed" desc="changeRecordPublisherAssertion">
- if (rec.getChangeRecordPublisherAssertion() != null) {
+ //<editor-fold defaultstate="collapsed" desc="changeRecordPublisherAssertion">
+ if (rec.getChangeRecordPublisherAssertion() != null) {
//TODO implement
- }
+ }
//</editor-fold>
- tx.commit();
-
- } catch (Exception drfm) {
- logger.warn(drfm);
- } finally {
- if (tx.isActive()) {
- tx.rollback();
+ tx.commit();
+
+ } catch (Exception drfm) {
+ logger.warn(drfm);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
}
- em.close();
- }
- }
-
- }
-
- private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
- if (nodeId == null || operationalInfo == null) {
- throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
- }
- if (!nodeId.equals(operationalInfo.getNodeID())) {
- throw new Exception("node id mismatch!");
+
}
- }
-
- private synchronized UDDIReplicationPortType getReplicationClient(String node) {
- if (cache.containsKey(node)) {
- return cache.get(node);
+
+ private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
+ if (nodeId == null || operationalInfo == null) {
+ throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
+ }
+ if (!nodeId.equals(operationalInfo.getNodeID())) {
+ throw new Exception("node id mismatch!");
+ }
}
- UDDIService svc = new UDDIService();
- UDDIReplicationPortType replicationClient = svc.getUDDIReplicationPort();
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- Node find = em.find(org.apache.juddi.model.Node.class, node);
- ((BindingProvider) replicationClient).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, find.getReplicationUrl());
- cache.put(node, replicationClient);
- return replicationClient;
- } catch (Exception ex) {
- logger.fatal("Node not found!" + node, ex);
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
+
+ private synchronized UDDIReplicationPortType getReplicationClient(String node) {
+ if (cache.containsKey(node)) {
+ return cache.get(node);
+ }
+ UDDIService svc = new UDDIService();
+ UDDIReplicationPortType replicationClient = svc.getUDDIReplicationPort();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ StringBuilder sql = new StringBuilder();
+ sql.append("select c from ReplicationConfiguration c order by c.serialNumber desc");
+ sql.toString();
+ Query qry = em.createQuery(sql.toString());
+ qry.setMaxResults(1);
+
+ org.apache.juddi.model.ReplicationConfiguration resultList = (org.apache.juddi.model.ReplicationConfiguration) qry.getSingleResult();
+ for (Operator o : resultList.getOperator()) {
+ if (o.getOperatorNodeID().equalsIgnoreCase(node)) {
+ ((BindingProvider) replicationClient).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, o.getSoapReplicationURL());
+ cache.put(node, replicationClient);
+ return replicationClient;
+ }
+ }
+ tx.rollback();
+
+ } catch (Exception ex) {
+ logger.fatal("Node not found!" + node, ex);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ //em.close();
+ return null;
+
}
- em.close();
- return null;
-
- }
- private Map<String, UDDIReplicationPortType> cache = new HashMap<String, UDDIReplicationPortType>();
-
- /**
- * @since 3.3
- * @param body
- * @return
- * @throws DispositionReportFaultMessage
- */
- public String doPing(DoPing body) throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
-
- return node;
-
- }
-
- @Override
- public List<ChangeRecord> getChangeRecords(String requestingNode,
- HighWaterMarkVectorType changesAlreadySeen,
- BigInteger responseLimitCount,
- HighWaterMarkVectorType responseLimitVector)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
-
- //TODO should we validate that "requestingNode" is in the replication config?
- List<ChangeRecord> ret = new ArrayList<ChangeRecord>();
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
+ private Map<String, UDDIReplicationPortType> cache = new HashMap<String, UDDIReplicationPortType>();
/**
- * More specifically, the recipient determines the particular change
- * records that are returned by comparing the originating USNs in the
- * caller’s high water mark vector with the originating USNs of each of
- * the changes the recipient has seen from others or generated by
- * itself. The recipient SHOULD only return change records that have
- * originating USNs that are greater than those listed in the
- * changesAlreadySeen highWaterMarkVector and less than the limit
- * required by either the responseLimitCount or the responseLimitVector.
- *
- *
- * Part of the message is a high water mark vector that contains for
- * each node of the registry the originating USN of the most recent
- * change record that has been successfully processed by the invocating
- * node
+ * @since 3.3
+ * @param body
+ * @return
+ * @throws DispositionReportFaultMessage
*/
- int maxrecords = 100;
- if (responseLimitCount != null) {
- maxrecords = responseLimitCount.intValue();
+ public String doPing(DoPing body) throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
+
+ return node;
+
}
- try {
- tx.begin();
- Long firstrecord = 1L;
- Long lastrecord = null;
-
- if (changesAlreadySeen != null) {
- //this is basically a lower limit (i.e. the newest record that was processed by the requestor
- //therefore we want the oldest record stored locally to return to the requestor for processing
- for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
- if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
- firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
- }
+
+ @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")
+
+ @Override
+ 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 {
+ long startTime = System.currentTimeMillis();
+
+ new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
+
+ //TODO should we validate that "requestingNode" is in the replication config?
+ List<ChangeRecord> ret = new ArrayList<ChangeRecord>();
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+
+ /**
+ * More specifically, the recipient determines the particular
+ * change records that are returned by comparing the originating
+ * USNs in the caller’s high water mark vector with the
+ * originating USNs of each of the changes the recipient has
+ * seen from others or generated by itself. The recipient SHOULD
+ * only return change records that have originating USNs that
+ * are greater than those listed in the changesAlreadySeen
+ * highWaterMarkVector and less than the limit required by
+ * either the responseLimitCount or the responseLimitVector.
+ *
+ *
+ * Part of the message is a high water mark vector that contains
+ * for each node of the registry the originating USN of the most
+ * recent change record that has been successfully processed by
+ * the invocating node
+ */
+ int maxrecords = 100;
+ if (responseLimitCount != null) {
+ maxrecords = responseLimitCount.intValue();
}
- }
- if (responseLimitVector != null) {
+ try {
+ tx.begin();
+ Long firstrecord = 1L;
+ Long lastrecord = null;
+
+ if (changesAlreadySeen != null) {
+ //this is basically a lower limit (i.e. the newest record that was processed by the requestor
+ //therefore we want the oldest record stored locally to return to the requestor for processing
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
+ }
+ }
+ }
+ if (responseLimitVector != null) {
//using responseLimitVector, indicating for each node in the graph the first change originating there that he does not wish to be returned.
- //upper limit basically
- for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
- if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
- lastrecord = responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN();
- }
- }
- }
-
- Query createQuery = null;
- if (lastrecord != null) {
- createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node and e.id < :lastrecord) OR (e.originatingUSN > :inbound and e.nodeID != :node and e.originatingUSN < :lastrecord) order by e.id ASC");
- createQuery.setParameter("lastrecord", lastrecord);
- } else {
- createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node) OR (e.originatingUSN > :inbound and e.nodeID != :node) order by e.id ASC");
- }
- createQuery.setMaxResults(maxrecords);
- createQuery.setParameter("inbound", firstrecord);
- createQuery.setParameter("node", node);
-
- List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) (org.apache.juddi.model.ChangeRecord) createQuery.getResultList();
- for (int i = 0; i < records.size(); i++) {
- ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
- if (!Excluded(changesAlreadySeen, r)) {
- ret.add(r);
+ //upper limit basically
+ for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ lastrecord = responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN();
+ }
+ }
+ }
+
+ Query createQuery = null;
+ if (lastrecord != null) {
+ createQuery = em.createQuery("select e from ChangeRecord e where ((e.id >= :inbound and e.nodeID = :node and e.id < :lastrecord) OR "
+ + "(e.originatingUSN > :inbound and e.nodeID <> :node and e.originatingUSN < :lastrecord)) order by e.id ASC");
+ createQuery.setParameter("lastrecord", lastrecord);
+ } else {
+ createQuery = em.createQuery("select e from ChangeRecord e where ((e.id >= :inbound and e.nodeID = :node) OR "
+ + "(e.originatingUSN > :inbound and e.nodeID <> :node)) order by e.id ASC");
+ }
+ createQuery.setMaxResults(maxrecords);
+ createQuery.setParameter("inbound", firstrecord);
+ createQuery.setParameter("node", node);
+
+ List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) createQuery.getResultList();
+ for (int i = 0; i < records.size(); i++) {
+ ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
+ if (!Excluded(changesAlreadySeen, r)) {
+ ret.add(r);
+ }
+
+ }
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
+ QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception ex) {
+ logger.fatal("Error, this node is: " + node, ex);
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
}
-
- }
-
- tx.rollback();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
- QueryStatus.SUCCESS, procTime);
-
- } catch (Exception ex) {
- logger.fatal("Error, this node is: " + node, ex);
- throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
+ logger.info("Change records returned for " + requestingNode + ": " + ret.size());
+ //JAXB.marshal(ret, System.out);
+ return ret;
}
- return ret;
- }
-
- /**
- * This UDDI API message provides a means to obtain a list of highWaterMark
- * element containing the highest known USN for all nodes in the replication
- * graph. If there is no graph, we just return the local bits
- *
- * @return
- * @throws DispositionReportFaultMessage
- */
- @Override
- public List<ChangeRecordIDType> getHighWaterMarks()
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- List<ChangeRecordIDType> ret = new ArrayList<ChangeRecordIDType>();
-
- //fetch from database the highest known watermark
- ReplicationConfiguration FetchEdges = FetchEdges();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
- if (FetchEdges != null) {
- Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
- while (it.hasNext()) {
- String nextNode = it.next();
- if (!nextNode.equals(node)) {
-
- Long id = 0L;
- try {
- id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
- } catch (Exception ex) {
- logger.debug(ex);
+
+ /**
+ * This UDDI API message provides a means to obtain a list of
+ * highWaterMark element containing the highest known USN for all nodes
+ * in the replication graph. If there is no graph, we just return the
+ * local bits
+ *
+ * @return
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
+ public List<ChangeRecordIDType> getHighWaterMarks()
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ List<ChangeRecordIDType> ret = new ArrayList<ChangeRecordIDType>();
+
+ //fetch from database the highest known watermark
+ ReplicationConfiguration FetchEdges = FetchEdges();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ if (FetchEdges != null) {
+ Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
+ while (it.hasNext()) {
+ String nextNode = it.next();
+ if (!nextNode.equals(node)) {
+
+ Long id = 0L;
+ try {
+ id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
+ } catch (Exception ex) {
+ logger.debug(ex);
+ }
+ if (id == null) {
+ id = 0L;
+ //per the spec
+ }
+ ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
+
+ ret.add(x);
+
+ }
+ }
}
+ //dont forget this node
+ Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
if (id == null) {
- id = 0L;
- //per the spec
+ id = 0L;
}
- ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
-
+ ChangeRecordIDType x = new ChangeRecordIDType();
+ x.setNodeID(node);
+ x.setOriginatingUSN(id);
ret.add(x);
-
- }
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception drfm) {
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", drfm.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
}
- }
- //dont forget this node
- Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
- if (id == null) {
- id = 0L;
- }
- ChangeRecordIDType x = new ChangeRecordIDType();
- x.setNodeID(node);
- x.setOriginatingUSN(id);
- ret.add(x);
-
- tx.rollback();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
-
- } catch (Exception drfm) {
- throw new FatalErrorException(new ErrorMessage("E_fatalError", drfm.getMessage()));
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
+
+ return ret;
}
-
-
-
- return ret;
- }
-
- /**
- * this means that another node has a change and we need to pick up the
- * change and apply it to our local database.
- *
- * @param body
- * @throws DispositionReportFaultMessage
- */
- @Override
- public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.NOTIFY_CHANGERECORDSAVAILABLE,
- QueryStatus.SUCCESS, procTime);
+
+ /**
+ * this means that another node has a change and we need to pick up the
+ * change and apply it to our local database.
+ *
+ * @param body
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
+ public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.NOTIFY_CHANGERECORDSAVAILABLE,
+ QueryStatus.SUCCESS, procTime);
//some other node just told us there's new records available, call
- //getChangeRecords from the remote node asynch
-
- new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
-
- queue.add(body);
-
- //ValidateReplication.unsupportedAPICall();
- }
- private static Queue<NotifyChangeRecordsAvailable> queue = null;
-
- /**
- * transfers custody of an entity from node1/user1 to node2/user2
- *
- * @param body
- * @throws DispositionReportFaultMessage
- */
- @Override
- public void transferCustody(TransferCustody body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
+ //getChangeRecords from the remote node asynch
- //*this node is transfering data to another node
- //body.getTransferOperationalInfo().
- ValidateReplication.unsupportedAPICall();
-
- EntityManager em = PersistenceManager.getEntityManager();
- //EntityTransaction tx = em.getTransaction();
+ new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
+
+ logger.info(body.getNotifyingNode() + " just told me that there are change records available, enqueuing...");
+ queue.add(body);
+
+ //ValidateReplication.unsupportedAPICall();
+ }
+ private static Queue<NotifyChangeRecordsAvailable> queue = null;
/**
- * The custodial node must verify that it has granted permission to
- * transfer the entities identified and that this permission is still
- * valid. This operation is comprised of two steps:
- *
- * 1. Verification that the transferToken was issued by it, that it has
- * not expired, that it represents the authority to transfer no more and
- * no less than those entities identified by the businessKey and
- * tModelKey elements and that all these entities are still valid and
- * not yet transferred. The transferToken is invalidated if any of these
- * conditions are not met.
- *
- * 2. If the conditions above are met, the custodial node will prevent
- * any further changes to the entities identified by the businessKey and
- * tModelKey elements identified. The entity will remain in this state
- * until the replication stream indicates it has been successfully
- * processed via the replication stream. Upon successful verification of
- * the custody transfer request by the custodial node, an empty message
- * is returned by it indicating the success of the request and
- * acknowledging the custody transfer. Following the issue of the empty
- * message, the custodial node will submit into the replication stream a
- * changeRecordNewData providing in the operationalInfo, the nodeID
- * accepting custody of the datum and the authorizedName of the
- * publisher accepting ownership. The acknowledgmentRequested attribute
- * of this change record MUST be set to "true".
+ * transfers custody of an entity from node1/user1 to node2/user2
*
- * TODO enqueue Replication message
- *
- * Finally, the custodial node invalidates the transferToken in order to
- * prevent additional calls of the transfer_entities API.
+ * @param body
+ * @throws DispositionReportFaultMessage
*/
- DiscardTransferToken dtt = new DiscardTransferToken();
- dtt.setKeyBag(body.getKeyBag());
- dtt.setTransferToken(body.getTransferToken());
- new UDDICustodyTransferImpl().discardTransferToken(dtt);
- }
-
+ @Override
+ public void transferCustody(TransferCustody body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ //*this node is transfering data to another node
+ //body.getTransferOperationalInfo().
+ ValidateReplication.unsupportedAPICall();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ //EntityTransaction tx = em.getTransaction();
+
+ /**
+ * The custodial node must verify that it has granted permission
+ * to transfer the entities identified and that this permission
+ * is still valid. This operation is comprised of two steps:
+ *
+ * 1. Verification that the transferToken was issued by it, that
+ * it has not expired, that it represents the authority to
+ * transfer no more and no less than those entities identified
+ * by the businessKey and tModelKey elements and that all these
+ * entities are still valid and not yet transferred. The
+ * transferToken is invalidated if any of these conditions are
+ * not met.
+ *
+ * 2. If the conditions above are met, the custodial node will
+ * prevent any further changes to the entities identified by the
+ * businessKey and tModelKey elements identified. The entity
+ * will remain in this state until the replication stream
+ * indicates it has been successfully processed via the
+ * replication stream. Upon successful verification of the
+ * custody transfer request by the custodial node, an empty
+ * message is returned by it indicating the success of the
+ * request and acknowledging the custody transfer. Following the
+ * issue of the empty message, the custodial node will submit
+ * into the replication stream a changeRecordNewData providing
+ * in the operationalInfo, the nodeID accepting custody of the
+ * datum and the authorizedName of the publisher accepting
+ * ownership. The acknowledgmentRequested attribute of this
+ * change record MUST be set to "true".
+ *
+ * TODO enqueue Replication message
+ *
+ * Finally, the custodial node invalidates the transferToken in
+ * order to prevent additional calls of the transfer_entities
+ * API.
+ */
+ DiscardTransferToken dtt = new DiscardTransferToken();
+ dtt.setKeyBag(body.getKeyBag());
+ dtt.setTransferToken(body.getTransferToken());
+ new UDDICustodyTransferImpl().discardTransferToken(dtt);
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[09/28] juddi git commit: JUDDI-241 Adding additional changes
required by replication api. Not all tests pass on juddi api
Posted by al...@apache.org.
JUDDI-241 Adding additional changes required by replication api. Not all tests pass on juddi api
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/455149a9
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/455149a9
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/455149a9
Branch: refs/heads/master
Commit: 455149a9edbfa54679c5d789001c784e9bb464ea
Parents: 8b95902
Author: alexoree <al...@apache.org>
Authored: Fri Nov 14 18:12:31 2014 -0500
Committer: alexoree <al...@apache.org>
Committed: Fri Nov 14 18:12:31 2014 -0500
----------------------------------------------------------------------
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 13 +-
.../juddi/api/impl/UDDIReplicationImpl.java | 48 +-
.../juddi/api/impl/UDDIServiceCounter.java | 14 +-
.../juddi/api/impl/UDDISubscriptionImpl.java | 2 +-
.../apache/juddi/mapping/MappingApiToModel.java | 17 +-
.../apache/juddi/mapping/MappingModelToApi.java | 2159 +++++++++---------
.../apache/juddi/validation/ValidateClerk.java | 5 +-
.../juddi/validation/ValidatePublish.java | 1 -
.../juddi/validation/ValidateReplication.java | 4 +
.../src/main/resources/messages.properties | 1 +
..._RMISubscriptionListenerIntegrationTest.java | 1 -
.../juddi/api/impl/API_160_ReplicationTest.java | 266 +++
.../replication/ReplicationNotifierTest.java | 75 +
juddi-tomcat/build.xml | 52 +
.../root_BusinessEntity.xml | 668 ++++++
.../juddi_install_data_node2/root_Publisher.xml | 21 +
.../root_tModelKeyGen.xml | 40 +
juddi-tomcat/pom.xml | 1 +
18 files changed, 2286 insertions(+), 1102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index de98fa0..a4ef416 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -69,6 +69,7 @@ import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.model.ClientSubscriptionInfo;
+import org.apache.juddi.model.Node;
import org.apache.juddi.model.Publisher;
import org.apache.juddi.model.ReplicationConfiguration;
import org.apache.juddi.model.SubscriptionMatch;
@@ -86,6 +87,7 @@ import org.apache.juddi.validation.ValidateClientSubscriptionInfo;
import org.apache.juddi.validation.ValidateNode;
import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidatePublisher;
+import org.apache.juddi.validation.ValidateReplication;
import org.apache.juddi.validation.ValidateSubscription;
import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.BusinessInfo;
@@ -675,8 +677,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
MappingApiToModel.mapClerk(apiClerk, modelClerk);
org.apache.juddi.model.Node node = em.find(org.apache.juddi.model.Node.class, apiClerk.getNode().getName());
if (node==null)
- MappingApiToModel.mapNode(apiClerk.getNode(), node);
-
+ {
+ //it doesn't exist yet
+ node = new Node();
+ }
+ MappingApiToModel.mapNode(apiClerk.getNode(), node);
modelClerk.setNode(node);
Object existingUddiEntity = em.find(modelClerk.getClass(), modelClerk.getClerkName());
if (existingUddiEntity != null) {
@@ -983,7 +988,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
if (existingUddiEntity
!= null) {
- //TODO cascade delete all clerks tied to this node
+ //TODO cascade delete all clerks tied to this node, confirm that it works
em.remove(existingUddiEntity);
found = true;
}
@@ -1260,8 +1265,8 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
if (!((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
}
+ new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration);
- //TODO validate inbound request
org.apache.juddi.model.ReplicationConfiguration model = new ReplicationConfiguration();
MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
em.persist(model);
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 5f97703..e2fe3fd 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -463,9 +463,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
if (!Excluded(changesAlreadySeen, r)) {
ret.add(r);
}
-
+
}
-
tx.rollback();
long procTime = System.currentTimeMillis() - startTime;
@@ -582,6 +581,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
* @param body
* @throws DispositionReportFaultMessage
*/
+ @Override
public void transferCustody(TransferCustody body)
throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
@@ -593,13 +593,43 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
EntityManager em = PersistenceManager.getEntityManager();
//EntityTransaction tx = em.getTransaction();
- //The custodial node must verify that it has granted permission to transfer the entities identified and that this permission is still valid. This operation is comprised of two steps:
- //1. Verification that the transferToken was issued by it, that it has not expired, that it represents the authority to transfer no more and no less than those entities identified by the businessKey and tModelKey elements and that all these entities are still valid and not yet transferred. The transferToken is invalidated if any of these conditions are not met.
- //2. If the conditions above are met, the custodial node will prevent any further changes to the entities identified by the businessKey and tModelKey elements identified. The entity will remain in this state until the replication stream indicates it has been successfully processed via the replication stream.
- //Upon successful verification of the custody transfer request by the custodial node, an empty message is returned by it indicating the success of the request and acknowledging the custody transfer.
- //Following the issue of the empty message, the custodial node will submit into the replication stream a changeRecordNewData providing in the operationalInfo, the nodeID accepting custody of the datum and the authorizedName of the publisher accepting ownership. The acknowledgmentRequested attribute of this change record MUST be set to "true".
- //TODO enqueue Replication message
- //Finally, the custodial node invalidates the transferToken in order to prevent additional calls of the transfer_entities API.
+ /**
+ * The custodial node must verify that it has granted permission
+ * to transfer the entities identified and that this permission
+ * is still valid. This operation is comprised of two steps:
+ *
+ * 1.
+ * Verification that the transferToken was issued by it, that it
+ * has not expired, that it represents the authority to transfer
+ * no more and no less than those entities identified by the
+ * businessKey and tModelKey elements and that all these
+ * entities are still valid and not yet transferred. The
+ * transferToken is invalidated if any of these conditions are
+ * not met.
+ *
+ * 2. If the conditions above are met, the custodial
+ * node will prevent any further changes to the entities
+ * identified by the businessKey and tModelKey elements
+ * identified. The entity will remain in this state until the
+ * replication stream indicates it has been successfully
+ * processed via the replication stream. Upon successful
+ * verification of the custody transfer request by the custodial
+ * node, an empty message is returned by it indicating the
+ * success of the request and acknowledging the custody
+ * transfer. Following the issue of the empty message, the
+ * custodial node will submit into the replication stream a
+ * changeRecordNewData providing in the operationalInfo, the
+ * nodeID accepting custody of the datum and the authorizedName
+ * of the publisher accepting ownership. The
+ * acknowledgmentRequested attribute of this change record MUST
+ * be set to "true".
+ *
+ * TODO enqueue Replication message
+ *
+ * Finally, the custodial node
+ * invalidates the transferToken in order to prevent additional
+ * calls of the transfer_entities API.
+ */
DiscardTransferToken dtt = new DiscardTransferToken();
dtt.setKeyBag(body.getKeyBag());
dtt.setTransferToken(body.getTransferToken());
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
index b8c387b..42813a9 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
@@ -206,7 +206,7 @@ public class UDDIServiceCounter implements DynamicMBean, Serializable {
}
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public Object getAttribute(String attribute)
throws AttributeNotFoundException, MBeanException,
ReflectionException {
@@ -228,15 +228,14 @@ public class UDDIServiceCounter implements DynamicMBean, Serializable {
return null;
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, InvalidAttributeValueException,
MBeanException, ReflectionException {
- // TODO Auto-generated method stub
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public AttributeList getAttributes(String[] attributes) {
AttributeList attributeList = new AttributeList();
@@ -267,13 +266,12 @@ public class UDDIServiceCounter implements DynamicMBean, Serializable {
return attributeList;
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public AttributeList setAttributes(AttributeList attributes) {
- // TODO Auto-generated method stub
return null;
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public Object invoke(String actionName, Object[] params, String[] signature)
throws MBeanException, ReflectionException {
if (actionName.equalsIgnoreCase(RESET_COUNTER)) {
@@ -284,7 +282,7 @@ public class UDDIServiceCounter implements DynamicMBean, Serializable {
}
}
- //@Override, this is jdk1.6 style, please uncomment when we go 1.6
+ @Override
public MBeanInfo getMBeanInfo() {
// the extra 3 added are for totalApiQueries, faultApiQueries, and
// successfulApiQueries
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
index 3c24102..ac5d19e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
@@ -723,7 +723,7 @@ public class UDDISubscriptionImpl extends AuthenticatedService implements UDDISu
}
if (subscriptionFilter.getGetAssertionStatusReport() != null) {
// The coverage period doesn't apply here (basically because publisher assertions don't keep operational info).
-
+ // TODO, JUDDI-873 edit they do now, rewrite this query
GetAssertionStatusReport getAssertionStatusReport = subscriptionFilter.getGetAssertionStatusReport();
List<AssertionStatusItem> assertionList = PublicationHelper.getAssertionStatusItemList(publisher, getAssertionStatusReport.getCompletionStatus(), em);
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index a271d7e..7297311 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -1411,7 +1411,9 @@ public class MappingApiToModel {
}
public static void mapReplicationConfiguration(ReplicationConfiguration replicationConfiguration, org.apache.juddi.model.ReplicationConfiguration model, EntityManager em) throws DispositionReportFaultMessage {
-
+ if (replicationConfiguration == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNull"));
+ }
model.setMaximumTimeToGetChanges(replicationConfiguration.getMaximumTimeToGetChanges());
model.setMaximumTimeToSyncRegistry(replicationConfiguration.getMaximumTimeToSyncRegistry());
model.setSerialNumber(null);
@@ -1420,7 +1422,9 @@ public class MappingApiToModel {
//2002 03 04 1859Z
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
- model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact()));
+ if (replicationConfiguration.getRegistryContact() != null) {
+ model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact()));
+ }
model.setCommunicationGraph(mapCommunicationGraph(replicationConfiguration.getCommunicationGraph(), em));
model.setOperator(mapOperators(replicationConfiguration.getOperator()));
if (replicationConfiguration.getSignature() != null) {
@@ -1470,16 +1474,22 @@ public class MappingApiToModel {
}
model.getNode().add(find);
}
- if (communicationGraph.getEdge() != null) {
+ if (communicationGraph.getEdge() != null && !communicationGraph.getEdge().isEmpty()) {
List<Edge> ret = new ArrayList<Edge>();
for (int i = 0; i < communicationGraph.getEdge().size(); i++) {
Edge e = new Edge();
e.setCommunicationGraph(model);
+ if (communicationGraph.getEdge().get(i).getMessageReceiver() == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
+ }
Node find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageReceiver());
if (find == null) {
throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
}
e.setMessageReceiver(find);
+ if (communicationGraph.getEdge().get(i).getMessageSender() == null) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
+ }
find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageSender());
if (find == null) {
throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageSender()));
@@ -1540,7 +1550,6 @@ public class MappingApiToModel {
if (!api.get(i).getKeyInfo().isEmpty()) {
op.setKeyInfo(new ArrayList<KeyInfo>());
for (int k = 0; k < api.get(i).getKeyInfo().size(); k++) {
- //TODO api.get(i).getKeyInfo().get(k)
org.apache.juddi.model.KeyInfo modelKeyInfo = new KeyInfo();
modelKeyInfo.setXmlID(api.get(i).getKeyInfo().get(i).getId());
modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[06/28] juddi git commit: JUDDI-241 working change journal NOJIRA
removing a number of unnecessary TODO statements
Posted by al...@apache.org.
JUDDI-241 working change journal
NOJIRA removing a number of unnecessary TODO statements
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/8b95902b
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/8b95902b
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/8b95902b
Branch: refs/heads/master
Commit: 8b95902bbf54751cc0d8891cebfae12d2b211660
Parents: fd1ac2c
Author: alexoree <al...@apache.org>
Authored: Thu Nov 13 21:36:18 2014 -0500
Committer: alexoree <al...@apache.org>
Committed: Thu Nov 13 21:36:20 2014 -0500
----------------------------------------------------------------------
.../juddi/v3/client/config/ClientConfig.java | 4 +-
.../juddi/v3/client/config/UDDIClerk.java | 1 -
.../apache/juddi/v3/client/config/UDDINode.java | 2 +-
.../juddi/v3/client/mapping/ServiceLocator.java | 2 +-
.../apache/juddi/v3/client/UDDIClientTest.java | 4 -
.../juddi/api/impl/AuthenticatedService.java | 14 +-
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 186 +-
.../juddi/api/impl/UDDICustodyTransferImpl.java | 469 ++--
.../juddi/api/impl/UDDIPublicationImpl.java | 2047 +++++++++++-------
.../juddi/api/impl/UDDIReplicationImpl.java | 501 ++++-
.../java/org/apache/juddi/config/Install.java | 12 +-
.../apache/juddi/mapping/MappingApiToModel.java | 468 ++--
.../apache/juddi/mapping/MappingModelToApi.java | 54 +-
.../org/apache/juddi/model/ChangeRecord.java | 65 +-
.../main/java/org/apache/juddi/model/Clerk.java | 2 +-
.../apache/juddi/model/CommunicationGraph.java | 10 +
.../java/org/apache/juddi/model/Contact.java | 2 +-
.../org/apache/juddi/model/ControlMessage.java | 4 +
.../main/java/org/apache/juddi/model/Edge.java | 24 +-
.../apache/juddi/model/PublisherAssertion.java | 20 +-
.../juddi/model/ReplicationConfiguration.java | 18 +-
.../apache/juddi/model/ReplicationMessage.java | 51 -
.../apache/juddi/replication/ChangeList.java | 26 -
.../juddi/replication/ReplicationNotifier.java | 149 +-
.../subscription/SubscriptionNotifier.java | 18 +-
.../juddi/validation/ValidateReplication.java | 95 +-
.../src/main/resources/messages.properties | 11 +
.../java/org/apache/juddi/util/JPAUtil.java | 3 +-
.../org/apache/juddi/samples/EntryPoint.java | 160 +-
.../apache/juddi/samples/JuddiAdminService.java | 182 +-
.../apache/juddi/samples/UddiFindEndpoints.java | 1 -
.../apache/juddi/samples/UddiReplication.java | 126 ++
juddi-gui/src/main/webapp/ajax/assertions.jsp | 1 -
juddi-gui/src/main/webapp/ajax/copyitem.jsp | 2 +-
juddi-tomcat/juddiv3Node2.xml | 15 +-
.../src/main/webapp/WEB-INF/classes/juddiv3.xml | 5 +-
..._RMISubscriptionListenerIntegrationTest.java | 1 -
...090_SubscriptionListenerIntegrationBase.java | 6 +-
.../org/uddi/repl_v3/ChangeRecordDelete.java | 5 +
.../repl_v3/ChangeRecordDeleteAssertion.java | 28 +
.../java/org/uddi/repl_v3/ChangeRecordHide.java | 3 +
.../org/uddi/repl_v3/ChangeRecordIDType.java | 13 +
.../org/uddi/repl_v3/ChangeRecordNewData.java | 6 +
.../v3_service/UDDIReplicationPortType.java | 19 +
44 files changed, 3281 insertions(+), 1554 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
index 2bb4a3d..10a63be 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
@@ -107,6 +107,8 @@ public class ClientConfig {
saveConfiguration.setRootElementName("uddi");
+
+ cc.addProperty("client(0).selection.policy", config.getProperty("client.selection.policy"));
cc.addProperty("reloadDelay", config.getProperty("reloadDelay"));
addCurrentNodeConfig(cc);
addCurrentClerks(cc);
@@ -605,8 +607,6 @@ public class ClientConfig {
if (this.uddiNodes.containsKey(name)) {
this.uddiNodes.remove(name);
}
-
- //TODO to configuration xml structure
}
/**
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
index ce6fc97..3c8b26b 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
@@ -150,7 +150,6 @@ public class UDDIClerk implements Serializable {
*/
public UDDIClerk() {
super();
- // TODO Auto-generated constructor stub
}
public UDDIClerk(Clerk clerk) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
index 490ebb2..ade25c5 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDINode.java
@@ -66,7 +66,7 @@ public class UDDINode implements Serializable {
description = node.getDescription();
custodyTransferUrl = node.getCustodyTransferUrl();
inquiryUrl = node.getInquiryUrl();
- //TODO inquiryRESTUrl = node.getInquiryRESTUrl();
+ //TODO need juddi schema updat inquiryRESTUrl = node.getInquiryRESTUrl()
publishUrl = node.getPublishUrl();
securityUrl = node.getSecurityUrl();
subscriptionUrl = node.getSubscriptionUrl();
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
index 72645c3..b8a6ac1 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
@@ -140,7 +140,7 @@ public class ServiceLocator {
try {
if (selectionPolicy==null) {
if (policy==null) {
- //TODO move this constant to Property.class
+ //TODO update .NET schema file to support this
policy = properties.getProperty("juddi.client.selection.policy", "org.apache.juddi.v3.client.mapping.PolicyLocalFirst");
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java b/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
index f287d07..fd9a140 100644
--- a/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
+++ b/juddi-client/src/test/java/org/apache/juddi/v3/client/UDDIClientTest.java
@@ -63,7 +63,6 @@ public class UDDIClientTest {
client2.stop();
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
Assert.fail("No exceptions are expected");
}
@@ -81,7 +80,6 @@ public class UDDIClientTest {
client.stop();
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
Assert.fail("No exceptions are expected");
}
@@ -102,7 +100,6 @@ public class UDDIClientTest {
client.stop();
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
Assert.fail("No exceptions are expected");
}
@@ -162,7 +159,6 @@ public class UDDIClientTest {
client.stop();
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
Assert.fail("No exceptions are expected");
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
index 38665b6..d69afbf 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/AuthenticatedService.java
@@ -18,6 +18,8 @@
package org.apache.juddi.api.impl;
import java.util.Date;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
@@ -47,7 +49,17 @@ public abstract class AuthenticatedService {
public static final int AUTHTOKEN_ACTIVE = 1;
public static final int AUTHTOKEN_RETIRED = 0;
static final Log logger = LogFactory.getLog(AuthenticatedService.class);
-
+ protected String node = "UNDEFINED_NODE_NAME";
+
+ public AuthenticatedService(){
+ try {
+ node = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID, "UNDEFINED_NODE_NAME");
+ } catch (ConfigurationException ex) {
+ logger.fatal(null, ex);
+ }
+ }
+
+
@Resource
protected WebServiceContext ctx;
public UddiEntityPublisher getEntityPublisher(EntityManager em, String authInfo) throws DispositionReportFaultMessage {
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index a52a66e..de98fa0 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -70,6 +70,7 @@ import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.model.ClientSubscriptionInfo;
import org.apache.juddi.model.Publisher;
+import org.apache.juddi.model.ReplicationConfiguration;
import org.apache.juddi.model.SubscriptionMatch;
import org.apache.juddi.model.Tmodel;
import org.apache.juddi.model.UddiEntityPublisher;
@@ -114,8 +115,8 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
@WebService(serviceName = "JUDDIApiService",
- endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
- targetNamespace = "urn:juddi-apache-org:v3_service")
+ endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
+ targetNamespace = "urn:juddi-apache-org:v3_service")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
private Log log = LogFactory.getLog(this.getClass());
@@ -130,7 +131,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public PublisherDetail savePublisher(SavePublisher body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -163,12 +164,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_PUBLISHER,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_PUBLISHER,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -186,7 +187,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public void deletePublisher(DeletePublisher body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -245,11 +246,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_PUBLISHER,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_PUBLISHER,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -268,7 +269,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public PublisherDetail getPublisherDetail(GetPublisherDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidatePublisher(null).validateGetPublisherDetail(body);
@@ -302,12 +303,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_PUBLISHER_DETAIL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_PUBLISHER_DETAIL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -331,7 +332,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public PublisherDetail getAllPublisherDetail(GetAllPublisherDetail body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
new ValidatePublisher(null).validateGetAllPublisherDetail(body);
@@ -359,12 +360,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_PUBLISHER_DETAIL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_PUBLISHER_DETAIL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -386,7 +387,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public void adminDeleteTModel(DeleteTModel body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -406,11 +407,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_DELETE_TMODEL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_DELETE_TMODEL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -429,7 +430,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws RemoteException
*/
public void deleteClientSubscriptionInfo(DeleteClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -449,11 +450,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -475,7 +476,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws RemoteException
*/
public ClientSubscriptionInfoDetail saveClientSubscriptionInfo(SaveClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -509,12 +510,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -535,7 +536,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public ClientSubscriptionInfoDetail getAllClientSubscriptionInfoDetail(GetAllClientSubscriptionInfoDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidateClientSubscriptionInfo(null).validateGetAllClientSubscriptionDetail(body);
@@ -563,12 +564,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -590,7 +591,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public ClientSubscriptionInfoDetail getClientSubscriptionInfoDetail(GetClientSubscriptionInfoDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidateClientSubscriptionInfo(null).validateGetClientSubscriptionInfoDetail(body);
@@ -627,12 +628,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -653,7 +654,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public ClerkDetail saveClerk(SaveClerk body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -672,9 +673,14 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Clerk modelClerk = new org.apache.juddi.model.Clerk();
MappingApiToModel.mapClerk(apiClerk, modelClerk);
+ org.apache.juddi.model.Node node = em.find(org.apache.juddi.model.Node.class, apiClerk.getNode().getName());
+ if (node==null)
+ MappingApiToModel.mapNode(apiClerk.getNode(), node);
+ modelClerk.setNode(node);
Object existingUddiEntity = em.find(modelClerk.getClass(), modelClerk.getClerkName());
if (existingUddiEntity != null) {
+
em.merge(modelClerk);
} else {
em.persist(modelClerk);
@@ -686,12 +692,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLERK,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLERK,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -713,7 +719,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public NodeDetail saveNode(SaveNode body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -746,12 +752,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -773,14 +779,14 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public SyncSubscriptionDetail invokeSyncSubscription(
- SyncSubscription body) throws DispositionReportFaultMessage,
- RemoteException {
+ SyncSubscription body) throws DispositionReportFaultMessage,
+ RemoteException {
long startTime = System.currentTimeMillis();
//validate
SyncSubscriptionDetail syncSubscriptionDetail = new SyncSubscriptionDetail();
Map<String, org.apache.juddi.api_v3.ClientSubscriptionInfo> clientSubscriptionInfoMap
- = new HashMap<String, org.apache.juddi.api_v3.ClientSubscriptionInfo>();
+ = new HashMap<String, org.apache.juddi.api_v3.ClientSubscriptionInfo>();
//find the clerks to go with these subscriptions
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -808,7 +814,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.INVOKE_SYNCSUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -837,23 +843,23 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
marshaller.marshal(list, sw);
log.info(
- "Notification received by UDDISubscriptionListenerService : " + sw.toString());
+ "Notification received by UDDISubscriptionListenerService : " + sw.toString());
NotificationList<String> nl = NotificationList.getInstance();
nl.getNotifications()
- .add(sw.toString());
+ .add(sw.toString());
//update the registry with the notification list.
XRegisterHelper.handle(fromClerk, toClerk, list);
syncSubscriptionDetail.getSubscriptionResultsList()
- .add(list);
+ .add(list);
} catch (Exception ce) {
log.error(ce.getMessage(), ce);
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
if (ce instanceof DispositionReportFaultMessage) {
throw (DispositionReportFaultMessage) ce;
}
@@ -867,7 +873,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.INVOKE_SYNCSUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return syncSubscriptionDetail;
}
@@ -900,11 +906,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -943,11 +949,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLERKS,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLERKS,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -975,7 +981,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Node existingUddiEntity = em.find(org.apache.juddi.model.Node.class, req.getNodeID());
if (existingUddiEntity
- != null) {
+ != null) {
//TODO cascade delete all clerks tied to this node
em.remove(existingUddiEntity);
@@ -985,11 +991,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_NODE,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1020,7 +1026,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Clerk existingUddiEntity = em.find(org.apache.juddi.model.Clerk.class, req.getClerkID());
if (existingUddiEntity
- != null) {
+ != null) {
em.remove(existingUddiEntity);
found = true;
}
@@ -1028,11 +1034,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLERK,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLERK,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1050,7 +1056,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
/*
* enables tmodel owners to setup valid values for tmodel instance infos
- * to use, TODO
+ * to use?
*
* @param authInfo
* @param values
@@ -1068,7 +1074,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
EntityTransaction tx = em.getTransaction();
try {
- //TODO is this tModel used anywhere?, if so, validate all instances against the new rule?
+ // is this tModel used anywhere?, if so, validate all instances against the new rule?
tx.begin();
//each tmodel/value set
@@ -1126,11 +1132,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SubscriptionQuery.DELETE_SUBSCRIPTION,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SubscriptionQuery.DELETE_SUBSCRIPTION,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1146,7 +1152,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long startTime = System.currentTimeMillis();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_BUSINESS,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
ValidatePublish.unsupportedAPICall();
return null;
}
@@ -1174,11 +1180,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_TMODEL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_TMODEL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1221,16 +1227,15 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
x.setPublisherIdOrUsername(resultList.get(i).getAuthorizedName());
r.add(x);
}
-
-
+
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1245,11 +1250,39 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
@Override
public DispositionReport setReplicationNodes(String authInfo, org.uddi.repl_v3.ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
- QueryStatus.SUCCESS, procTime);
- ValidatePublish.unsupportedAPICall();
- return null;
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
+ if (!((Publisher) publisher).isAdmin()) {
+ throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
+ }
+
+ //TODO validate inbound request
+ org.apache.juddi.model.ReplicationConfiguration model = new ReplicationConfiguration();
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
+ em.persist(model);
+
+ tx.commit();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
+ QueryStatus.SUCCESS, procTime);
+ } catch (DispositionReportFaultMessage drfm) {
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ return new DispositionReport();
}
@Override
@@ -1268,22 +1301,21 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
}
StringBuilder sql = new StringBuilder();
- sql.append("select distinct c from ReplicationConfiguration c ");
+ sql.append("select c from ReplicationConfiguration c order by c.SerialNumber desc");
sql.toString();
Query qry = em.createQuery(sql.toString());
+ qry.setMaxResults(1);
org.apache.juddi.model.ReplicationConfiguration resultList = (org.apache.juddi.model.ReplicationConfiguration) qry.getSingleResult();
- //for (int i = 0; i < resultList.size(); i++) {
MappingModelToApi.mapReplicationConfiguration(resultList, r);
- //}
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1316,11 +1348,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
index 02d62dd..2bb21f2 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDICustodyTransferImpl.java
@@ -14,13 +14,15 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.api.impl;
+import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.UUID;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.jws.WebService;
import javax.persistence.EntityManager;
@@ -47,211 +49,290 @@ import org.apache.juddi.model.TransferTokenKey;
import org.apache.juddi.model.UddiEntity;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.query.util.DynamicQuery;
+import org.apache.juddi.replication.ReplicationNotifier;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
import org.apache.juddi.validation.ValidateCustodyTransfer;
+import org.uddi.api_v3.OperationalInfo;
import org.uddi.custody_v3.DiscardTransferToken;
import org.uddi.custody_v3.KeyBag;
import org.uddi.custody_v3.TransferEntities;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDICustodyTransferPortType;
+
/**
* This implements the UDDI v3 Custody Transfer API web service
- *
+ *
*/
-@WebService(serviceName="UDDICustodyTransferService",
- endpointInterface="org.uddi.v3_service.UDDICustodyTransferPortType",
- targetNamespace = "urn:uddi-org:v3_service")
+@WebService(serviceName = "UDDICustodyTransferService",
+ endpointInterface = "org.uddi.v3_service.UDDICustodyTransferPortType",
+ targetNamespace = "urn:uddi-org:v3_service")
public class UDDICustodyTransferImpl extends AuthenticatedService implements UDDICustodyTransferPortType {
- public static final String TRANSFER_TOKEN_PREFIX = "transfertoken:";
- public static final int DEFAULT_TRANSFEREXPIRATION_DAYS = 3;
-
+ public static final String TRANSFER_TOKEN_PREFIX = "transfertoken:";
+ public static final int DEFAULT_TRANSFEREXPIRATION_DAYS = 3;
+
private static Log logger = LogFactory.getLog(UDDICustodyTransferImpl.class);
-
- private UDDIServiceCounter serviceCounter;
-
- public UDDICustodyTransferImpl() {
- super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
- }
-
- @SuppressWarnings("unchecked")
- public void discardTransferToken(DiscardTransferToken body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidateCustodyTransfer(publisher).validateDiscardTransferToken(em, body);
-
- org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken();
- if (apiTransferToken != null) {
- String transferTokenId = new String(apiTransferToken.getOpaqueToken());
- org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId);
- if (modelTransferToken != null)
- em.remove(modelTransferToken);
- }
-
- KeyBag keyBag = body.getKeyBag();
- if (keyBag != null) {
- List<String> keyList = keyBag.getKey();
- Vector<DynamicQuery.Parameter> params = new Vector<DynamicQuery.Parameter>(0);
- for (String key : keyList) {
- // Creating parameters for key-checking query
- DynamicQuery.Parameter param = new DynamicQuery.Parameter("UPPER(ttk.entityKey)",
- key.toUpperCase(),
- DynamicQuery.PREDICATE_EQUALS);
-
- params.add(param);
- }
-
- // Find the associated transfer tokens and remove them.
- DynamicQuery getTokensQry = new DynamicQuery();
- getTokensQry.append("select distinct ttk.transferToken from TransferTokenKey ttk").pad();
- getTokensQry.WHERE().pad().appendGroupedOr(params.toArray(new DynamicQuery.Parameter[0]));
-
- Query qry = getTokensQry.buildJPAQuery(em);
- List<org.apache.juddi.model.TransferToken> tokensToDelete = qry.getResultList();
- if (tokensToDelete != null && tokensToDelete.size() > 0) {
- for (org.apache.juddi.model.TransferToken tt : tokensToDelete)
- em.remove(tt);
- }
- }
-
- tx.commit();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(CustodyTransferQuery.DISCARD_TRANSFERTOKEN,
- QueryStatus.SUCCESS, procTime);
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void getTransferToken(String authInfo, KeyBag keyBag,
- Holder<String> nodeID, Holder<XMLGregorianCalendar> expirationTime,
- Holder<byte[]> opaqueToken) throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
-
- new ValidateCustodyTransfer(publisher).validateGetTransferToken(em, keyBag);
-
- int transferExpirationDays = DEFAULT_TRANSFEREXPIRATION_DAYS;
- try {
- transferExpirationDays = AppConfig.getConfiguration().getInt(Property.JUDDI_TRANSFER_EXPIRATION_DAYS);
- // For output
- nodeID.value = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
- }
- catch(ConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval"));}
-
- String transferKey = TRANSFER_TOKEN_PREFIX + UUID.randomUUID();
- org.apache.juddi.model.TransferToken transferToken = new org.apache.juddi.model.TransferToken();
- transferToken.setTransferToken(transferKey);
- // For output
- opaqueToken.value = transferKey.getBytes();
-
- GregorianCalendar gc = new GregorianCalendar();
- gc.add(GregorianCalendar.DAY_OF_MONTH, transferExpirationDays);
-
- transferToken.setExpirationDate(gc.getTime());
-
- try {
- DatatypeFactory df = DatatypeFactory.newInstance();
- // For output
- expirationTime.value = df.newXMLGregorianCalendar(gc);
- }
- catch(DatatypeConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.Unspecified"));}
-
- List<String> keyList = keyBag.getKey();
- for (String key : keyList) {
- TransferTokenKey tokenKey = new TransferTokenKey(transferToken, key);
- transferToken.getTransferKeys().add(tokenKey);
- }
-
- em.persist(transferToken);
-
- tx.commit();
-
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(CustodyTransferQuery.GET_TRANSFERTOKEN,
- QueryStatus.SUCCESS, procTime);
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void transferEntities(TransferEntities body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidateCustodyTransfer(publisher).validateTransferEntities(em, body);
-
- // Once validated, the ownership transfer is as simple as switching the publisher
- KeyBag keyBag = body.getKeyBag();
- List<String> keyList = keyBag.getKey();
- for (String key : keyList) {
- UddiEntity uddiEntity = em.find(UddiEntity.class, key);
- uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
-
- if (uddiEntity instanceof BusinessEntity) {
- BusinessEntity be = (BusinessEntity)uddiEntity;
-
- List<BusinessService> bsList = be.getBusinessServices();
- for (BusinessService bs : bsList) {
- bs.setAuthorizedName(publisher.getAuthorizedName());
-
- List<BindingTemplate> btList = bs.getBindingTemplates();
- for (BindingTemplate bt : btList)
- bt.setAuthorizedName(publisher.getAuthorizedName());
- }
- }
- }
-
- // After transfer is finished, the token can be removed
- org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken();
- String transferTokenId = new String(apiTransferToken.getOpaqueToken());
- org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId);
- em.remove(modelTransferToken);
-
- tx.commit();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(CustodyTransferQuery.TRANSFER_ENTITIES,
- QueryStatus.SUCCESS, procTime);
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
-
- }
+
+ private static DatatypeFactory df = null;
+ private UDDIServiceCounter serviceCounter;
+
+ public UDDICustodyTransferImpl() {
+ super();
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
+ if (df == null) {
+ try {
+ df = DatatypeFactory.newInstance();
+ } catch (DatatypeConfigurationException ex) {
+ Logger.getLogger(UDDICustodyTransferImpl.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void discardTransferToken(DiscardTransferToken body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidateCustodyTransfer(publisher).validateDiscardTransferToken(em, body);
+
+ org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken();
+ if (apiTransferToken != null) {
+ String transferTokenId = new String(apiTransferToken.getOpaqueToken());
+ org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId);
+ if (modelTransferToken != null) {
+ em.remove(modelTransferToken);
+ }
+ }
+
+ KeyBag keyBag = body.getKeyBag();
+ if (keyBag != null) {
+ List<String> keyList = keyBag.getKey();
+ Vector<DynamicQuery.Parameter> params = new Vector<DynamicQuery.Parameter>(0);
+ for (String key : keyList) {
+ // Creating parameters for key-checking query
+ DynamicQuery.Parameter param = new DynamicQuery.Parameter("UPPER(ttk.entityKey)",
+ key.toUpperCase(),
+ DynamicQuery.PREDICATE_EQUALS);
+
+ params.add(param);
+ }
+
+ // Find the associated transfer tokens and remove them.
+ DynamicQuery getTokensQry = new DynamicQuery();
+ getTokensQry.append("select distinct ttk.transferToken from TransferTokenKey ttk").pad();
+ getTokensQry.WHERE().pad().appendGroupedOr(params.toArray(new DynamicQuery.Parameter[0]));
+
+ Query qry = getTokensQry.buildJPAQuery(em);
+ List<org.apache.juddi.model.TransferToken> tokensToDelete = qry.getResultList();
+ if (tokensToDelete != null && tokensToDelete.size() > 0) {
+ for (org.apache.juddi.model.TransferToken tt : tokensToDelete) {
+ em.remove(tt);
+ }
+ }
+ }
+
+ tx.commit();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(CustodyTransferQuery.DISCARD_TRANSFERTOKEN,
+ QueryStatus.SUCCESS, procTime);
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public void getTransferToken(String authInfo, KeyBag keyBag,
+ Holder<String> nodeID, Holder<XMLGregorianCalendar> expirationTime,
+ Holder<byte[]> opaqueToken) throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
+
+ new ValidateCustodyTransfer(publisher).validateGetTransferToken(em, keyBag);
+
+ int transferExpirationDays = DEFAULT_TRANSFEREXPIRATION_DAYS;
+ try {
+ transferExpirationDays = AppConfig.getConfiguration().getInt(Property.JUDDI_TRANSFER_EXPIRATION_DAYS);
+ // For output
+ nodeID.value = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ce) {
+ throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval"));
+ }
+
+ String transferKey = TRANSFER_TOKEN_PREFIX + UUID.randomUUID();
+ org.apache.juddi.model.TransferToken transferToken = new org.apache.juddi.model.TransferToken();
+ transferToken.setTransferToken(transferKey);
+ // For output
+ opaqueToken.value = transferKey.getBytes();
+
+ GregorianCalendar gc = new GregorianCalendar();
+ gc.add(GregorianCalendar.DAY_OF_MONTH, transferExpirationDays);
+
+ transferToken.setExpirationDate(gc.getTime());
+
+ try {
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ // For output
+ expirationTime.value = df.newXMLGregorianCalendar(gc);
+ } catch (DatatypeConfigurationException ce) {
+ throw new FatalErrorException(new ErrorMessage("errors.Unspecified"));
+ }
+
+ List<String> keyList = keyBag.getKey();
+ for (String key : keyList) {
+ TransferTokenKey tokenKey = new TransferTokenKey(transferToken, key);
+ transferToken.getTransferKeys().add(tokenKey);
+ }
+
+ em.persist(transferToken);
+
+ tx.commit();
+
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(CustodyTransferQuery.GET_TRANSFERTOKEN,
+ QueryStatus.SUCCESS, procTime);
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public void transferEntities(TransferEntities body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidateCustodyTransfer(publisher).validateTransferEntities(em, body);
+
+ // Once validated, the ownership transfer is as simple as switching the publisher
+ KeyBag keyBag = body.getKeyBag();
+ List<String> keyList = keyBag.getKey();
+ //used for the change journal
+ List<OperationalInfo> op_info = new ArrayList<OperationalInfo>();
+ for (String key : keyList) {
+ UddiEntity uddiEntity = em.find(UddiEntity.class, key);
+ uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
+ OperationalInfo o = new OperationalInfo();
+ o.setAuthorizedName(publisher.getAuthorizedName());
+
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTime(uddiEntity.getCreated());
+ o.setCreated(df.newXMLGregorianCalendar(gcal));
+
+ o.setEntityKey(uddiEntity.getEntityKey());
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(uddiEntity.getModified());
+ o.setModified(df.newXMLGregorianCalendar(gcal));
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(uddiEntity.getModifiedIncludingChildren());
+ o.setModifiedIncludingChildren(df.newXMLGregorianCalendar(gcal));
+ o.setNodeID(uddiEntity.getNodeId());
+ op_info.add(o);
+
+ if (uddiEntity instanceof BusinessEntity) {
+ BusinessEntity be = (BusinessEntity) uddiEntity;
+
+ List<BusinessService> bsList = be.getBusinessServices();
+ for (BusinessService bs : bsList) {
+ bs.setAuthorizedName(publisher.getAuthorizedName());
+ OperationalInfo o2 = new OperationalInfo();
+ o2.setAuthorizedName(bs.getAuthorizedName());
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bs.getCreated());
+ o2.setCreated(df.newXMLGregorianCalendar(gcal));
+
+ o2.setEntityKey(bs.getEntityKey());
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bs.getModified());
+ o2.setModified(df.newXMLGregorianCalendar(gcal));
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bs.getModifiedIncludingChildren());
+ o2.setModifiedIncludingChildren(df.newXMLGregorianCalendar(gcal));
+ o2.setNodeID(bs.getNodeId());
+ op_info.add(o2);
+
+ List<BindingTemplate> btList = bs.getBindingTemplates();
+ for (BindingTemplate bt : btList) {
+ bt.setAuthorizedName(publisher.getAuthorizedName());
+ OperationalInfo o3 = new OperationalInfo();
+ o3.setAuthorizedName(bt.getAuthorizedName());
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bt.getCreated());
+ o3.setCreated(df.newXMLGregorianCalendar(gcal));
+
+ o3.setEntityKey(bt.getEntityKey());
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bt.getModified());
+ o3.setModified(df.newXMLGregorianCalendar(gcal));
+
+ gcal = new GregorianCalendar();
+ gcal.setTime(bt.getModifiedIncludingChildren());
+ o3.setModifiedIncludingChildren(df.newXMLGregorianCalendar(gcal));
+ o3.setNodeID(bt.getNodeId());
+ op_info.add(o3);
+ }
+ }
+ }
+ }
+
+ // After transfer is finished, the token can be removed
+ org.uddi.custody_v3.TransferToken apiTransferToken = body.getTransferToken();
+ String transferTokenId = new String(apiTransferToken.getOpaqueToken());
+ org.apache.juddi.model.TransferToken modelTransferToken = em.find(org.apache.juddi.model.TransferToken.class, transferTokenId);
+ em.remove(modelTransferToken);
+
+ tx.commit();
+ //TODO do we need to do something for replication purposes here?
+ //OperationalInfoWrapper t = new OperationalInfoWrapper();
+ //t.data = op_info;
+ //ReplicationNotifier.Enqueue(UDDIPublicationImpl.);
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(CustodyTransferQuery.TRANSFER_ENTITIES,
+ QueryStatus.SUCCESS, procTime);
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ }
+
+ public class OperationalInfoWrapper {
+
+ public List<OperationalInfo> data;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[07/28] juddi git commit: JUDDI-241 Adding additional changes
required by replication api. Not all tests pass on juddi api
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClerk.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClerk.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClerk.java
index 49956a8..3542c12 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClerk.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateClerk.java
@@ -86,10 +86,11 @@ public class ValidateClerk extends ValidateUDDIApi {
throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoName"));
//make sure node exists
- Object obj = em.find(org.apache.juddi.model.Node.class, nodeName);
+ //edit, doesn't matter if it doesn't exist, it'll be created on save of the clerk
+ /*Object obj = em.find(org.apache.juddi.model.Node.class, nodeName);
if (obj == null)
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.NodeNotFound", nodeName));
-
+*/
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
index c24f70d..ca560f1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
@@ -1509,7 +1509,6 @@ public class ValidatePublish extends ValidateUDDIApi {
}
for (int i = 0; i < elems.size(); i++) {
validateLang(elems.get(i).getLang());
- //TODO verify this is correct
validateURL(elems.get(i).getValue());
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index e5cbf43..460c94d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -111,4 +111,8 @@ public class ValidateReplication extends ValidateUDDIApi {
return false;
}
+ public void validateSetReplicationNodes(ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage {
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index c1bcbd2..18f7cfc 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -292,3 +292,4 @@ errors.replication.negativeLimit=The specified response limit is either 0 or a n
errors.replication.limitVectorNull=The high water mark vector limit specified OriginatingUSN is null or invalid
errors.replication.limitVectorNoNode=No node name was specified
errors.replication.configNodeNotFound=No specified node name is not currently registered as a node. Use the jUDDI Service API to register it. Node id:
+errors.replication.configNull=No replication config was present in the message
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
index 3f909a3..ef864c1 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_091_RMISubscriptionListenerIntegrationTest.java
@@ -91,7 +91,6 @@ public class API_091_RMISubscriptionListenerIntegrationTest
} catch (Exception e2) {
- // TODO Auto-generated catch block
e2.printStackTrace();
Assert.fail();
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
new file mode 100644
index 0000000..6cf0f2b
--- /dev/null
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2014 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.impl;
+
+import java.math.BigInteger;
+import java.rmi.RemoteException;
+import java.util.List;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.Registry;
+import org.apache.juddi.api_v3.Clerk;
+import org.apache.juddi.api_v3.ClerkList;
+import org.apache.juddi.api_v3.DeleteClerk;
+import org.apache.juddi.api_v3.DeleteNode;
+import org.apache.juddi.api_v3.Node;
+import org.apache.juddi.api_v3.NodeList;
+import org.apache.juddi.api_v3.SaveClerk;
+import org.apache.juddi.api_v3.SaveNode;
+import org.apache.juddi.replication.ReplicationNotifier;
+import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.v3.tck.TckPublisher;
+import org.apache.juddi.v3.tck.TckSecurity;
+import org.apache.juddi.v3.tck.TckTModel;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.DispositionReport;
+import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.repl_v3.ReplicationConfiguration;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+import org.uddi.v3_service.UDDIReplicationPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class API_160_ReplicationTest {
+
+ private static Log logger = LogFactory.getLog(API_141_JIRATest.class);
+ static UDDIReplicationPortType repl = new UDDIReplicationImpl();
+ static JUDDIApiImpl juddi = new JUDDIApiImpl();
+ static ReplicationNotifier notifier = null;
+ protected static String authInfoJoe = null;
+ protected static String authInfoMary = null;
+ protected static String authInfoSam = null;
+ protected static String authInfoRoot = null;
+ protected static String authInfoUDDI = null;
+
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ Registry.stop();
+ }
+
+ @BeforeClass
+ public static void startManager() throws ConfigurationException {
+ Registry.start();
+
+ try {
+
+ UDDISecurityPortType security = new UDDISecurityImpl();
+ authInfoRoot = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+
+ } catch (RemoteException e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
+
+ }
+
+ @Test
+ public void getPing() throws Exception {
+ String node = repl.doPing(new DoPing());
+ Assert.assertNotNull(node);
+ }
+
+ @Test
+ public void getGetHighWaterMarks() throws Exception {
+ List<ChangeRecordIDType> highWaterMarks = repl.getHighWaterMarks();
+
+ Assert.assertNotNull(highWaterMarks);
+ Assert.assertFalse(highWaterMarks.isEmpty());
+ for (int i = 0; i < highWaterMarks.size(); i++) {
+ Assert.assertNotNull(highWaterMarks.get(i).getNodeID());
+ //If the highest originatingUSN for a specific node within the registry is not known, then the responding node MUST return a highWaterMark for that node with an originatingUSN of 0 (zero).
+ Assert.assertNotNull(highWaterMarks.get(i).getOriginatingUSN());
+ Assert.assertTrue(highWaterMarks.get(i).getOriginatingUSN() >= 0);
+
+ /* if (highWaterMarks.get(i).getOriginatingUSN() > 0) {
+ List<ChangeRecord> changeRecords = repl.getChangeRecords("test", null, BigInteger.valueOf(highWaterMarks.get(i).getOriginatingUSN()), null);
+ Assert.assertNotNull(changeRecords);
+ Assert.assertFalse(changeRecords.isEmpty());
+
+ }*/
+ }
+ }
+
+ @Test(expected = FatalErrorException.class)
+ public void getChangeRecordsInvalid() throws DispositionReportFaultMessage, RemoteException {
+ List<ChangeRecordIDType> highWaterMarks = repl.getHighWaterMarks();
+
+ HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
+ highWaterMarkVectorType.getHighWaterMark().add(highWaterMarks.get(0));
+ List<ChangeRecord> changeRecords = repl.getChangeRecords("test", null, BigInteger.valueOf(highWaterMarks.get(0).getOriginatingUSN()), highWaterMarkVectorType);
+ Assert.fail("unexpected success");
+ }
+
+ /**
+ * add a clerk and node, delete the node, then try to access the clerk.
+ * it should have been deleted
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testAddClerkNodeThenDelete() throws Exception {
+ SaveClerk sc = new SaveClerk();
+ sc.setAuthInfo(authInfoRoot);
+ Clerk c = new Clerk();
+ c.setName("clerk1");
+
+ c.setPassword("pass");
+ c.setPublisher("username");
+ c.setNode(new Node());
+ c.getNode().setName("test_node");
+ c.getNode().setClientName("test_client");
+ c.getNode().setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+ c.getNode().setCustodyTransferUrl("http://localhost");
+ c.getNode().setDescription("http://localhost");
+ c.getNode().setInquiryUrl("http://localhost");
+ c.getNode().setPublishUrl("http://localhost");
+ c.getNode().setReplicationUrl("http://localhost");
+ c.getNode().setSecurityUrl("http://localhost");
+ c.getNode().setSubscriptionListenerUrl("http://localhost");
+ c.getNode().setSubscriptionUrl("http://localhost");
+
+ sc.getClerk().add(c);
+ juddi.saveClerk(sc);
+
+ juddi.deleteClerk(new DeleteClerk(authInfoRoot, "clerk1"));
+
+ ClerkList allNodes = juddi.getAllClerks(authInfoRoot);
+ boolean found = false;
+ for (int i = 0; i < allNodes.getClerk().size(); i++) {
+ if (allNodes.getClerk().get(i).getName().equals("clerk1")) {
+ found = true;
+ }
+
+ }
+ Assert.assertFalse(found);
+
+ NodeList allNodes1 = juddi.getAllNodes(authInfoRoot);
+ for (int i = 0; i < allNodes1.getNode().size(); i++) {
+ if (allNodes1.getNode().get(i).getName().equals("test_node")) {
+ return;
+ }
+ }
+ //TODO revise cascade deletes on nodes and clerks
+ Assert.fail("node unexpected deleted");
+ }
+
+ @Test
+ public void testAddClerkExistingNode() throws Exception {
+
+ SaveClerk sc = new SaveClerk();
+ sc.setAuthInfo(authInfoRoot);
+ Clerk c = new Clerk();
+ c.setName("clerk1");
+
+ c.setPassword("pass");
+ c.setPublisher("username");
+ c.setNode(new Node());
+ c.getNode().setName("test_node");
+ c.getNode().setClientName("test_client");
+ c.getNode().setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+ c.getNode().setCustodyTransferUrl("http://localhost");
+ c.getNode().setDescription("http://localhost");
+ c.getNode().setInquiryUrl("http://localhost");
+ c.getNode().setPublishUrl("http://localhost");
+ c.getNode().setReplicationUrl("http://localhost");
+ c.getNode().setSecurityUrl("http://localhost");
+ c.getNode().setSubscriptionListenerUrl("http://localhost");
+ c.getNode().setSubscriptionUrl("http://localhost");
+ sc.getClerk().add(c);
+
+ SaveNode saveNode = new SaveNode();
+ saveNode.setAuthInfo(authInfoRoot);
+ saveNode.getNode().add(c.getNode());
+
+ juddi.saveNode(saveNode);
+
+ juddi.saveClerk(sc);
+ //delete it
+ juddi.deleteClerk(new DeleteClerk(authInfoRoot, "clerk1"));
+
+ juddi.deleteNode(new DeleteNode(authInfoRoot, "test_node"));
+ //confirm it's gone
+ NodeList allNodes = juddi.getAllNodes(authInfoRoot);
+ boolean found = false;
+ for (int i = 0; i < allNodes.getNode().size(); i++) {
+ if (allNodes.getNode().get(i).getName().equals("test_node")) {
+ found = true;
+ }
+
+ }
+ Assert.assertFalse(found);
+ }
+
+ @Test
+ public void setReplicationConfig() throws Exception {
+
+ Node node = new Node();
+ node.setName("test_node");
+ node.setClientName("test_client");
+ node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
+ node.setCustodyTransferUrl("http://localhost");
+ node.setDescription("http://localhost");
+ node.setInquiryUrl("http://localhost");
+ node.setPublishUrl("http://localhost");
+ node.setReplicationUrl("http://localhost");
+ node.setSecurityUrl("http://localhost");
+ node.setSubscriptionListenerUrl("http://localhost");
+ node.setSubscriptionUrl("http://localhost");
+
+ SaveNode saveNode = new SaveNode();
+ saveNode.setAuthInfo(authInfoRoot);
+ saveNode.getNode().add(node);
+
+ juddi.saveNode(saveNode);
+
+ ReplicationConfiguration r = new ReplicationConfiguration();
+ r.setCommunicationGraph(new CommunicationGraph());
+ // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.getCommunicationGraph().getNode().add("test_node");
+
+ DispositionReport setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
+
+ ReplicationConfiguration replicationNodes = juddi.getReplicationNodes(authInfoRoot);
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph());
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph().getNode());
+ Assert.assertEquals("test_node", replicationNodes.getCommunicationGraph().getNode().get(0));
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToGetChanges());
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToSyncRegistry());
+ Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
+ Assert.assertNotNull(replicationNodes.getSerialNumber());
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java b/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
new file mode 100644
index 0000000..0931f76
--- /dev/null
+++ b/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014 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.replication;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.Registry;
+import org.apache.juddi.api.impl.API_141_JIRATest;
+import org.apache.juddi.api.impl.UDDIReplicationImpl;
+import org.apache.juddi.model.ChangeRecord;
+import org.junit.AfterClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.SaveBusiness;
+import org.uddi.v3_service.UDDIReplicationPortType;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class ReplicationNotifierTest {
+ private static Log logger = LogFactory.getLog(API_141_JIRATest.class);
+ static UDDIReplicationPortType repl = new UDDIReplicationImpl();
+ static ReplicationNotifier notifier = null;
+ protected static String authInfoJoe = null;
+ protected static String authInfoMary = null;
+ protected static String authInfoSam = null;
+ protected static String authInfoRoot = null;
+ protected static String authInfoUDDI = null;
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ Registry.stop();
+ }
+
+ @BeforeClass
+ public static void startManager() throws ConfigurationException {
+ Registry.start();
+ notifier = new ReplicationNotifier();
+
+ }
+
+
+
+ /**
+ * Test of getNewChangeRecord method, of class ReplicationNotifier.
+ */
+ @Test
+ public void testGetNewChangeRecord() throws Exception {
+ System.out.println("getNewChangeRecord");
+
+
+
+
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-tomcat/build.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index 1808d0e..1f23d6f 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -43,5 +43,57 @@
</fileset>
</chmod>
</target>
+
+
+ <!-- node 2 -->
+ <property name="lib2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/lib"/>
+ <property name="webapps2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps"/>
+ <property name="conf2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/conf"/>
+ <property name="endorsed2.dir" value="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/endorsed"/>
+
+ <target name="unzip-tomcat2">
+ <mkdir dir="${basedir}/target/tomcat2"/>
+ <unzip dest="${basedir}/target/tomcat2" src="${dependency.tomcat.zip}"/>
+ <unzip dest="${webapps.dir}/juddiv3" src="${dependency.juddiv3.war}"/>
+ <unzip dest="${webapps.dir}/juddi-gui" src="${dependency.juddi-gui.war}"/>
+ </target>
+
+ <target name="copy-resources2" depends="unzip-tomcat2">
+ <copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/" overwrite="true"/>
+
+ <copy file="${basedir}/juddi-cryptor.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/juddi-md5.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/juddi-cryptor.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+ <copy file="${basedir}/juddi-md5.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
+
+
+ <copy file="${basedir}/juddiv3Node2.xml" tofile="${webapps2.dir}/juddiv3/WEB-INF/classes/juddiv3.xml" overwrite="true"/>
+ <copy file="${basedir}/uddiNode2.xml" tofile="${webapps2.dir}/juddi-gui/WEB-INF/classes/META-INF/uddi.xml" overwrite="true"/>
+ <copy file="${basedir}/serverNode2.xml" tofile="${conf2.dir}/server.xml" overwrite="true"/>
+
+
+
+ <copy file="${basedir}/tomcat-users.xml" todir="${conf2.dir}" overwrite="true"/>
+ <copy file="${basedir}/context.xml" todir="${webapps2.dir}/juddiv3/META-INF" overwrite="true"/>
+ <copy file="${basedir}/keystore.jks" todir="${conf2.dir}" overwrite="true"/>
+
+ <copy file="${dependency.mysql.jar}" todir="${lib2.dir}"/>
+ <copy file="${dependency.postgres.jar}" todir="${lib2.dir}"/>
+ <copy file="${dependency.log4j.jar}" todir="${lib2.dir}"/>
+ <copy file="${dependency.derby.jar}" todir="${lib2.dir}"/>
+ <copy file="${dependency.commons-discovery.jar}" todir="${lib2.dir}"/>
+ <copy file="${dependency.jaxws.jar}" todir="${endorsed2.dir}"/>
+ </target>
+
+ <target name="package-tomcat2" depends="copy-resources2">
+ <chmod perm="ugo+x">
+ <fileset dir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+ </target>
</project>
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml b/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
new file mode 100644
index 0000000..6c8b682
--- /dev/null
+++ b/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
@@ -0,0 +1,668 @@
+<?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.
+ *
+ */ -->
+ <!--
+ This file contains the root business entity structure that represents your registry. The key chosen (or generated) for this entity will serve
+ as the node id for all entities published within the registry. The services contained within this business entity reflect the UDDI APIs that
+ you wish to support (adding or subtracting the services here will not enable/disable them, simply add/omit them from being discovered via UDDI).
+
+ The top-level business entity and sub-entities all use keys as unique identifiers. They are left blank by default which means the system will
+ generate a key (generated as root partition with GUID appended). You can choose to create your own, human-readable keys but they must match
+ the root key generator created in the root_tModelKeyGen.xml file. Matching means they must equal the root key generator with the keyword
+ "keygenerator" replaced by your own string.
+
+ Example:
+
+ root_tModelKeyGen.xml key is uddi:www.mycompany.com:registry:keygenerator
+
+ Legal user-defined keys are:
+
+ uddi:www.mycompany.com:registry:ubr-node (for the businessKey)
+ uddi:www.mycompany.com:registry:inquiry-service (for the inquiry service service key)
+ uddi:www.mycompany.com:registry:inquiry-service-wsdlDeployment (for the inquiry service binding template that represents the WSDL)
+
+
+See below for other fields that you may want to edit...
+-->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <!-- Change the name field to represent the name of your registry -->
+ <name xml:lang="en">An Apache jUDDI Node</name>
+ <!-- Change the description field to provided a brief description of your registry -->
+ <description xml:lang="en">This is a UDDI registry node as implemented by Apache jUDDI.</description>
+ <discoveryURLs>
+ <!-- This discovery URL should point to the home installation URL of jUDDI -->
+ <discoveryURL useType="homepage">${juddi.server.baseurl}</discoveryURL>
+ </discoveryURLs>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:nodes" keyValue="node" keyName="uddi.org:categorization:nodes"/>
+ </categoryBag>
+ <businessServices>
+ <!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
+ don't intend to support should be removed entirely -->
+ <!-- inquiry v3 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-inquiry" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Inquiry Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Inquiry API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiry-ws" serviceKey="uddi:another.juddi.apache.org:services-inquiry">
+ <description>UDDI Inquiry API V3</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/inquiry?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <defaultSortOrder>
+ uddi:uddi.org:sortorder:binarysort
+ </defaultSortOrder>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiry-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-inquiry">
+ <description>UDDI Inquiry API V3 SSL</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <defaultSortOrder>
+ uddi:uddi.org:sortorder:binarysort
+ </defaultSortOrder>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDIInquiryService"/>
+ </categoryBag>
+ </businessService>
+ <!-- inquiry v2 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-inquiryv2" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDIv2 Inquiry Service</name>
+ <description xml:lang="en">Web Service supporting UDDIv2 Inquiry API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiryv2-ws" serviceKey="uddi:another.juddi.apache.org:services-inquiryv2">
+ <description>UDDI Inquiry API V2</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/inquiryv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiryv2-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-inquiryv2">
+ <description>UDDI Inquiry API V3 SSL</description>
+ <!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
+ in this file. They all must point to their API's WSDL URL -->
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiryv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:inquiry_v2"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="Inquire"/>
+ </categoryBag>
+ </businessService>
+ <!-- inquiry v3 REST -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-inquiry-rest" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Inquiry REST Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiry-rest" serviceKey="uddi:another.juddi.apache.org:services-inquiry-rest">
+ <description>UDDI Inquiry API V3 REST</description>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:rest" />
+ </tModelInstanceDetails>
+ <accessPoint useType="wadlDeployment">${juddi.server.baseurl}/services/inquiryRest?_wadl</accessPoint>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-inquiry-rest-ssl" serviceKey="uddi:another.juddi.apache.org:services-inquiry-rest">
+ <description>UDDI Inquiry API V3 REST SSL</description>
+ <accessPoint useType="wadlDeployment">${juddi.server.baseurlsecure}/services/inquiryRest?_wadl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:rest" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="localhost"/>
+ <keyedReference tModelKey="uddi:uddi.org:wadl:types" keyName="uddi-org:wadl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="Servicename"/>
+ </categoryBag>
+ </businessService>
+ <!-- publish v3 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-publish" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Publish Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Publish API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publish-ws" serviceKey="uddi:another.juddi.apache.org:services-publish">
+ <description>UDDI Publication API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publish?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publish-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-publish">
+ <description>UDDI Publication API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publish?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_publication">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDIPublicationService"/>
+ </categoryBag>
+ </businessService>
+
+ <!-- publish v2 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-publishv2" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDIv2 Publish Service</name>
+ <description xml:lang="en">Web Service supporting UDDIv2 Publish API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publishv2-ws" serviceKey="uddi:another.juddi.apache.org:services-publishv2">
+ <description>UDDIv2 Publication API V2</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publishv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publishv2-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-publishv2">
+ <description>UDDI Publication API V2 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publishv2?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:inquiry_v2"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="Publish"/>
+ </categoryBag>
+ </businessService>
+
+ <!-- security v3 -->
+
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-security" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Security Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Security API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-security-ws" serviceKey="uddi:another.juddi.apache.org:services-security">
+ <description>UDDI Security API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/security?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-security-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-security">
+ <description>UDDI Security API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/security?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDISecurityService"/>
+ </categoryBag>
+ </businessService>
+ <!-- custody v3 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-custodytransfer" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-custodytransfer-ws" serviceKey="uddi:another.juddi.apache.org:services-custodytransfer">
+ <description>UDDI Custody and Ownership Transfer API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/custody-transfer?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer
+ xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-custodytransfer-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-custodytransfer">
+ <description>UDDI Custody and Ownership Transfer API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/custody-transfer?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_ownership_transfer">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer
+ xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDICustodyTransferService"/>
+ </categoryBag>
+ </businessService>
+
+ <!-- subscription v3 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-subscription" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Subscription Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Subscription API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-subscription-ws" serviceKey="uddi:another.juddi.apache.org:services-subscription">
+ <description>UDDI Subscription API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/subscription?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer
+ xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ <filterUsingFindAPI>supported</filterUsingFindAPI>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-subscription-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-subscription">
+ <description>UDDI Subscription API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscription">
+ <instanceDetails>
+ <instanceParms>
+ <![CDATA[
+ <?xml version="1.0" encoding="utf-8" ?>
+ <UDDIinstanceParmsContainer
+ xmlns="urn:uddi-org:policy_v3_instanceParms">
+ <authInfoUse>required</authInfoUse>
+ <filterUsingFindAPI>supported</filterUsingFindAPI>
+ </UDDIinstanceParmsContainer>
+ ]]>
+ </instanceParms>
+ </instanceDetails>
+ </tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDISubscriptionService"/>
+ </categoryBag>
+ </businessService>
+ <!-- subscription listener v3 -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-subscriptionlistener" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Subscription Listener Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-subscriptionlistener-ws" serviceKey="uddi:another.juddi.apache.org:services-subscriptionlistener">
+ <description>UDDI Subscription Listener API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/subscription-listener?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-subscriptionlistener-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-subscriptionlistener">
+ <description>UDDI Subscription Listener API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription-listener?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:uddi-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="UDDISubscriptionListenerService"/>
+ </categoryBag>
+ </businessService>
+
+
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-valueset" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Value Set API Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Value Set Validation service. This service provides tModel value validation and is
+ configured using the jUDDI Publisher Service</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-valueset-ws" serviceKey="uddi:another.juddi.apache.org:services-valueset">
+ <description>UDDI Value Set Validation API Version 3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/valueset-validation?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_valuesetvalidation" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-valueset-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-valueset">
+ <description>UDDI Value Set Validation API Version 3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/valueset-validation?wsdl</accessPoint>
+ <tModelInstanceDetails>
+
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_valuesetvalidation" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-valueset-cp" serviceKey="uddi:another.juddi.apache.org:services-valueset">
+ <description>UDDI Value Set Validation API Version 3 using InVM Classpath Transport. Use this endpoint for Value Set Validation when
+ located on the same instance of jUDDI.</description>
+ <accessPoint useType="classpath">classpath:/org.apache.juddi.api.impl.UDDIValueSetValidationImpl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:v3_valuesetvalidation" />
+ </tModelInstanceDetails>
+ </bindingTemplate>
+
+ </bindingTemplates>
+ </businessService>
+
+
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-valueset-cache" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Value Set Caching API Service</name>
+ <description xml:lang="en">Web Service supporting UDDI Value Set Caching service. This service provides tModel value validation and is
+ configured using the jUDDI Publisher Service</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-valueset-cache-ws" serviceKey="uddi:another.juddi.apache.org:services-valueset-cache">
+ <description>UDDI Value Set Caching API Version 3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/valueset-caching?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi-org:valueSetCaching_v3" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-valueset-cache-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-valueset-cache">
+ <description>UDDI Value Set caching API Version 3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/valueset-caching?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi-org:valueSetCaching_v3" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+
+
+
+
+
+ </categoryBag>
+ </bindingTemplate>
+
+ </bindingTemplates>
+ </businessService>
+
+
+
+
+
+ <businessService serviceKey="uddi:another.juddi.apache.org:replication" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">UDDI Replication API Version 3</name>
+ <description xml:lang="en">UDDI Replication API Version 3</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-replication-ws" serviceKey="uddi:another.juddi.apache.org:replication">
+ <description>UDDI Value Set Validation API Version 3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/replication?wsdl</accessPoint>
+
+ <tModelInstanceInfo
+ tModelKey="uddi:uddi.org:v3_replication" />
+ <tModelInstanceInfo
+ tModelKey="uddi:uddi.org:protocol:mutualauthenticatedssl3" />
+
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ </businessService>
+
+
+
+ <!-- juddi api service -->
+ <businessService serviceKey="uddi:another.juddi.apache.org:services-publisher" businessKey="uddi:another.juddi.apache.org:businesses-asf">
+ <name xml:lang="en">jUDDI Publisher Service</name>
+ <description xml:lang="en">Web Service supporting jUDDI specific API</description>
+ <bindingTemplates>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publisher-ws" serviceKey="uddi:another.juddi.apache.org:services-publisher">
+ <description>jUDDI Publisher Service API V3</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publisher?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ <bindingTemplate bindingKey="uddi:another.juddi.apache.org:servicebindings-publisher-ws-ssl" serviceKey="uddi:another.juddi.apache.org:services-publisher">
+ <description>jUDDI Publisher Service API V3 SSL</description>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publisher?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+ </tModelInstanceDetails>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </bindingTemplate>
+ </bindingTemplates>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:xml:namespace" keyName="uddi-org:xml:namespace" keyValue="urn:juddi-apache-org:v3_service"/>
+ <keyedReference tModelKey="uddi:uddi.org:wsdl:types" keyName="uddi-org:wsdl:types" keyValue="service"/>
+ <keyedReference tModelKey="uddi:uddi.org:xml:localname" keyName="uddi-org:xml:localName" keyValue="JUDDIApiService"/>
+ </categoryBag>
+ </businessService>
+ </businessServices>
+</businessEntity>
+
+
+
+
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-tomcat/juddi_install_data_node2/root_Publisher.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/root_Publisher.xml b/juddi-tomcat/juddi_install_data_node2/root_Publisher.xml
new file mode 100644
index 0000000..a5949f1
--- /dev/null
+++ b/juddi-tomcat/juddi_install_data_node2/root_Publisher.xml
@@ -0,0 +1,21 @@
+<?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.
+ *
+ */ -->
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="root">
+ <publisherName>root publisher</publisherName>
+ <isAdmin>true</isAdmin>
+</publisher>
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-tomcat/juddi_install_data_node2/root_tModelKeyGen.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/root_tModelKeyGen.xml b/juddi-tomcat/juddi_install_data_node2/root_tModelKeyGen.xml
new file mode 100644
index 0000000..3ae411a
--- /dev/null
+++ b/juddi-tomcat/juddi_install_data_node2/root_tModelKeyGen.xml
@@ -0,0 +1,40 @@
+<?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.
+ *
+ */ -->
+<!--
+ In this file, you only need to edit the tModelKey just below. This will determine your root partition; the base that all system-generated
+ keys will use. The keywords "uddi" and "keygenerator" must enclose the partition, but you are free to edit the interior. The general format
+ is a domain name followed by a colon-delimited list of keywords (known as key-specific strings).
+
+ Examples:
+
+ uddi:www.mycompany.com:registry:keygenerator
+ uddi:uddi.acme.com:keygenerator
+ uddi:engineering.umich.edu:soa:ubr:keygenerator
+ -->
+<tModel tModelKey="uddi:another.juddi.apache.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:keyGenerator</name>
+ <description>Root domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+</tModel>
http://git-wip-us.apache.org/repos/asf/juddi/blob/455149a9/juddi-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/pom.xml b/juddi-tomcat/pom.xml
index 52b3a2f..cf23952 100644
--- a/juddi-tomcat/pom.xml
+++ b/juddi-tomcat/pom.xml
@@ -139,6 +139,7 @@
<ant antfile="${basedir}/build.xml">
<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
<target name="package-tomcat" />
+ <target name="package-tomcat2" />
</ant>
</tasks>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[05/28] juddi git commit: JUDDI-241 working change journal NOJIRA
removing a number of unnecessary TODO statements
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
index 2e1fdbb..98c6c15 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
@@ -14,21 +14,53 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.api.impl;
import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.xml.bind.JAXB;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
import javax.xml.ws.Holder;
-
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api.util.PublicationQuery;
+import org.apache.juddi.api.util.QueryStatus;
+import org.apache.juddi.config.AppConfig;
+import org.apache.juddi.config.PersistenceManager;
+import org.apache.juddi.config.Property;
+import org.apache.juddi.mapping.MappingApiToModel;
+import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.BindingTemplate;
+import org.apache.juddi.model.BusinessEntity;
+import org.apache.juddi.model.BusinessService;
+import org.apache.juddi.model.ChangeRecord;
+import org.apache.juddi.model.Tmodel;
+import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.query.DeletePublisherAssertionByBusinessQuery;
+import org.apache.juddi.query.FetchBusinessEntitiesQuery;
+import org.apache.juddi.query.FetchTModelsQuery;
+import org.apache.juddi.query.FindBusinessByPublisherQuery;
+import org.apache.juddi.query.FindPublisherAssertionByBusinessQuery;
+import org.apache.juddi.query.FindTModelByPublisherQuery;
+import org.apache.juddi.query.TModelQuery;
+import org.apache.juddi.query.util.DynamicQuery;
+import org.apache.juddi.query.util.FindQualifiers;
+import org.apache.juddi.replication.ReplicationNotifier;
+import org.apache.juddi.v3.error.ErrorMessage;
+import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.validation.ValidatePublish;
import org.uddi.api_v3.AddPublisherAssertions;
import org.uddi.api_v3.AssertionStatusItem;
import org.uddi.api_v3.BindingDetail;
@@ -41,6 +73,8 @@ import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.DeleteTModel;
import org.uddi.api_v3.GetRegisteredInfo;
import org.uddi.api_v3.InfoSelection;
+import org.uddi.api_v3.ListDescription;
+import org.uddi.api_v3.OperationalInfo;
import org.uddi.api_v3.PublisherAssertion;
import org.uddi.api_v3.RegisteredInfo;
import org.uddi.api_v3.SaveBinding;
@@ -49,885 +83,1234 @@ import org.uddi.api_v3.SaveService;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.ServiceDetail;
import org.uddi.api_v3.TModelDetail;
+import org.uddi.repl_v3.ChangeRecordDelete;
+import org.uddi.repl_v3.ChangeRecordDeleteAssertion;
+import org.uddi.repl_v3.ChangeRecordHide;
+import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.ChangeRecordNewData;
+import org.uddi.repl_v3.ChangeRecordPublisherAssertion;
+import org.uddi.repl_v3.FromSignatures;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIPublicationPortType;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.mapping.MappingApiToModel;
-import org.apache.juddi.mapping.MappingModelToApi;
-import org.apache.juddi.v3.error.ErrorMessage;
-import org.apache.juddi.v3.error.FatalErrorException;
-import org.apache.juddi.validation.ValidatePublish;
-import org.apache.juddi.query.FetchBusinessEntitiesQuery;
-import org.apache.juddi.query.FetchTModelsQuery;
-import org.apache.juddi.query.FindBusinessByPublisherQuery;
-import org.apache.juddi.query.FindTModelByPublisherQuery;
-import org.apache.juddi.query.FindPublisherAssertionByBusinessQuery;
-import org.apache.juddi.query.DeletePublisherAssertionByBusinessQuery;
-import org.apache.juddi.query.TModelQuery;
-import org.apache.juddi.model.UddiEntityPublisher;
-import org.apache.juddi.api.util.PublicationQuery;
-import org.apache.juddi.api.util.QueryStatus;
-import org.apache.juddi.config.AppConfig;
-import org.apache.juddi.config.PersistenceManager;
-import org.apache.juddi.config.Property;
-import org.apache.juddi.query.util.DynamicQuery;
-import org.apache.juddi.query.util.FindQualifiers;
-import org.uddi.api_v3.ListDescription;
/**
* This class implements the UDDI Publication Service
+ *
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a> (and many others)
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a> added support for
+ * replication and several bug fixes
*/
-@WebService(serviceName="UDDIPublicationService",
- endpointInterface="org.uddi.v3_service.UDDIPublicationPortType",
- targetNamespace = "urn:uddi-org:v3_service")
+@WebService(serviceName = "UDDIPublicationService",
+ endpointInterface = "org.uddi.v3_service.UDDIPublicationPortType",
+ targetNamespace = "urn:uddi-org:v3_service")
public class UDDIPublicationImpl extends AuthenticatedService implements UDDIPublicationPortType {
private static Log log = LogFactory.getLog(UDDIInquiryImpl.class);
private UDDIServiceCounter serviceCounter;
-
+
+ private static DatatypeFactory df = null;
+
public UDDIPublicationImpl() {
- super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class);
- }
-
-
-
- public void addPublisherAssertions(AddPublisherAssertions body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateAddPublisherAssertions(em, body);
-
- List<org.uddi.api_v3.PublisherAssertion> apiPubAssertionList = body.getPublisherAssertion();
- for (org.uddi.api_v3.PublisherAssertion apiPubAssertion : apiPubAssertionList) {
-
- org.apache.juddi.model.PublisherAssertion modelPubAssertion = new org.apache.juddi.model.PublisherAssertion();
-
- MappingApiToModel.mapPublisherAssertion(apiPubAssertion, modelPubAssertion);
-
- org.apache.juddi.model.PublisherAssertion existingPubAssertion = em.find(modelPubAssertion.getClass(), modelPubAssertion.getId());
- boolean persistNewAssertion = true;
- if (existingPubAssertion != null) {
- if (modelPubAssertion.getTmodelKey().equalsIgnoreCase(existingPubAssertion.getTmodelKey()) &&
- modelPubAssertion.getKeyName().equalsIgnoreCase(existingPubAssertion.getKeyName()) &&
- modelPubAssertion.getKeyValue().equalsIgnoreCase(existingPubAssertion.getKeyValue())) {
- // This pub assertion is already been "asserted". Simply need to set the "check" value on the existing (and persistent) assertion
- if (publisher.isOwner(existingPubAssertion.getBusinessEntityByFromKey()))
- existingPubAssertion.setFromCheck("true");
- if (publisher.isOwner(existingPubAssertion.getBusinessEntityByToKey()))
- existingPubAssertion.setToCheck("true");
-
- persistNewAssertion = false;
- }
- else {
+ super();
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class);
+ if (df == null) {
+ try {
+ df = DatatypeFactory.newInstance();
+ } catch (DatatypeConfigurationException ex) {
+ logger.fatal(ex);
+ }
+ }
+ }
+
+ @Override
+ public void addPublisherAssertions(AddPublisherAssertions body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateAddPublisherAssertions(em, body);
+
+ List<org.uddi.api_v3.PublisherAssertion> apiPubAssertionList = body.getPublisherAssertion();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (org.uddi.api_v3.PublisherAssertion apiPubAssertion : apiPubAssertionList) {
+
+ org.apache.juddi.model.PublisherAssertion modelPubAssertion = new org.apache.juddi.model.PublisherAssertion();
+
+ MappingApiToModel.mapPublisherAssertion(apiPubAssertion, modelPubAssertion);
+
+ org.apache.juddi.model.PublisherAssertion existingPubAssertion = em.find(modelPubAssertion.getClass(), modelPubAssertion.getId());
+ boolean persistNewAssertion = true;
+ if (existingPubAssertion != null) {
+ if (modelPubAssertion.getTmodelKey().equalsIgnoreCase(existingPubAssertion.getTmodelKey())
+ && modelPubAssertion.getKeyName().equalsIgnoreCase(existingPubAssertion.getKeyName())
+ && modelPubAssertion.getKeyValue().equalsIgnoreCase(existingPubAssertion.getKeyValue())) {
+ // This pub assertion is already been "asserted". Simply need to set the "check" value on the existing (and persistent) assertion
+ if (publisher.isOwner(existingPubAssertion.getBusinessEntityByFromKey())) {
+ existingPubAssertion.setFromCheck("true");
+ }
+ if (publisher.isOwner(existingPubAssertion.getBusinessEntityByToKey())) {
+ existingPubAssertion.setToCheck("true");
+ }
+
+ persistNewAssertion = false;
+ } else {
// Otherwise, it is a new relationship between these entities. Remove the old one so the new one can be added.
- // TODO: the model only seems to allow one assertion per two business (primary key is fromKey and toKey). Spec seems to imply as
- // many relationships as desired (the differentiator would be the keyedRef values).
- em.remove(existingPubAssertion);
- }
- }
-
- if (persistNewAssertion) {
- org.apache.juddi.model.BusinessEntity beFrom = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getFromKey());
- org.apache.juddi.model.BusinessEntity beTo = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getToKey());
- modelPubAssertion.setBusinessEntityByFromKey(beFrom);
- modelPubAssertion.setBusinessEntityByToKey(beTo);
-
- modelPubAssertion.setFromCheck("false");
- modelPubAssertion.setToCheck("false");
-
- em.persist(modelPubAssertion);
-
- if (publisher.isOwner(modelPubAssertion.getBusinessEntityByFromKey()))
- modelPubAssertion.setFromCheck("true");
- if (publisher.isOwner(modelPubAssertion.getBusinessEntityByToKey()))
- modelPubAssertion.setToCheck("true");
- }
-
- }
-
- tx.commit();
+ // TODO: the model only seems to allow one assertion per two business (primary key is fromKey and toKey). Spec seems to imply as
+ // many relationships as desired (the differentiator would be the keyedRef values).
+ em.remove(existingPubAssertion);
+ }
+ }
+
+ if (persistNewAssertion) {
+ org.apache.juddi.model.BusinessEntity beFrom = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getFromKey());
+ org.apache.juddi.model.BusinessEntity beTo = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getToKey());
+ modelPubAssertion.setBusinessEntityByFromKey(beFrom);
+ modelPubAssertion.setBusinessEntityByToKey(beTo);
+
+ modelPubAssertion.setFromCheck("false");
+ modelPubAssertion.setToCheck("false");
+
+ if (publisher.isOwner(modelPubAssertion.getBusinessEntityByFromKey())) {
+ modelPubAssertion.setFromCheck("true");
+ }
+ if (publisher.isOwner(modelPubAssertion.getBusinessEntityByToKey())) {
+ modelPubAssertion.setToCheck("true");
+ }
+ modelPubAssertion.setModified(new Date());
+ em.persist(modelPubAssertion);
+
+ changes.add(getChangeRecord_NewAssertion(apiPubAssertion, modelPubAssertion, node));
+
+ }
+
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.ADD_PUBLISHERASSERTIONS,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.ADD_PUBLISHERASSERTIONS,
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.ADD_PUBLISHERASSERTIONS, QueryStatus.FAILED, procTime);
- throw drfm;
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.ADD_PUBLISHERASSERTIONS, QueryStatus.FAILED, procTime);
+ throw drfm;
} finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void deleteBinding(DeleteBinding body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateDeleteBinding(em, body);
-
- List<String> entityKeyList = body.getBindingKey();
- for (String entityKey : entityKeyList) {
- Object obj = em.find(org.apache.juddi.model.BindingTemplate.class, entityKey);
-
- ((org.apache.juddi.model.BindingTemplate)obj).getBusinessService().setModifiedIncludingChildren(new Date());
- // JUDDI-421: now the businessEntity parent will have it's modifiedIncludingChildren set
- ((org.apache.juddi.model.BindingTemplate)obj).getBusinessService().getBusinessEntity().setModifiedIncludingChildren(new Date());
-
- em.remove(obj);
- }
-
- tx.commit();
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public void deleteBinding(DeleteBinding body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateDeleteBinding(em, body);
+
+ List<String> entityKeyList = body.getBindingKey();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (String entityKey : entityKeyList) {
+ deleteBinding(entityKey, em);
+ changes.add(getChangeRecord_deleteBinding(entityKey, node));
+ }
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_BINDING,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_BINDING,
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_BINDING, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void deleteBusiness(DeleteBusiness body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateDeleteBusiness(em, body);
-
- List<String> entityKeyList = body.getBusinessKey();
- for (String entityKey : entityKeyList) {
- Object obj = em.find(org.apache.juddi.model.BusinessEntity.class, entityKey);
- em.remove(obj);
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_BUSINESS, QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_BINDING, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * deletes the referenced object, assuming authorization rules are
+ * already processed and there is already an open transaction
+ *
+ * @param entityKey
+ * @param em
+ * @throws DispositionReportFaultMessage
+ */
+ protected void deleteBinding(String entityKey, EntityManager em) throws DispositionReportFaultMessage {
+
+ Object obj = em.find(org.apache.juddi.model.BindingTemplate.class, entityKey);
+
+ ((org.apache.juddi.model.BindingTemplate) obj).getBusinessService().setModifiedIncludingChildren(new Date());
+ // JUDDI-421: now the businessEntity parent will have it's modifiedIncludingChildren set
+ ((org.apache.juddi.model.BindingTemplate) obj).getBusinessService().getBusinessEntity().setModifiedIncludingChildren(new Date());
+
+ em.remove(obj);
+
+ }
+
+ public void deleteBusiness(DeleteBusiness body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateDeleteBusiness(em, body);
+
+ List<String> entityKeyList = body.getBusinessKey();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (String entityKey : entityKeyList) {
+ deleteBusiness(entityKey, em);
+ changes.add(getChangeRecord_deleteBusiness(entityKey, node));
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.DELETE_BUSINESS, QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_BUSINESS, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void deletePublisherAssertions(DeletePublisherAssertions body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateDeletePublisherAssertions(em, body);
-
- List<org.uddi.api_v3.PublisherAssertion> entityList = body.getPublisherAssertion();
- for (org.uddi.api_v3.PublisherAssertion entity : entityList) {
- org.apache.juddi.model.PublisherAssertionId pubAssertionId = new org.apache.juddi.model.PublisherAssertionId(entity.getFromKey(), entity.getToKey());
- Object obj = em.find(org.apache.juddi.model.PublisherAssertion.class, pubAssertionId);
- em.remove(obj);
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_PUBLISHERASSERTIONS,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_BUSINESS, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * deletes the referenced object, assuming authorization rules are
+ * already processed and there is already an open transaction
+ *
+ * @param entityKey
+ * @param em
+ * @throws DispositionReportFaultMessage
+ */
+ protected void deleteBusiness(String key, EntityManager em) throws DispositionReportFaultMessage {
+ Object obj = em.find(org.apache.juddi.model.BusinessEntity.class, key);
+ em.remove(obj);
+ }
+
+ public void deletePublisherAssertions(DeletePublisherAssertions body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateDeletePublisherAssertions(em, body);
+
+ List<org.uddi.api_v3.PublisherAssertion> entityList = body.getPublisherAssertion();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (org.uddi.api_v3.PublisherAssertion entity : entityList) {
+ deletePublisherAssertion(entity, em);
+ changes.add(getChangeRecord_deletePublisherAssertion(entity, node));
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.DELETE_PUBLISHERASSERTIONS,
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_PUBLISHERASSERTIONS, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public void deleteService(DeleteService body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateDeleteService(em, body);
-
- List<String> entityKeyList = body.getServiceKey();
- for (String entityKey : entityKeyList) {
- Object obj = em.find(org.apache.juddi.model.BusinessService.class, entityKey);
-
- ((org.apache.juddi.model.BusinessService)obj).getBusinessEntity().setModifiedIncludingChildren(new Date());
-
- em.remove(obj);
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_SERVICE,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_PUBLISHERASSERTIONS, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * deletes the referenced object, assuming authorization rules are
+ * already processed and there is already an open transaction
+ *
+ * @param entityKey
+ * @param em
+ * @throws DispositionReportFaultMessage
+ */
+ protected void deletePublisherAssertion(org.uddi.api_v3.PublisherAssertion entity, EntityManager em) throws DispositionReportFaultMessage {
+ org.apache.juddi.model.PublisherAssertionId pubAssertionId = new org.apache.juddi.model.PublisherAssertionId(entity.getFromKey(), entity.getToKey());
+ Object obj = em.find(org.apache.juddi.model.PublisherAssertion.class, pubAssertionId);
+ em.remove(obj);
+ }
+
+ public void deleteService(DeleteService body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateDeleteService(em, body);
+
+ List<String> entityKeyList = body.getServiceKey();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (String entityKey : entityKeyList) {
+ deleteService(entityKey, em);
+ changes.add(getChangeRecord_deleteService(entityKey, node));
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.DELETE_SERVICE,
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_SERVICE, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public void deleteTModel(DeleteTModel body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateDeleteTModel(em, body);
-
- // tModels are only lazily deleted!
- List<String> entityKeyList = body.getTModelKey();
- for (String entityKey : entityKeyList) {
- Object obj = em.find(org.apache.juddi.model.Tmodel.class, entityKey);
- ((org.apache.juddi.model.Tmodel)obj).setDeleted(true);
-
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_TMODEL, QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_SERVICE, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * deletes the referenced object, assuming authorization rules are
+ * already processed and there is already an open transaction
+ *
+ * @param entityKey
+ * @param em
+ * @throws DispositionReportFaultMessage
+ */
+ protected void deleteService(String key, EntityManager em) throws DispositionReportFaultMessage {
+ Object obj = em.find(org.apache.juddi.model.BusinessService.class, key);
+ ((org.apache.juddi.model.BusinessService) obj).getBusinessEntity().setModifiedIncludingChildren(new Date());
+ em.remove(obj);
+ }
+
+ public void deleteTModel(DeleteTModel body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateDeleteTModel(em, body);
+
+ // tModels are only lazily deleted!
+ List<String> entityKeyList = body.getTModelKey();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (String entityKey : entityKeyList) {
+ deleteTModel(entityKey, em);
+ changes.add(getChangeRecord_deleteTModel(entityKey, node));
+ }
+
+ tx.commit();
+
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.DELETE_TMODEL, QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.DELETE_TMODEL, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public List<AssertionStatusItem> getAssertionStatusReport(String authInfo,
- CompletionStatus completionStatus)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
-
- List<org.uddi.api_v3.AssertionStatusItem> result = PublicationHelper.getAssertionStatusItemList(publisher, completionStatus, em);
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_ASSERTIONSTATUSREPORT,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.DELETE_TMODEL, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * deletes the referenced object, assuming authorization rules are
+ * already processed and there is already an open transaction
+ *
+ * @param entityKey
+ * @param em
+ * @throws DispositionReportFaultMessage
+ */
+ protected void deleteTModel(String key, EntityManager em) {
+ Object obj = em.find(org.apache.juddi.model.Tmodel.class, key);
+ ((org.apache.juddi.model.Tmodel) obj).setDeleted(true);
+ }
+
+ public List<AssertionStatusItem> getAssertionStatusReport(String authInfo,
+ CompletionStatus completionStatus)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
+
+ List<org.uddi.api_v3.AssertionStatusItem> result = PublicationHelper.getAssertionStatusItemList(publisher, completionStatus, em);
+
+ tx.commit();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.GET_ASSERTIONSTATUSREPORT,
+ QueryStatus.SUCCESS, procTime);
- return result;
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_ASSERTIONSTATUSREPORT, QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- public List<PublisherAssertion> getPublisherAssertions(String authInfo)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
-
- List<org.uddi.api_v3.PublisherAssertion> result = new ArrayList<org.uddi.api_v3.PublisherAssertion>(0);
-
- List<?> businessKeysFound = null;
- businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
-
- List<org.apache.juddi.model.PublisherAssertion> pubAssertionList = FindPublisherAssertionByBusinessQuery.select(em, businessKeysFound, null);
- if (pubAssertionList!=null)
- for(org.apache.juddi.model.PublisherAssertion modelPubAssertion : pubAssertionList) {
- org.uddi.api_v3.PublisherAssertion apiPubAssertion = new org.uddi.api_v3.PublisherAssertion();
-
- MappingModelToApi.mapPublisherAssertion(modelPubAssertion, apiPubAssertion);
-
- result.add(apiPubAssertion);
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_PUBLISHERASSERTIONS,
- QueryStatus.SUCCESS, procTime);
- return result;
+ serviceCounter.update(PublicationQuery.GET_ASSERTIONSTATUSREPORT, QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public List<PublisherAssertion> getPublisherAssertions(String authInfo)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
+
+ List<org.uddi.api_v3.PublisherAssertion> result = new ArrayList<org.uddi.api_v3.PublisherAssertion>(0);
+
+ List<?> businessKeysFound = null;
+ businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
+
+ List<org.apache.juddi.model.PublisherAssertion> pubAssertionList = FindPublisherAssertionByBusinessQuery.select(em, businessKeysFound, null);
+ if (pubAssertionList != null) {
+ for (org.apache.juddi.model.PublisherAssertion modelPubAssertion : pubAssertionList) {
+ org.uddi.api_v3.PublisherAssertion apiPubAssertion = new org.uddi.api_v3.PublisherAssertion();
+
+ MappingModelToApi.mapPublisherAssertion(modelPubAssertion, apiPubAssertion);
+
+ result.add(apiPubAssertion);
+ }
+ }
+
+ tx.commit();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.GET_PUBLISHERASSERTIONS,
+ QueryStatus.SUCCESS, procTime);
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_PUBLISHERASSERTIONS,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public RegisteredInfo getRegisteredInfo(GetRegisteredInfo body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
-
- new ValidatePublish(publisher).validateRegisteredInfo(body);
-
- List<?> businessKeysFound = null;
- businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
-
-
- List<?> tmodelKeysFound = null;
-
- if (body.getInfoSelection().equals(InfoSelection.HIDDEN))
- tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound, new DynamicQuery.Parameter(TModelQuery.ENTITY_ALIAS + ".deleted", Boolean.TRUE, DynamicQuery.PREDICATE_EQUALS));
- else if (body.getInfoSelection().equals(InfoSelection.VISIBLE))
- tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound, new DynamicQuery.Parameter(TModelQuery.ENTITY_ALIAS + ".deleted", Boolean.FALSE, DynamicQuery.PREDICATE_EQUALS));
- else
- tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound);
-
- RegisteredInfo result = new RegisteredInfo();
-
- // Sort and retrieve the final results
- List<?> queryResults = FetchBusinessEntitiesQuery.select(em, new FindQualifiers(), businessKeysFound, null, null, null);
- if (queryResults.size() > 0) {
- result.setBusinessInfos(new org.uddi.api_v3.BusinessInfos());
-
- for (Object item : queryResults) {
- org.apache.juddi.model.BusinessEntity modelBusinessEntity = (org.apache.juddi.model.BusinessEntity)item;
- org.uddi.api_v3.BusinessInfo apiBusinessInfo = new org.uddi.api_v3.BusinessInfo();
-
- MappingModelToApi.mapBusinessInfo(modelBusinessEntity, apiBusinessInfo);
-
- result.getBusinessInfos().getBusinessInfo().add(apiBusinessInfo);
- }
- }
-
- // Sort and retrieve the final results
- queryResults = FetchTModelsQuery.select(em, new FindQualifiers(), tmodelKeysFound, null, null, null);
- if (queryResults.size() > 0) {
- result.setTModelInfos(new org.uddi.api_v3.TModelInfos());
-
- for (Object item : queryResults) {
- org.apache.juddi.model.Tmodel modelTModel = (org.apache.juddi.model.Tmodel)item;
- org.uddi.api_v3.TModelInfo apiTModelInfo = new org.uddi.api_v3.TModelInfo();
-
- MappingModelToApi.mapTModelInfo(modelTModel, apiTModelInfo);
-
- result.getTModelInfos().getTModelInfo().add(apiTModelInfo);
- }
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_REGISTEREDINFO,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.GET_PUBLISHERASSERTIONS,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public RegisteredInfo getRegisteredInfo(GetRegisteredInfo body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+
+ new ValidatePublish(publisher).validateRegisteredInfo(body);
+
+ List<?> businessKeysFound = null;
+ businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
- return result;
+ List<?> tmodelKeysFound = null;
+
+ if (body.getInfoSelection().equals(InfoSelection.HIDDEN)) {
+ tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound, new DynamicQuery.Parameter(TModelQuery.ENTITY_ALIAS + ".deleted", Boolean.TRUE, DynamicQuery.PREDICATE_EQUALS));
+ } else if (body.getInfoSelection().equals(InfoSelection.VISIBLE)) {
+ tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound, new DynamicQuery.Parameter(TModelQuery.ENTITY_ALIAS + ".deleted", Boolean.FALSE, DynamicQuery.PREDICATE_EQUALS));
+ } else {
+ tmodelKeysFound = FindTModelByPublisherQuery.select(em, null, publisher, tmodelKeysFound);
+ }
+
+ RegisteredInfo result = new RegisteredInfo();
+
+ // Sort and retrieve the final results
+ List<?> queryResults = FetchBusinessEntitiesQuery.select(em, new FindQualifiers(), businessKeysFound, null, null, null);
+ if (queryResults.size() > 0) {
+ result.setBusinessInfos(new org.uddi.api_v3.BusinessInfos());
+
+ for (Object item : queryResults) {
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity = (org.apache.juddi.model.BusinessEntity) item;
+ org.uddi.api_v3.BusinessInfo apiBusinessInfo = new org.uddi.api_v3.BusinessInfo();
+
+ MappingModelToApi.mapBusinessInfo(modelBusinessEntity, apiBusinessInfo);
+
+ result.getBusinessInfos().getBusinessInfo().add(apiBusinessInfo);
+ }
+ }
+
+ // Sort and retrieve the final results
+ queryResults = FetchTModelsQuery.select(em, new FindQualifiers(), tmodelKeysFound, null, null, null);
+ if (queryResults.size() > 0) {
+ result.setTModelInfos(new org.uddi.api_v3.TModelInfos());
+
+ for (Object item : queryResults) {
+ org.apache.juddi.model.Tmodel modelTModel = (org.apache.juddi.model.Tmodel) item;
+ org.uddi.api_v3.TModelInfo apiTModelInfo = new org.uddi.api_v3.TModelInfo();
+
+ MappingModelToApi.mapTModelInfo(modelTModel, apiTModelInfo);
+
+ result.getTModelInfos().getTModelInfo().add(apiTModelInfo);
+ }
+ }
+
+ tx.commit();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.GET_REGISTEREDINFO,
+ QueryStatus.SUCCESS, procTime);
+
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.GET_REGISTEREDINFO,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public BindingDetail saveBinding(SaveBinding body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
- publisher.populateKeyGeneratorKeys(em);
- ValidatePublish validator = new ValidatePublish(publisher);
- validator.validateSaveBinding(em, body, null, publisher);
-
- BindingDetail result = new BindingDetail();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.GET_REGISTEREDINFO,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public BindingDetail saveBinding(SaveBinding body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+ publisher.populateKeyGeneratorKeys(em);
+ ValidatePublish validator = new ValidatePublish(publisher);
+ validator.validateSaveBinding(em, body, null, publisher);
+
+ BindingDetail result = new BindingDetail();
result.setListDescription(new ListDescription());
- List<org.uddi.api_v3.BindingTemplate> apiBindingTemplateList = body.getBindingTemplate();
- for (org.uddi.api_v3.BindingTemplate apiBindingTemplate : apiBindingTemplateList) {
-
- org.apache.juddi.model.BindingTemplate modelBindingTemplate = new org.apache.juddi.model.BindingTemplate();
-
- org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
- modelBusinessService.setEntityKey(apiBindingTemplate.getServiceKey());
-
- MappingApiToModel.mapBindingTemplate(apiBindingTemplate, modelBindingTemplate, modelBusinessService);
-
- setOperationalInfo(em, modelBindingTemplate, publisher, false);
-
- em.persist(modelBindingTemplate);
-
- result.getBindingTemplate().add(apiBindingTemplate);
- result.getListDescription().setActualCount(result.getListDescription().getActualCount()+1);
- result.getListDescription().setIncludeCount(result.getListDescription().getIncludeCount()+1);
- validator.validateSaveBindingMax(em, modelBindingTemplate.getBusinessService().getEntityKey());
- }
-
- tx.commit();
+ List<org.uddi.api_v3.BindingTemplate> apiBindingTemplateList = body.getBindingTemplate();
+ List<org.apache.juddi.model.ChangeRecord> changes = new ArrayList<ChangeRecord>();
+
+ for (org.uddi.api_v3.BindingTemplate apiBindingTemplate : apiBindingTemplateList) {
+
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate = new org.apache.juddi.model.BindingTemplate();
+
+ org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
+ modelBusinessService.setEntityKey(apiBindingTemplate.getServiceKey());
+
+ MappingApiToModel.mapBindingTemplate(apiBindingTemplate, modelBindingTemplate, modelBusinessService);
+
+ setOperationalInfo(em, modelBindingTemplate, publisher, false);
+
+ em.persist(modelBindingTemplate);
+
+ result.getBindingTemplate().add(apiBindingTemplate);
+ result.getListDescription().setActualCount(result.getListDescription().getActualCount() + 1);
+ result.getListDescription().setIncludeCount(result.getListDescription().getIncludeCount() + 1);
+ validator.validateSaveBindingMax(em, modelBindingTemplate.getBusinessService().getEntityKey());
+ changes.add(getChangeRecord(modelBindingTemplate, apiBindingTemplate, node));
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_BINDING,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.SAVE_BINDING,
+ QueryStatus.SUCCESS, procTime);
- return result;
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_BINDING,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public BusinessDetail saveBusiness(SaveBusiness body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
- if (!body.getBusinessEntity().isEmpty()) {
- log.debug("Inbound save business request for key " + body.getBusinessEntity().get(0).getBusinessKey());
- }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.SAVE_BINDING,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public BusinessDetail saveBusiness(SaveBusiness body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+ if (!body.getBusinessEntity().isEmpty()) {
+ log.debug("Inbound save business request for key " + body.getBusinessEntity().get(0).getBusinessKey());
+ }
EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
- publisher.populateKeyGeneratorKeys(em);
- ValidatePublish validator = new ValidatePublish(publisher);
- validator.validateSaveBusiness(em, body, null, publisher);
-
- BusinessDetail result = new BusinessDetail();
-
- List<org.uddi.api_v3.BusinessEntity> apiBusinessEntityList = body.getBusinessEntity();
- for (org.uddi.api_v3.BusinessEntity apiBusinessEntity : apiBusinessEntityList) {
-
- org.apache.juddi.model.BusinessEntity modelBusinessEntity = new org.apache.juddi.model.BusinessEntity();
-
- MappingApiToModel.mapBusinessEntity(apiBusinessEntity, modelBusinessEntity);
-
- setOperationalInfo(em, modelBusinessEntity, publisher);
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+ publisher.populateKeyGeneratorKeys(em);
+ ValidatePublish validator = new ValidatePublish(publisher);
+ validator.validateSaveBusiness(em, body, null, publisher);
+
+ BusinessDetail result = new BusinessDetail();
+
+ List<org.uddi.api_v3.BusinessEntity> apiBusinessEntityList = body.getBusinessEntity();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+
+ for (org.uddi.api_v3.BusinessEntity apiBusinessEntity : apiBusinessEntityList) {
+
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity = new org.apache.juddi.model.BusinessEntity();
+
+ MappingApiToModel.mapBusinessEntity(apiBusinessEntity, modelBusinessEntity);
+
+ setOperationalInfo(em, modelBusinessEntity, publisher);
log.debug("Saving business " + modelBusinessEntity.getEntityKey());
-
- em.persist(modelBusinessEntity);
-
- result.getBusinessEntity().add(apiBusinessEntity);
- }
-
- //check how many business this publisher owns.
- validator.validateSaveBusinessMax(em);
-
- tx.commit();
+
+ em.persist(modelBusinessEntity);
+ changes.add(getChangeRecord(modelBusinessEntity, apiBusinessEntity, node));
+ result.getBusinessEntity().add(apiBusinessEntity);
+ }
+
+ //check how many business this publisher owns.
+ validator.validateSaveBusinessMax(em);
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_BUSINESS,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.SAVE_BUSINESS,
+ QueryStatus.SUCCESS, procTime);
- return result;
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_BUSINESS,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } catch (Exception ex){
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.SAVE_BUSINESS,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } catch (Exception ex) {
StringWriter sw = new StringWriter();
- if (body!=null)
- JAXB.marshal(body, sw);
- log.fatal("unexpected error!" + sw.toString(), ex);
- throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
+ if (body != null) {
+ JAXB.marshal(body, sw);
+ }
+ log.fatal("unexpected error!" + sw.toString(), ex);
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
} finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public ServiceDetail saveService(SaveService body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
- publisher.populateKeyGeneratorKeys(em);
- ValidatePublish validator = new ValidatePublish(publisher);
- validator.validateSaveService(em, body, null, publisher);
-
- ServiceDetail result = new ServiceDetail();
-
- List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = body.getBusinessService();
- for (org.uddi.api_v3.BusinessService apiBusinessService : apiBusinessServiceList) {
-
- org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
- org.apache.juddi.model.BusinessEntity modelBusinessEntity = new org.apache.juddi.model.BusinessEntity();
- modelBusinessEntity.setEntityKey(apiBusinessService.getBusinessKey());
-
- MappingApiToModel.mapBusinessService(apiBusinessService, modelBusinessService, modelBusinessEntity);
-
- setOperationalInfo(em, modelBusinessService, publisher, false);
-
- em.persist(modelBusinessService);
-
- result.getBusinessService().add(apiBusinessService);
-
- validator.validateSaveServiceMax(em, modelBusinessService.getBusinessEntity().getEntityKey());
- }
-
-
- tx.commit();
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public ServiceDetail saveService(SaveService body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+ publisher.populateKeyGeneratorKeys(em);
+ ValidatePublish validator = new ValidatePublish(publisher);
+ validator.validateSaveService(em, body, null, publisher);
+
+ ServiceDetail result = new ServiceDetail();
+
+ List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = body.getBusinessService();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (org.uddi.api_v3.BusinessService apiBusinessService : apiBusinessServiceList) {
+
+ org.apache.juddi.model.BusinessService modelBusinessService = new org.apache.juddi.model.BusinessService();
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity = new org.apache.juddi.model.BusinessEntity();
+ modelBusinessEntity.setEntityKey(apiBusinessService.getBusinessKey());
+
+ MappingApiToModel.mapBusinessService(apiBusinessService, modelBusinessService, modelBusinessEntity);
+
+ setOperationalInfo(em, modelBusinessService, publisher, false);
+
+ em.persist(modelBusinessService);
+
+ result.getBusinessService().add(apiBusinessService);
+ changes.add(getChangeRecord(modelBusinessService, apiBusinessService, node));
+ validator.validateSaveServiceMax(em, modelBusinessService.getBusinessEntity().getEntityKey());
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_SERVICE,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.SAVE_SERVICE,
+ QueryStatus.SUCCESS, procTime);
- return result;
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_SERVICE,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public TModelDetail saveTModel(SaveTModel body)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
- publisher.populateKeyGeneratorKeys(em);
- new ValidatePublish(publisher).validateSaveTModel(em, body, null, publisher);
-
- TModelDetail result = new TModelDetail();
-
- List<org.uddi.api_v3.TModel> apiTModelList = body.getTModel();
- for (org.uddi.api_v3.TModel apiTModel : apiTModelList) {
-
- org.apache.juddi.model.Tmodel modelTModel = new org.apache.juddi.model.Tmodel();
-
- MappingApiToModel.mapTModel(apiTModel, modelTModel);
-
- setOperationalInfo(em, modelTModel, publisher);
-
- em.persist(modelTModel);
-
- result.getTModel().add(apiTModel);
-
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_TMODEL,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.SAVE_SERVICE,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ public TModelDetail saveTModel(SaveTModel body)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, body.getAuthInfo());
+ publisher.populateKeyGeneratorKeys(em);
+ new ValidatePublish(publisher).validateSaveTModel(em, body, null, publisher);
+
+ TModelDetail result = new TModelDetail();
+
+ List<org.uddi.api_v3.TModel> apiTModelList = body.getTModel();
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (org.uddi.api_v3.TModel apiTModel : apiTModelList) {
+
+ org.apache.juddi.model.Tmodel modelTModel = new org.apache.juddi.model.Tmodel();
+
+ MappingApiToModel.mapTModel(apiTModel, modelTModel);
+
+ setOperationalInfo(em, modelTModel, publisher);
+
+ em.persist(modelTModel);
+
+ result.getTModel().add(apiTModel);
+ changes.add(getChangeRecord(modelTModel, apiTModel, node));
+
+ }
+
+ tx.commit();
+ for (int i = 0; i < changes.size(); i++) {
+ ReplicationNotifier.Enqueue(changes.get(i));
+ }
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.SAVE_TMODEL,
+ QueryStatus.SUCCESS, procTime);
- return result;
+ return result;
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SAVE_TMODEL,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
-
- public void setPublisherAssertions(String authInfo,
- Holder<List<PublisherAssertion>> publisherAssertion)
- throws DispositionReportFaultMessage {
- long startTime = System.currentTimeMillis();
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
-
- UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
-
- new ValidatePublish(publisher).validateSetPublisherAssertions(em, publisherAssertion);
-
- List<?> businessKeysFound = null;
- businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
-
- // First, wipe out all previous assertions associated with this publisher
- DeletePublisherAssertionByBusinessQuery.delete(em, businessKeysFound);
-
- // Slate is clean for all assertions involving this publisher, now we simply need to add the new ones (and they will all be "new").
- List<org.uddi.api_v3.PublisherAssertion> apiPubAssertionList = publisherAssertion.value;
- for (org.uddi.api_v3.PublisherAssertion apiPubAssertion : apiPubAssertionList) {
-
- org.apache.juddi.model.PublisherAssertion modelPubAssertion = new org.apache.juddi.model.PublisherAssertion();
-
- MappingApiToModel.mapPublisherAssertion(apiPubAssertion, modelPubAssertion);
-
- org.apache.juddi.model.BusinessEntity beFrom = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getFromKey());
- org.apache.juddi.model.BusinessEntity beTo = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getToKey());
- modelPubAssertion.setBusinessEntityByFromKey(beFrom);
- modelPubAssertion.setBusinessEntityByToKey(beTo);
-
- modelPubAssertion.setFromCheck("false");
- modelPubAssertion.setToCheck("false");
-
- em.persist(modelPubAssertion);
-
- if (publisher.isOwner(modelPubAssertion.getBusinessEntityByFromKey()))
- modelPubAssertion.setFromCheck("true");
- if (publisher.isOwner(modelPubAssertion.getBusinessEntityByToKey()))
- modelPubAssertion.setToCheck("true");
-
- }
-
- tx.commit();
long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SET_PUBLISHERASSERTIONS,
- QueryStatus.SUCCESS, procTime);
+ serviceCounter.update(PublicationQuery.SAVE_TMODEL,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ @Override
+ public void setPublisherAssertions(String authInfo,
+ Holder<List<PublisherAssertion>> publisherAssertion)
+ throws DispositionReportFaultMessage {
+ long startTime = System.currentTimeMillis();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+
+ UddiEntityPublisher publisher = this.getEntityPublisher(em, authInfo);
+
+ new ValidatePublish(publisher).validateSetPublisherAssertions(em, publisherAssertion);
+
+ List<?> businessKeysFound = null;
+ businessKeysFound = FindBusinessByPublisherQuery.select(em, null, publisher, businessKeysFound);
+
+ //TODO this has to be reworked to record what was deleted.
+
+ // First, wipe out all previous assertions associated with this publisher
+ DeletePublisherAssertionByBusinessQuery.delete(em, businessKeysFound);
+
+ // Slate is clean for all assertions involving this publisher, now we simply need to add the new ones (and they will all be "new").
+ List<org.uddi.api_v3.PublisherAssertion> apiPubAssertionList = publisherAssertion.value;
+
+ List<ChangeRecord> changes = new ArrayList<ChangeRecord>();
+ for (org.uddi.api_v3.PublisherAssertion apiPubAssertion : apiPubAssertionList) {
+
+ org.apache.juddi.model.PublisherAssertion modelPubAssertion = new org.apache.juddi.model.PublisherAssertion();
+
+ MappingApiToModel.mapPublisherAssertion(apiPubAssertion, modelPubAssertion);
+
+ org.apache.juddi.model.BusinessEntity beFrom = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getFromKey());
+ org.apache.juddi.model.BusinessEntity beTo = em.find(org.apache.juddi.model.BusinessEntity.class, modelPubAssertion.getId().getToKey());
+ modelPubAssertion.setBusinessEntityByFromKey(beFrom);
+ modelPubAssertion.setBusinessEntityByToKey(beTo);
+
+ modelPubAssertion.setFromCheck("false");
+ modelPubAssertion.setToCheck("false");
+
+
+ if (publisher.isOwner(modelPubAssertion.getBusinessEntityByFromKey())) {
+ modelPubAssertion.setFromCheck("true");
+ }
+ if (publisher.isOwner(modelPubAssertion.getBusinessEntityByToKey())) {
+ modelPubAssertion.setToCheck("true");
+ }
+ em.persist(modelPubAssertion);
+
+
+ changes.add(getChangeRecord_NewAssertion(apiPubAssertion, modelPubAssertion, node));
+
+ }
+
+ tx.commit();
+ for (int i=0; i < changes.size(); i++)
+ ReplicationNotifier.Enqueue(changes.get(i));
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.SET_PUBLISHERASSERTIONS,
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(PublicationQuery.SET_PUBLISHERASSERTIONS,
- QueryStatus.FAILED, procTime);
- throw drfm;
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
-
- private void setOperationalInfo(EntityManager em, org.apache.juddi.model.BusinessEntity uddiEntity, UddiEntityPublisher publisher) throws DispositionReportFaultMessage {
-
- uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
-
- Date now = new Date();
- uddiEntity.setModified(now);
- uddiEntity.setModifiedIncludingChildren(now);
-
- String nodeId = "";
- try
- { nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID); }
- catch (ConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID)); }
- uddiEntity.setNodeId(nodeId);
-
- org.apache.juddi.model.BusinessEntity existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
- if (existingUddiEntity != null)
- uddiEntity.setCreated(existingUddiEntity.getCreated());
- else
- uddiEntity.setCreated(now);
-
- List<org.apache.juddi.model.BusinessService> serviceList = uddiEntity.getBusinessServices();
- for (org.apache.juddi.model.BusinessService service : serviceList)
- setOperationalInfo(em, service, publisher, true);
-
-
- if (existingUddiEntity != null)
- em.remove(existingUddiEntity);
-
- }
-
- private void setOperationalInfo(EntityManager em, org.apache.juddi.model.BusinessService uddiEntity, UddiEntityPublisher publisher, boolean isChild) throws DispositionReportFaultMessage {
-
- uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
-
- Date now = new Date();
- uddiEntity.setModified(now);
- uddiEntity.setModifiedIncludingChildren(now);
-
- if(!isChild) {
- org.apache.juddi.model.BusinessEntity parent = em.find(org.apache.juddi.model.BusinessEntity.class, uddiEntity.getBusinessEntity().getEntityKey());
- parent.setModifiedIncludingChildren(now);
- em.persist(parent);
- }
-
- String nodeId = "";
- try
- { nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID); }
- catch (ConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID)); }
- uddiEntity.setNodeId(nodeId);
-
- org.apache.juddi.model.BusinessService existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
- if (existingUddiEntity != null) {
- uddiEntity.setCreated(existingUddiEntity.getCreated());
- }
- else
- uddiEntity.setCreated(now);
-
- List<org.apache.juddi.model.BindingTemplate> bindingList = uddiEntity.getBindingTemplates();
- for (org.apache.juddi.model.BindingTemplate binding : bindingList)
- setOperationalInfo(em, binding, publisher, true);
-
-
- if (existingUddiEntity != null)
- em.remove(existingUddiEntity);
-
- }
-
- private void setOperationalInfo(EntityManager em, org.apache.juddi.model.BindingTemplate uddiEntity, UddiEntityPublisher publisher, boolean isChild) throws DispositionReportFaultMessage {
-
- uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
-
- Date now = new Date();
- uddiEntity.setModified(now);
- uddiEntity.setModifiedIncludingChildren(now);
-
- if(!isChild) {
- org.apache.juddi.model.BusinessService parent = em.find(org.apache.juddi.model.BusinessService.class, uddiEntity.getBusinessService().getEntityKey());
- parent.setModifiedIncludingChildren(now);
- em.persist(parent);
-
- // JUDDI-421: now the businessEntity parent will have it's modifiedIncludingChildren set
- org.apache.juddi.model.BusinessEntity businessParent = em.find(org.apache.juddi.model.BusinessEntity.class, parent.getBusinessEntity().getEntityKey());
- businessParent.setModifiedIncludingChildren(now);
- em.persist(businessParent);
- }
-
- String nodeId = "";
- try
- { nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID); }
- catch (ConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID)); }
- uddiEntity.setNodeId(nodeId);
-
- org.apache.juddi.model.BindingTemplate existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
- if (existingUddiEntity != null)
- uddiEntity.setCreated(existingUddiEntity.getCreated());
- else
- uddiEntity.setCreated(now);
-
- if (existingUddiEntity != null)
- em.remove(existingUddiEntity);
-
- }
-
- private void setOperationalInfo(EntityManager em, org.apache.juddi.model.Tmodel uddiEntity, UddiEntityPublisher publisher) throws DispositionReportFaultMessage {
-
- uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
-
- Date now = new Date();
- uddiEntity.setModified(now);
- uddiEntity.setModifiedIncludingChildren(now);
-
- String nodeId = "";
- try
- { nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID); }
- catch (ConfigurationException ce)
- { throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID)); }
- uddiEntity.setNodeId(nodeId);
-
- org.apache.juddi.model.Tmodel existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
- if (existingUddiEntity != null)
- uddiEntity.setCreated(existingUddiEntity.getCreated());
- else
- uddiEntity.setCreated(now);
-
- if (existingUddiEntity != null)
- em.remove(existingUddiEntity);
-
- }
-
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(PublicationQuery.SET_PUBLISHERASSERTIONS,
+ QueryStatus.FAILED, procTime);
+ throw drfm;
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ private void setOperationalInfo(EntityManager em, org.apache.juddi.model.BusinessEntity uddiEntity, UddiEntityPublisher publisher) throws DispositionReportFaultMessage {
+
+ uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
+
+ Date now = new Date();
+ uddiEntity.setModified(now);
+ uddiEntity.setModifiedIncludingChildren(now);
+
+ String nodeId = "";
+ try {
+ nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ce) {
+ throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID));
+ }
+ uddiEntity.setNodeId(nodeId);
+
+ org.apache.juddi.model.BusinessEntity existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
+ if (existingUddiEntity != null) {
+ uddiEntity.setCreated(existingUddiEntity.getCreated());
+ } else {
+ uddiEntity.setCreated(now);
+ }
+
+ List<org.apache.juddi.model.BusinessService> serviceList = uddiEntity.getBusinessServices();
+ for (org.apache.juddi.model.BusinessService service : serviceList) {
+ setOperationalInfo(em, service, publisher, true);
+ }
+
+ if (existingUddiEntity != null) {
+ em.remove(existingUddiEntity);
+ }
+
+ }
+
+ private void setOperationalInfo(EntityManager em, org.apache.juddi.model.BusinessService uddiEntity, UddiEntityPublisher publisher, boolean isChild) throws DispositionReportFaultMessage {
+
+ uddiEntity.setAuthorizedName(publisher.getAuthorizedName());
+
+ Date now = new Date();
+ uddiEntity.setModified(now);
+ uddiEntity.setModifiedIncludingChildren(now);
+
+ if (!isChild) {
+ org.apache.juddi.model.BusinessEntity parent = em.find(org.apache.juddi.model.BusinessEntity.class, uddiEntity.getBusinessEntity().getEntityKey());
+ parent.setModifiedIncludingChildren(now);
+ em.persist(parent);
+ }
+
+ String nodeId = "";
+ try {
+ nodeId = AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ID);
+ } catch (ConfigurationException ce) {
+ throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval", Property.JUDDI_NODE_ID));
+ }
+ uddiEntity.setNodeId(nodeId);
+
+ org.apache.juddi.model.BusinessService existingUddiEntity = em.find(uddiEntity.getClass(), uddiEntity.getEntityKey());
+ if (existingUddiEntity != null) {
+ uddiEntity.setCreated(existingUddiEntity.getCreated());
+ } else {
+ uddiEntity.setCreated(now);
+ }
+
+ List<org.apache.juddi.model.BindingTemplate> bindingList = uddiEntity.getBindingTemplates();
+
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[16/28] juddi git commit: JUDDI-241 get/set replication cfg now works
for all sub elements. notify changes works,
however getChangeRecords fails when called from within the tomcat container.
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index b42cf81..83a1492 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -38,6 +38,7 @@ import org.apache.juddi.model.CanonicalizationMethod;
import org.apache.juddi.model.Contact;
import org.apache.juddi.model.ControlMessage;
import org.apache.juddi.model.Edge;
+import org.apache.juddi.model.EdgeReceiverAlternate;
import org.apache.juddi.model.KeyDataValue;
import org.apache.juddi.model.KeyInfo;
import org.apache.juddi.model.Node;
@@ -45,6 +46,7 @@ import org.apache.juddi.model.Operator;
import org.apache.juddi.model.OperatorStatusType;
import org.apache.juddi.model.Publisher;
import org.apache.juddi.model.Reference;
+import org.apache.juddi.model.ReplicationConfigurationNode;
import org.apache.juddi.model.Signature;
import org.apache.juddi.model.SignatureMethod;
import org.apache.juddi.model.SignatureTransform;
@@ -102,8 +104,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisher(org.apache.juddi.api_v3.Publisher apiPublisher,
- org.apache.juddi.model.Publisher modelPublisher)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Publisher modelPublisher)
+ throws DispositionReportFaultMessage {
modelPublisher.setAuthorizedName(apiPublisher.getAuthorizedName());
modelPublisher.setPublisherName(apiPublisher.getPublisherName());
modelPublisher.setEmailAddress(apiPublisher.getEmailAddress());
@@ -123,8 +125,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessEntity(org.uddi.api_v3.BusinessEntity apiBusinessEntity,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessEntity.setEntityKey(apiBusinessEntity.getBusinessKey());
@@ -139,15 +141,15 @@ public class MappingApiToModel {
}
mapBusinessServices(apiBusinessEntity.getBusinessServices(),
- modelBusinessEntity.getBusinessServices(),
- modelBusinessEntity.getServiceProjections(),
- modelBusinessEntity);
+ modelBusinessEntity.getBusinessServices(),
+ modelBusinessEntity.getServiceProjections(),
+ modelBusinessEntity);
mapBusinessSignature(apiBusinessEntity.getSignature(), modelBusinessEntity);
}
private static List<Signature> mapApiSignaturesToModelSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = new ArrayList<Signature>();
modelSignatures.clear();
for (org.w3._2000._09.xmldsig_.SignatureType signatureType : apiSignatures) {
@@ -243,7 +245,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessServiceSignature(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBusinessService(modelBusinessService);
@@ -258,7 +260,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTmodelSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, Tmodel modelTmodel)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setTmodel(modelTmodel);
@@ -273,7 +275,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplateSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBindingTemplate(modelBindingTemplate);
@@ -288,7 +290,7 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisherSignatures(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures, Publisher modelPublisher)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setPublisher(modelPublisher);
@@ -303,8 +305,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessSignature(List<org.w3._2000._09.xmldsig_.SignatureType> apiSignatures,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
List<Signature> modelSignatures = mapApiSignaturesToModelSignatures(apiSignatures);
for (Signature modelSignature : modelSignatures) {
modelSignature.setBusinessEntity(modelBusinessEntity);
@@ -320,9 +322,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessNames(List<org.uddi.api_v3.Name> apiNameList,
- List<org.apache.juddi.model.BusinessName> modelNameList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessName> modelNameList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelNameList.clear();
for (org.uddi.api_v3.Name apiName : apiNameList) {
@@ -338,9 +340,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.BusinessDescr> modelDescList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessDescr> modelDescList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -356,9 +358,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapDiscoveryUrls(org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
- List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelDiscUrlList.clear();
if (apiDiscUrls != null) {
@@ -377,9 +379,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContacts(org.uddi.api_v3.Contacts apiContacts,
- List<org.apache.juddi.model.Contact> modelContactList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Contact> modelContactList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelContactList.clear();
if (apiContacts != null) {
@@ -408,10 +410,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.ContactDescr> modelDescList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ContactDescr> modelDescList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -428,10 +430,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPersonNames(List<org.uddi.api_v3.PersonName> apiPersonNameList,
- List<org.apache.juddi.model.PersonName> modelPersonNameList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.PersonName> modelPersonNameList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelPersonNameList.clear();
for (org.uddi.api_v3.PersonName apiPersonName : apiPersonNameList) {
@@ -448,10 +450,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactEmails(List<org.uddi.api_v3.Email> apiEmailList,
- List<org.apache.juddi.model.Email> modelEmailList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Email> modelEmailList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelEmailList.clear();
for (org.uddi.api_v3.Email apiEmail : apiEmailList) {
@@ -468,10 +470,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactPhones(List<org.uddi.api_v3.Phone> apiPhoneList,
- List<org.apache.juddi.model.Phone> modelPhoneList,
- org.apache.juddi.model.Contact modelContact,
- String businessKey)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.Phone> modelPhoneList,
+ org.apache.juddi.model.Contact modelContact,
+ String businessKey)
+ throws DispositionReportFaultMessage {
modelPhoneList.clear();
for (org.uddi.api_v3.Phone apiPhone : apiPhoneList) {
@@ -488,10 +490,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapContactAddresses(List<org.uddi.api_v3.Address> apiAddressList,
- List<org.apache.juddi.model.Address> modelAddressList,
- org.apache.juddi.model.Contact modelContact
+ List<org.apache.juddi.model.Address> modelAddressList,
+ org.apache.juddi.model.Contact modelContact
)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
modelAddressList.clear();
for (org.uddi.api_v3.Address apiAddress : apiAddressList) {
@@ -516,10 +518,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapAddressLines(List<org.uddi.api_v3.AddressLine> apiAddressLineList,
- List<org.apache.juddi.model.AddressLine> modelAddressLineList,
- org.apache.juddi.model.Address modelAddress,
- Long contactId)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.AddressLine> modelAddressLineList,
+ org.apache.juddi.model.Address modelAddress,
+ Long contactId)
+ throws DispositionReportFaultMessage {
modelAddressLineList.clear();
for (org.uddi.api_v3.AddressLine apiAddressLine : apiAddressLineList) {
@@ -535,9 +537,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessIdentifiers(org.uddi.api_v3.IdentifierBag apiIdentifierBag,
- List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessIdentifier> modelIdentifierList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelIdentifierList.clear();
if (apiIdentifierBag != null) {
@@ -557,10 +559,10 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessServices(org.uddi.api_v3.BusinessServices apiBusinessServices,
- List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
- List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BusinessService> modelBusinessServiceList,
+ List<org.apache.juddi.model.ServiceProjection> modelServiceProjectionList,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessServiceList.clear();
if (apiBusinessServices != null) {
List<org.uddi.api_v3.BusinessService> apiBusinessServiceList = apiBusinessServices.getBusinessService();
@@ -569,7 +571,7 @@ public class MappingApiToModel {
// If the parent businessEntity key and the service businessEntity key (if provided) do not match, it's a projection.
if (apiBusinessService.getBusinessKey() != null && apiBusinessService.getBusinessKey().length() > 0
- && !modelBusinessEntity.getEntityKey().equalsIgnoreCase(apiBusinessService.getBusinessKey())) {
+ && !modelBusinessEntity.getEntityKey().equalsIgnoreCase(apiBusinessService.getBusinessKey())) {
modelBusinessService.setEntityKey(apiBusinessService.getServiceKey());
org.apache.juddi.model.ServiceProjection modelServiceProjection = new org.apache.juddi.model.ServiceProjection(modelBusinessEntity, modelBusinessService);
@@ -591,9 +593,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBusinessService(org.uddi.api_v3.BusinessService apiBusinessService,
- org.apache.juddi.model.BusinessService modelBusinessService,
- org.apache.juddi.model.BusinessEntity modelBusinessEntity)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BusinessService modelBusinessService,
+ org.apache.juddi.model.BusinessEntity modelBusinessEntity)
+ throws DispositionReportFaultMessage {
modelBusinessService.setBusinessEntity(modelBusinessEntity);
modelBusinessService.setEntityKey(apiBusinessService.getServiceKey());
@@ -617,9 +619,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapServiceNames(List<org.uddi.api_v3.Name> apiNameList,
- List<org.apache.juddi.model.ServiceName> modelNameList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ServiceName> modelNameList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelNameList.clear();
for (org.uddi.api_v3.Name apiName : apiNameList) {
@@ -635,9 +637,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapServiceDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.ServiceDescr> modelDescList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.ServiceDescr> modelDescList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -653,9 +655,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplates(org.uddi.api_v3.BindingTemplates apiBindingTemplates,
- List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BindingTemplate> modelBindingTemplateList,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelBindingTemplateList.clear();
if (apiBindingTemplates != null) {
@@ -678,9 +680,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingTemplate(org.uddi.api_v3.BindingTemplate apiBindingTemplate,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate,
- org.apache.juddi.model.BusinessService modelBusinessService)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate,
+ org.apache.juddi.model.BusinessService modelBusinessService)
+ throws DispositionReportFaultMessage {
modelBindingTemplate.setBusinessService(modelBusinessService);
modelBindingTemplate.setEntityKey(apiBindingTemplate.getBindingKey());
@@ -709,9 +711,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapBindingDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.BindingDescr> modelDescList,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.BindingDescr> modelDescList,
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
modelDescList.add(new org.apache.juddi.model.BindingDescr(modelBindingTemplate, apiDesc.getLang(), apiDesc.getValue()));
@@ -725,8 +727,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapCategoryBag(org.uddi.api_v3.CategoryBag apiCategoryBag,
- org.apache.juddi.model.CategoryBag modelCategoryBag)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.CategoryBag modelCategoryBag)
+ throws DispositionReportFaultMessage {
if (apiCategoryBag != null) {
List<org.uddi.api_v3.KeyedReference> krList = apiCategoryBag.getKeyedReference();
@@ -736,7 +738,7 @@ public class MappingApiToModel {
//modelKeyedReferences.clear();
org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference) elem;
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
- apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
List<org.uddi.api_v3.KeyedReferenceGroup> krgList = apiCategoryBag.getKeyedReferenceGroup();
@@ -764,9 +766,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapKeyedReferenceGroup(org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup,
- org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
- org.apache.juddi.model.CategoryBag modelCategoryBag)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup,
+ org.apache.juddi.model.CategoryBag modelCategoryBag)
+ throws DispositionReportFaultMessage {
if (apiKeyedReferenceGroup != null) {
modelKeyedReferenceGroup.setCategoryBag(modelCategoryBag);
modelKeyedReferenceGroup.setTmodelKey(apiKeyedReferenceGroup.getTModelKey());
@@ -775,7 +777,7 @@ public class MappingApiToModel {
List<org.apache.juddi.model.KeyedReference> modelKeyedReferences = modelKeyedReferenceGroup.getKeyedReferences();
for (org.uddi.api_v3.KeyedReference apiKeyedReference : apiKeyedReferenceGroup.getKeyedReference()) {
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelKeyedReferenceGroup,
- apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
@@ -791,9 +793,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelInstanceDetails(org.uddi.api_v3.TModelInstanceDetails apiTModelInstDetails,
- List<org.apache.juddi.model.TmodelInstanceInfo> modelTModelInstInfoList,
- org.apache.juddi.model.BindingTemplate modelBindingTemplate)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelInstanceInfo> modelTModelInstInfoList,
+ org.apache.juddi.model.BindingTemplate modelBindingTemplate)
+ throws DispositionReportFaultMessage {
modelTModelInstInfoList.clear();
if (apiTModelInstDetails != null) {
@@ -817,9 +819,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelInstanceInfoDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
- org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelInstanceInfoDescr> modelDescList,
+ org.apache.juddi.model.TmodelInstanceInfo modelTModelInstInfo)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -834,8 +836,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapInstanceDetails(org.uddi.api_v3.InstanceDetails apiInstanceDetails,
- org.apache.juddi.model.TmodelInstanceInfo modelTmodelInstInfo)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.TmodelInstanceInfo modelTmodelInstInfo)
+ throws DispositionReportFaultMessage {
modelTmodelInstInfo.getInstanceDetailsDescrs().clear();
if (apiInstanceDetails != null) {
@@ -843,8 +845,8 @@ public class MappingApiToModel {
List<org.uddi.api_v3.OverviewDoc> overviewdocs = apiInstanceDetails.getOverviewDoc();
for (org.uddi.api_v3.Description apiDesc : descriptions) {
org.apache.juddi.model.InstanceDetailsDescr modelInstanceDetailsDescr
- = new org.apache.juddi.model.InstanceDetailsDescr(
- modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
+ = new org.apache.juddi.model.InstanceDetailsDescr(
+ modelTmodelInstInfo, apiDesc.getLang(), apiDesc.getValue());
modelTmodelInstInfo.getInstanceDetailsDescrs().add(modelInstanceDetailsDescr);
}
for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : overviewdocs) {
@@ -863,8 +865,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapOverviewDoc(org.uddi.api_v3.OverviewDoc apiOverviewDoc,
- org.apache.juddi.model.OverviewDoc modelOverviewDoc)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.OverviewDoc modelOverviewDoc)
+ throws DispositionReportFaultMessage {
if (apiOverviewDoc != null) {
List<Description> descContent = apiOverviewDoc.getDescription();
@@ -872,7 +874,7 @@ public class MappingApiToModel {
org.uddi.api_v3.Description description = (org.uddi.api_v3.Description) elem;
if (description != null) {
org.apache.juddi.model.OverviewDocDescr modelOverviewDocDescr = new org.apache.juddi.model.OverviewDocDescr(
- modelOverviewDoc, description.getLang(), description.getValue());
+ modelOverviewDoc, description.getLang(), description.getValue());
modelOverviewDoc.getOverviewDocDescrs().add(modelOverviewDocDescr);
}
}
@@ -894,8 +896,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModel(org.uddi.api_v3.TModel apiTModel,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelTModel.setEntityKey(apiTModel.getTModelKey());
modelTModel.setName(apiTModel.getName().getValue());
@@ -920,9 +922,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- List<org.apache.juddi.model.TmodelDescr> modelDescList,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelDescr> modelDescList,
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelDescList.clear();
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
@@ -938,9 +940,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelIdentifiers(org.uddi.api_v3.IdentifierBag apiIdentifierBag,
- List<org.apache.juddi.model.TmodelIdentifier> modelIdentifierList,
- org.apache.juddi.model.Tmodel modelTModel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.TmodelIdentifier> modelIdentifierList,
+ org.apache.juddi.model.Tmodel modelTModel)
+ throws DispositionReportFaultMessage {
modelIdentifierList.clear();
if (apiIdentifierBag != null) {
@@ -959,9 +961,9 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapTModelOverviewDocs(List<org.uddi.api_v3.OverviewDoc> apiOverviewDocList,
- List<org.apache.juddi.model.OverviewDoc> modelOverviewDocList,
- org.apache.juddi.model.Tmodel modelTmodel)
- throws DispositionReportFaultMessage {
+ List<org.apache.juddi.model.OverviewDoc> modelOverviewDocList,
+ org.apache.juddi.model.Tmodel modelTmodel)
+ throws DispositionReportFaultMessage {
modelOverviewDocList.clear();
for (org.uddi.api_v3.OverviewDoc apiOverviewDoc : apiOverviewDocList) {
@@ -978,8 +980,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapPublisherAssertion(org.uddi.api_v3.PublisherAssertion apiPubAssertion,
- org.apache.juddi.model.PublisherAssertion modelPubAssertion)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.PublisherAssertion modelPubAssertion)
+ throws DispositionReportFaultMessage {
modelPubAssertion.setId(new org.apache.juddi.model.PublisherAssertionId(apiPubAssertion.getFromKey(), apiPubAssertion.getToKey()));
@@ -1006,8 +1008,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapSubscription(org.uddi.sub_v3.Subscription apiSubscription,
- org.apache.juddi.model.Subscription modelSubscription)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.Subscription modelSubscription)
+ throws DispositionReportFaultMessage {
modelSubscription.setSubscriptionKey(apiSubscription.getSubscriptionKey());
modelSubscription.setBindingKey(apiSubscription.getBindingKey());
@@ -1039,8 +1041,8 @@ public class MappingApiToModel {
* @throws DispositionReportFaultMessage
*/
public static void mapClientSubscriptionInfo(org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo,
- org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo)
- throws DispositionReportFaultMessage {
+ org.apache.juddi.model.ClientSubscriptionInfo modelClientSubscriptionInfo)
+ throws DispositionReportFaultMessage {
modelClientSubscriptionInfo.setLastNotified(new Date());
modelClientSubscriptionInfo.setSubscriptionKey(apiClientSubscriptionInfo.getSubscriptionKey());
@@ -1416,48 +1418,52 @@ public class MappingApiToModel {
}
model.setMaximumTimeToGetChanges(replicationConfiguration.getMaximumTimeToGetChanges());
model.setMaximumTimeToSyncRegistry(replicationConfiguration.getMaximumTimeToSyncRegistry());
+ //this is set by the service when saving
model.setSerialNumber(null);
-
+
//the spec doesn't specify what the format should be, however there was an example
//2002 03 04 1859Z
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddkkmmZ");
model.setTimeOfConfigurationUpdate(sdf.format(new Date()));
if (replicationConfiguration.getRegistryContact() != null) {
- model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact()));
+ model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact(), model));
}
- mapCommunicationGraph(model,replicationConfiguration.getCommunicationGraph(), em);
- model.setOperator(mapOperators(replicationConfiguration.getOperator()));
+ mapCommunicationGraph(model, replicationConfiguration.getCommunicationGraph(), em);
+ model.setOperator(mapOperators(replicationConfiguration,model));
if (replicationConfiguration.getSignature() != null) {
model.setSignatures(mapApiSignaturesToModelSignatures(replicationConfiguration.getSignature()));
}
}
- private static Contact mapContact(org.uddi.api_v3.Contact contact) throws DispositionReportFaultMessage {
- Contact model = new Contact();
- model.setAddresses(new ArrayList<Address>());
- mapContactAddresses(contact.getAddress(), model.getAddresses(), model);
- if (model.getAddresses().isEmpty()) {
- model.setAddresses(null);
+ private static Contact mapContact(org.uddi.api_v3.Contact contact, org.apache.juddi.model.ReplicationConfiguration model) throws DispositionReportFaultMessage {
+ Contact cmodel = new Contact();
+ cmodel.setReplicationConfigId(model);
+ cmodel.setAddresses(new ArrayList<Address>());
+ mapContactAddresses(contact.getAddress(), cmodel.getAddresses(), cmodel);
+ if (cmodel.getAddresses().isEmpty()) {
+ cmodel.setAddresses(null);
}
- return model;
+ return cmodel;
}
-
-
- private static List<Operator> mapOperators(List<org.uddi.repl_v3.Operator> api) throws DispositionReportFaultMessage {
+ private static List<Operator> mapOperators(ReplicationConfiguration cfg, org.apache.juddi.model.ReplicationConfiguration modelparent) throws DispositionReportFaultMessage {
+ if (cfg==null) return null;
+ List<org.uddi.repl_v3.Operator> api = cfg.getOperator();
if (api == null) {
return null;
}
List<Operator> model = new ArrayList<Operator>();
for (int i = 0; i < api.size(); i++) {
Operator op = new Operator();
+ op.setParent(modelparent);
+
op.setSoapReplicationURL(api.get(i).getSoapReplicationURL());
if (!api.get(i).getContact().isEmpty()) {
op.setContact(new ArrayList<Contact>());
for (int k = 0; k < api.get(i).getContact().size(); k++) {
- op.getContact().add(mapContact(api.get(i).getContact().get(k)));
+ op.getContact().add(mapContact(api.get(i).getContact().get(k), null));
}
}
op.setOperatorNodeID(api.get(i).getOperatorNodeID());
@@ -1496,12 +1502,13 @@ public class MappingApiToModel {
return null;
}
- private static void mapCommunicationGraph(org.apache.juddi.model.ReplicationConfiguration model, CommunicationGraph communicationGraph, EntityManager em) throws ValueNotAllowedException {
-
- if (model == null) {
+ private static void mapCommunicationGraph(org.apache.juddi.model.ReplicationConfiguration model, CommunicationGraph communicationGraph, EntityManager em) throws ValueNotAllowedException {
+
+ if (model == null) {
return;
}
-
+
+
/**
* Following the listing of nodes is the controlledMessage
* element that lists the set of messages over which this
@@ -1515,39 +1522,30 @@ public class MappingApiToModel {
*/
if (communicationGraph.getControlledMessage() != null) {
model.setControlMessage(new ArrayList<ControlMessage>());
+
for (int k = 0; k < communicationGraph.getControlledMessage().size(); k++) {
- model.getControlMessage().add(new ControlMessage(communicationGraph.getControlledMessage().get(k)));
+ ControlMessage BC = new ControlMessage(communicationGraph.getControlledMessage().get(k));
+ BC.setReplicationConfiguration(model);
+
+ model.getControlMessage().add(BC);
}
}
- model.setNode(new ArrayList<Node>());
+
for (int i = 0; i < communicationGraph.getNode().size(); i++) {
- Node find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getNode().get(i));
- if (find == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getNode().get(i)));
- }
- model.getNode().add(find);
+ ReplicationConfigurationNode replicationConfigurationNode = new ReplicationConfigurationNode();
+
+ replicationConfigurationNode.setNodeName(communicationGraph.getNode().get(i));
+ replicationConfigurationNode.setParent(model);
+ model.getNode().add(replicationConfigurationNode);
}
if (communicationGraph.getEdge() != null && !communicationGraph.getEdge().isEmpty()) {
List<Edge> ret = new ArrayList<Edge>();
for (int i = 0; i < communicationGraph.getEdge().size(); i++) {
Edge e = new Edge();
+ e.setReplicationConfiguration(model);
- if (communicationGraph.getEdge().get(i).getMessageReceiver() == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
- }
- Node find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageReceiver());
- if (find == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
- }
- e.setMessageReceiver(find);
- if (communicationGraph.getEdge().get(i).getMessageSender() == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
- }
- find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageSender());
- if (find == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageSender()));
- }
- e.setMessageSender(find);
+ e.setMessageReceiver(communicationGraph.getEdge().get(i).getMessageReceiver());
+ e.setMessageSender(communicationGraph.getEdge().get(i).getMessageSender());
/**
* The message elements contain the local name
@@ -1560,24 +1558,29 @@ public class MappingApiToModel {
if (communicationGraph.getEdge().get(i).getMessage() != null) {
e.setMessage(new ArrayList<ControlMessage>());
for (int k = 0; k < communicationGraph.getEdge().get(i).getMessage().size(); k++) {
- e.getMessages().add(new ControlMessage(communicationGraph.getEdge().get(i).getMessage().get(k)));
+ ControlMessage controlMessage = new ControlMessage(communicationGraph.getEdge().get(i).getMessage().get(k));
+ controlMessage.setReplicationConfiguration(model);
+ controlMessage.setParentEdge(e);
+ e.getMessages().add(controlMessage);
}
}
if (communicationGraph.getEdge().get(i).getMessageReceiverAlternate() != null) {
- e.setMessageReceiverAlternate(new HashSet<Node>());
- for (int k = 0; k < communicationGraph.getEdge().get(i).getMessageReceiverAlternate().size(); k++) {
- find = em.find(org.apache.juddi.model.Node.class, communicationGraph.getEdge().get(i).getMessageSender());
- if (find == null) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageSender()));
- }
- e.getMessageReceiverAlternate().add(find);
+ List<EdgeReceiverAlternate> eras = new ArrayList<EdgeReceiverAlternate>();
+ for (String s: communicationGraph.getEdge().get(i).getMessageReceiverAlternate() ){
+ EdgeReceiverAlternate x = new EdgeReceiverAlternate();
+ x.setParent(e);
+ x.setReceiverAlternate(s);
+ eras.add(x);
}
+ e.setMessageReceiverAlternate(eras);
+
}
ret.add(e);
}
model.setEdge(ret);
- }} }
-
-
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index 50535da..481df3d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -48,6 +48,7 @@ import org.apache.juddi.jaxb.JAXBMarshaller;
import org.apache.juddi.model.CanonicalizationMethod;
import org.apache.juddi.model.ControlMessage;
import org.apache.juddi.model.Edge;
+import org.apache.juddi.model.EdgeReceiverAlternate;
import org.apache.juddi.model.KeyInfo;
import org.apache.juddi.model.OverviewDoc;
import org.apache.juddi.model.Reference;
@@ -58,14 +59,17 @@ import org.apache.juddi.model.UddiEntity;
import org.apache.juddi.model.KeyDataValue;
import org.apache.juddi.model.Node;
import org.apache.juddi.model.ReplicationConfiguration;
+import org.apache.juddi.model.ReplicationConfigurationNode;
import org.apache.juddi.model.SignatureTransformDataValue;
import org.apache.juddi.subscription.TypeConvertor;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.CompletionStatus;
+import org.uddi.api_v3.Contact;
import org.uddi.api_v3.Contacts;
import org.uddi.api_v3.OperationalInfo;
+import org.uddi.api_v3.PersonName;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
@@ -1203,6 +1207,7 @@ public class MappingModelToApi {
item.setMaximumTimeToGetChanges(find.getMaximumTimeToGetChanges());
item.setMaximumTimeToSyncRegistry(find.getMaximumTimeToSyncRegistry());
item.setSerialNumber(find.getSerialNumber());
+
List<SignatureType> sigs = new ArrayList<SignatureType>();
mapSignature(find.getSignatures(), sigs);
item.getSignature().addAll(sigs);
@@ -1213,10 +1218,16 @@ public class MappingModelToApi {
org.uddi.api_v3.Contacts cs = new Contacts();
mapContacts(modelContactList, cs, new BusinessEntity());
+ item.setRegistryContact(new org.uddi.repl_v3.ReplicationConfiguration.RegistryContact());
if (!cs.getContact().isEmpty()) {
- item.setRegistryContact(new org.uddi.repl_v3.ReplicationConfiguration.RegistryContact());
+
item.getRegistryContact().setContact(cs.getContact().get(0));
}
+ else
+ {
+ item.getRegistryContact().setContact(new Contact());
+ item.getRegistryContact().getContact().getPersonName().add(new PersonName("unknown", null));
+ }
item.setTimeOfConfigurationUpdate(find.getTimeOfConfigurationUpdate());
CommunicationGraph xcom = new CommunicationGraph();
@@ -1278,16 +1289,16 @@ public class MappingModelToApi {
Edge modelEdge = it.next();
CommunicationGraph.Edge apiEdge = new CommunicationGraph.Edge();
- apiEdge.setMessageReceiver(modelEdge.getMessageReceiver().getName());
- apiEdge.setMessageSender(modelEdge.getMessageSender().getName());
+ apiEdge.setMessageReceiver(modelEdge.getMessageReceiver());
+ apiEdge.setMessageSender(modelEdge.getMessageSender());
Iterator<ControlMessage> it2 = modelEdge.getMessages().iterator();
while (it2.hasNext()) {
apiEdge.getMessage().add(it2.next().getMessage());
}
- Iterator<Node> it3 = modelEdge.getMessageReceiverAlternate().iterator();
+ Iterator<EdgeReceiverAlternate> it3 = modelEdge.getMessageReceiverAlternate().iterator();
while (it3.hasNext()) {
- apiEdge.getMessageReceiverAlternate().add(it3.next().getName());
+ apiEdge.getMessageReceiverAlternate().add(it3.next().getReceiverAlternate());
}
api.add(apiEdge);
@@ -1302,10 +1313,10 @@ public class MappingModelToApi {
}
}
- private static void mapEdgeNodes(List<Node> model, List<String> api) {
- Iterator<Node> it = model.iterator();
+ private static void mapEdgeNodes(List<ReplicationConfigurationNode> model, List<String> api) {
+ Iterator<ReplicationConfigurationNode> it = model.iterator();
while (it.hasNext()) {
- api.add(it.next().getName());
+ api.add(it.next().getNodeName());
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Contact.java b/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
index 4f8b62d..9dfc41e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
@@ -28,6 +28,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
import javax.persistence.Table;
@@ -42,6 +43,7 @@ public class Contact implements java.io.Serializable {
private static final long serialVersionUID = 3350341195850056589L;
private Long id;
private BusinessEntity businessEntity;
+ private ReplicationConfiguration replicationConfigSerial;
private String useType;
private List<PersonName> personNames = new ArrayList<PersonName>(0);
private List<ContactDescr> contactDescrs = new ArrayList<ContactDescr>(0);
@@ -67,6 +69,15 @@ public class Contact implements java.io.Serializable {
this.addresses = addresses;
}
+ @OneToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "replicationCfgId", nullable = true)
+ public ReplicationConfiguration getReplicationConfigId() {
+ return this.replicationConfigSerial;
+ }
+ public void setReplicationConfigId(ReplicationConfiguration id) {
+ this.replicationConfigSerial = id;
+ }
+
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
public Long getId() {
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java b/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
index ce79b8f..39ab63a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ControlMessage.java
@@ -19,7 +19,13 @@ package org.apache.juddi.model;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import org.uddi.repl_v3.CommunicationGraph;
/**
*
@@ -48,6 +54,7 @@ public class ControlMessage implements Serializable{
}
@Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
public Long getId() {
return id;
}
@@ -55,4 +62,27 @@ public class ControlMessage implements Serializable{
public void setId(Long id) {
this.id = id;
}
+
+ // @JoinColumn( )
+ // @ManyToOne(targetEntity = ReplicationConfiguration.class)
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "ReplicationConfiguration", nullable = true)
+ public ReplicationConfiguration getReplicationConfiguration() {
+ return parent;
+ }
+ private ReplicationConfiguration parent;
+ public void setReplicationConfiguration(ReplicationConfiguration p){
+ parent = p;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key_ed", nullable = true)
+ public Edge getParentEdge(){
+ return this.edge;
+ }
+ private Edge edge;
+ public void setParentEdge(Edge e){
+ this.edge = e;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
index bc25990..669a2a2 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
@@ -20,6 +20,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
@@ -37,11 +38,20 @@ public class Edge {
private Long id;
private List<ControlMessage> message;
- private Node messageSender;
- private Node messageReceiver;
- private Set<Node> messageReceiverAlternate;
+ private String messageSender;
+ private String messageReceiver;
+ private List<EdgeReceiverAlternate> messageReceiverAlternate;
private ReplicationConfiguration parent;
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "ReplicationConfiguration", nullable = false)
+ public ReplicationConfiguration getReplicationConfiguration() {
+ return parent;
+ }
+
+ public void setReplicationConfiguration(ReplicationConfiguration p){
+ parent = p;
+ }
/**
* The message elements contain the local name of the Replication API message elements
@@ -58,13 +68,13 @@ public class Edge {
this.message = values;
}
- @JoinColumn(referencedColumnName ="name" )
- @ManyToOne(targetEntity = Node.class)
- public Node getMessageSender() {
+
+ @Column
+ public String getMessageSender() {
return messageSender;
}
- public void setMessageSender(Node value) {
+ public void setMessageSender(String value) {
this.messageSender = value;
}
@@ -73,13 +83,12 @@ public class Edge {
*
* @return
*/
- @JoinColumn(referencedColumnName ="name" )
- @ManyToOne(targetEntity = Node.class)
- public Node getMessageReceiver() {
+ @Column
+ public String getMessageReceiver() {
return messageReceiver;
}
- public void setMessageReceiver(Node value) {
+ public void setMessageReceiver(String value) {
this.messageReceiver = value;
}
@@ -90,10 +99,12 @@ public class Edge {
*
* @return
*/
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = Node.class)
- public Set<Node> getMessageReceiverAlternate() {
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = EdgeReceiverAlternate.class
+ //, mappedBy = "messageReceiverAlternate"
+ )
+ public List<EdgeReceiverAlternate> getMessageReceiverAlternate() {
if (messageReceiverAlternate == null) {
- messageReceiverAlternate = new HashSet<Node>();
+ messageReceiverAlternate = new ArrayList<EdgeReceiverAlternate>();
}
return this.messageReceiverAlternate;
}
@@ -108,7 +119,7 @@ public class Edge {
this.message = message;
}
- public void setMessageReceiverAlternate(Set<Node> messageReceiverAlternate) {
+ public void setMessageReceiverAlternate(List<EdgeReceiverAlternate> messageReceiverAlternate) {
this.messageReceiverAlternate = messageReceiverAlternate;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/EdgeReceiverAlternate.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/EdgeReceiverAlternate.java b/juddi-core/src/main/java/org/apache/juddi/model/EdgeReceiverAlternate.java
new file mode 100644
index 0000000..b64a65f
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/model/EdgeReceiverAlternate.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 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.model;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ *
+ * @author alex
+ */
+@Entity
+@Table(name = "j3_chg_replcfgear")
+public class EdgeReceiverAlternate implements Serializable{
+ private static final long serialVersionUID = -3199894835641632162L;
+ Long id;
+ String rx;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY, targetEntity = Edge.class)
+ @JoinColumn(name = "entity_key_ed", nullable = false)
+ public Edge getParent(){
+ return this.edge;
+ }
+ private Edge edge;
+ public void setParent(Edge e){
+ this.edge = e;
+ }
+
+ @Column
+ public String getReceiverAlternate() {
+ return this.rx;
+ }
+
+ public void setReceiverAlternate(String s) {
+ this.rx = s;
+ }
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/Node.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Node.java b/juddi-core/src/main/java/org/apache/juddi/model/Node.java
index 53fbe12..d5d9df4 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Node.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Node.java
@@ -15,17 +15,9 @@ package org.apache.juddi.model;
* limitations under the License.
*/
-import java.util.List;
-import java.util.Set;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.FetchType;
import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -36,168 +28,168 @@ import javax.persistence.Transient;
@Table(name = "j3_node")
public class Node implements java.io.Serializable {
- @Transient
- private static final long serialVersionUID = -893203927029468343L;
- @Id
- @Column(name="name", nullable = false, length=255)
- private String name;
- @Column(name="client_name", nullable = false, length=255)
- private String clientName;
- @Column(name="security_url", nullable = false, length=255)
- private String securityUrl;
- @Column(name="inquiry_url", nullable = false, length=255)
- private String inquiryUrl;
- @Column(name="publish_url", nullable = false, length=255)
- private String publishUrl;
- @Column(name="custody_transfer_url", nullable = false, length=255)
- private String custodyTransferUrl;
- @Column(name="subscription_url", nullable = false, length=255)
- private String subscriptionUrl;
-
- @Column(name="subscriptionlist_url", nullable = false, length=255)
- private String subscriptionListenerUrl;
- @Column(name="replication_url", nullable = true, length=255)
- private String replicationUrl;
- @Column(name="proxy_transport", nullable = false, length=255)
- private String proxyTransport;
-
- @Column(name="juddi_api_url", nullable = true, length=255)
- private String juddiApiUrl;
- @Column(name="factory_initial", nullable = true, length=255)
- private String factoryInitial;
- @Column(name="factory_url_pkgs", nullable = true, length=255)
- private String factoryURLPkgs;
- @Column(name="factory_naming_provider", nullable = true, length=255)
- private String factoryNamingProvider;
-
- public Node() {}
-
- public Node(String custodyTransferUrl, String inquiryUrl,
- String juddiApiUrl, String name, String proxyTransport,
- String publishUrl, String securityUrl, String subscriptionUrl, String replicationURL) {
- super();
- this.custodyTransferUrl = custodyTransferUrl;
- this.inquiryUrl = inquiryUrl;
- this.juddiApiUrl = juddiApiUrl;
- this.name = name;
- this.proxyTransport = proxyTransport;
- this.publishUrl = publishUrl;
- this.securityUrl = securityUrl;
- this.subscriptionUrl = subscriptionUrl;
- this.replicationUrl=replicationURL;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getClientName() {
- return clientName;
- }
-
- public void setClientName(String clientName) {
- this.clientName = clientName;
- }
-
- public String getProxyTransport() {
- return proxyTransport;
- }
-
- public void setProxyTransport(String proxyTransport) {
- this.proxyTransport = proxyTransport;
- }
-
- public String getSecurityUrl() {
- return securityUrl;
- }
-
- public void setSecurityUrl(String securityUrl) {
- this.securityUrl = securityUrl;
- }
-
- public String getInquiryUrl() {
- return inquiryUrl;
- }
-
- public void setInquiryUrl(String inquiryUrl) {
- this.inquiryUrl = inquiryUrl;
- }
-
- public String getPublishUrl() {
- return publishUrl;
- }
-
- public void setPublishUrl(String publishUrl) {
- this.publishUrl = publishUrl;
- }
-
- public String getCustodyTransferUrl() {
- return custodyTransferUrl;
- }
-
- public void setCustodyTransferUrl(String custodyTransferUrl) {
- this.custodyTransferUrl = custodyTransferUrl;
- }
-
- public String getSubscriptionUrl() {
- return subscriptionUrl;
- }
-
- public void setSubscriptionUrl(String subscriptionUrl) {
- this.subscriptionUrl = subscriptionUrl;
- }
-
+ @Transient
+ private static final long serialVersionUID = -893203927029468343L;
+ @Id
+ @Column(name = "name", nullable = false, length = 255)
+ private String name;
+ @Column(name = "client_name", nullable = false, length = 255)
+ private String clientName;
+ @Column(name = "security_url", nullable = true, length = 255)
+ private String securityUrl;
+ @Column(name = "inquiry_url", nullable = false, length = 255)
+ private String inquiryUrl;
+ @Column(name = "publish_url", nullable = false, length = 255)
+ private String publishUrl;
+ @Column(name = "custody_transfer_url", nullable = true, length = 255)
+ private String custodyTransferUrl;
+ @Column(name = "subscription_url", nullable = true, length = 255)
+ private String subscriptionUrl;
+
+ @Column(name = "subscriptionlist_url", nullable = true, length = 255)
+ private String subscriptionListenerUrl;
+ @Column(name = "replication_url", nullable = true, length = 255)
+ private String replicationUrl;
+ @Column(name = "proxy_transport", nullable = false, length = 255)
+ private String proxyTransport;
+
+ @Column(name = "juddi_api_url", nullable = true, length = 255)
+ private String juddiApiUrl;
+ @Column(name = "factory_initial", nullable = true, length = 255)
+ private String factoryInitial;
+ @Column(name = "factory_url_pkgs", nullable = true, length = 255)
+ private String factoryURLPkgs;
+ @Column(name = "factory_naming_provider", nullable = true, length = 255)
+ private String factoryNamingProvider;
+
+ public Node() {
+ }
+
+ public Node(String custodyTransferUrl, String inquiryUrl,
+ String juddiApiUrl, String name, String proxyTransport,
+ String publishUrl, String securityUrl, String subscriptionUrl, String replicationURL) {
+ super();
+ this.custodyTransferUrl = custodyTransferUrl;
+ this.inquiryUrl = inquiryUrl;
+ this.juddiApiUrl = juddiApiUrl;
+ this.name = name;
+ this.proxyTransport = proxyTransport;
+ this.publishUrl = publishUrl;
+ this.securityUrl = securityUrl;
+ this.subscriptionUrl = subscriptionUrl;
+ this.replicationUrl = replicationURL;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getClientName() {
+ return clientName;
+ }
+
+ public void setClientName(String clientName) {
+ this.clientName = clientName;
+ }
+
+ public String getProxyTransport() {
+ return proxyTransport;
+ }
+
+ public void setProxyTransport(String proxyTransport) {
+ this.proxyTransport = proxyTransport;
+ }
+
+ public String getSecurityUrl() {
+ return securityUrl;
+ }
+
+ public void setSecurityUrl(String securityUrl) {
+ this.securityUrl = securityUrl;
+ }
+
+ public String getInquiryUrl() {
+ return inquiryUrl;
+ }
+
+ public void setInquiryUrl(String inquiryUrl) {
+ this.inquiryUrl = inquiryUrl;
+ }
+
+ public String getPublishUrl() {
+ return publishUrl;
+ }
+
+ public void setPublishUrl(String publishUrl) {
+ this.publishUrl = publishUrl;
+ }
+
+ public String getCustodyTransferUrl() {
+ return custodyTransferUrl;
+ }
+
+ public void setCustodyTransferUrl(String custodyTransferUrl) {
+ this.custodyTransferUrl = custodyTransferUrl;
+ }
+
+ public String getSubscriptionUrl() {
+ return subscriptionUrl;
+ }
+
+ public void setSubscriptionUrl(String subscriptionUrl) {
+ this.subscriptionUrl = subscriptionUrl;
+ }
+
public String getSubscriptionListenerUrl() {
- return subscriptionListenerUrl;
- }
+ return subscriptionListenerUrl;
+ }
+
+ public void setSubscriptionListenerUrl(String subscriptionUrl) {
+ this.subscriptionListenerUrl = subscriptionUrl;
+ }
- public void setSubscriptionListenerUrl(String subscriptionUrl) {
- this.subscriptionListenerUrl = subscriptionUrl;
- }
public String getReplicationUrl() {
- return replicationUrl;
- }
-
- public void setReplicationUrl(String replicationUrl) {
- this.replicationUrl = replicationUrl;
- }
-
- public String getJuddiApiUrl() {
- return juddiApiUrl;
- }
-
- public void setJuddiApiUrl(String juddiApiUrl) {
- this.juddiApiUrl = juddiApiUrl;
- }
-
- public String getFactoryInitial() {
- return factoryInitial;
- }
-
- public void setFactoryInitial(String factoryInitial) {
- this.factoryInitial = factoryInitial;
- }
-
- public String getFactoryURLPkgs() {
- return factoryURLPkgs;
- }
-
- public void setFactoryURLPkgs(String factoryURLPkgs) {
- this.factoryURLPkgs = factoryURLPkgs;
- }
-
- public String getFactoryNamingProvider() {
- return factoryNamingProvider;
- }
-
- public void setFactoryNamingProvider(String factoryNamingProvider) {
- this.factoryNamingProvider = factoryNamingProvider;
- }
-
-
+ return replicationUrl;
+ }
+
+ public void setReplicationUrl(String replicationUrl) {
+ this.replicationUrl = replicationUrl;
+ }
+
+ public String getJuddiApiUrl() {
+ return juddiApiUrl;
+ }
+
+ public void setJuddiApiUrl(String juddiApiUrl) {
+ this.juddiApiUrl = juddiApiUrl;
+ }
+
+ public String getFactoryInitial() {
+ return factoryInitial;
+ }
+
+ public void setFactoryInitial(String factoryInitial) {
+ this.factoryInitial = factoryInitial;
+ }
+
+ public String getFactoryURLPkgs() {
+ return factoryURLPkgs;
+ }
+
+ public void setFactoryURLPkgs(String factoryURLPkgs) {
+ this.factoryURLPkgs = factoryURLPkgs;
+ }
+
+ public String getFactoryNamingProvider() {
+ return factoryNamingProvider;
+ }
+
+ public void setFactoryNamingProvider(String factoryNamingProvider) {
+ this.factoryNamingProvider = factoryNamingProvider;
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/Operator.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Operator.java b/juddi-core/src/main/java/org/apache/juddi/model/Operator.java
index ef724fb..4420071 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Operator.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Operator.java
@@ -23,7 +23,11 @@ import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -37,8 +41,19 @@ public class Operator implements Serializable {
private List<Contact> contact;
private String soapReplicationURL;
private List<KeyInfo> keyInfo;
+ Long id;
+ ReplicationConfiguration parent;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public Long getId() {
+ return id;
+ }
- @Id
+ public void setId(Long id) {
+ this.id = id;
+ }
+ @Column(name="operator_node")
public String getOperatorNodeID() {
return operatorNodeID;
}
@@ -88,5 +103,15 @@ public class Operator implements Serializable {
public void setKeyInfo(List<KeyInfo> c) {
this.keyInfo=c;
}
-}
-
\ No newline at end of file
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key_ed", nullable = true)
+ public ReplicationConfiguration getParent() {
+ return this.parent;
+ }
+
+
+ public void setParent(ReplicationConfiguration e) {
+ this.parent = e;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
index 72c717b..93d0f73 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
@@ -19,27 +19,23 @@ package org.apache.juddi.model;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import javax.persistence.TableGenerator;
@Entity
@Table(name = "j3_chg_replconf")
public class ReplicationConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
-
+
private Long serialNumber;
private String timeOfConfigurationUpdate;
private List<Operator> operator = new ArrayList<Operator>(0);
@@ -47,6 +43,9 @@ public class ReplicationConfiguration implements Serializable {
private BigInteger maximumTimeToGetChanges;
private List<Signature> signatures = new ArrayList<Signature>(0);
private Contact contact;
+ private List<ReplicationConfigurationNode> node;
+ private List<ControlMessage> controlledMessage;
+ private List<Edge> edge;
/**
* Gets the value of the contact property.
@@ -54,7 +53,8 @@ public class ReplicationConfiguration implements Serializable {
* @return possible object is {@link Contact }
*
*/
- @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = Contact.class)
+ @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "replicationConfigId")
+ //@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = Contact.class, mappedBy = "serialNumber")
public Contact getContact() {
return contact;
}
@@ -75,7 +75,7 @@ public class ReplicationConfiguration implements Serializable {
*/
@Column(name = "serialnumb")
@OrderBy(value = "SerialNumber DESC")
- @Id
+ @Id
public Long getSerialNumber() {
return serialNumber;
}
@@ -116,14 +116,11 @@ public class ReplicationConfiguration implements Serializable {
}
return this.operator;
}
-
-
- public void setOperator(List<Operator> v) {
-
- this.operator=v;
- }
-
+ public void setOperator(List<Operator> v) {
+
+ this.operator = v;
+ }
/**
* Gets the value of the maximumTimeToSyncRegistry property.
@@ -177,26 +174,24 @@ public class ReplicationConfiguration implements Serializable {
this.signatures = signatures;
}
- private List<Node> node;
- private List<ControlMessage> controlledMessage;
- private List<Edge> edge;
-
//To use a Node or a String reference...
//Node will give us strict ref integ but makes a change history of the replication config impossible
//Strig increases code logic for ref integ,but makes chage history possible
- @OneToMany(targetEntity = Node.class, orphanRemoval = false,fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.REFRESH, CascadeType.PERSIST})
- public List<Node> getNode() {
+ @OneToMany(targetEntity = ReplicationConfigurationNode.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ // @OneToMany(cascade = {CascadeType.ALL})
+ public List<ReplicationConfigurationNode> getNode() {
if (node == null) {
- node = new ArrayList<Node>();
+ node = new ArrayList<ReplicationConfigurationNode>();
}
return this.node;
}
- public void setNode(List<Node> nodes) {
+ public void setNode(List<ReplicationConfigurationNode> nodes) {
this.node = nodes;
}
+ //@javax.persistence.Transient
@OneToMany(targetEntity = ControlMessage.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
public List<ControlMessage> getControlMessage() {
if (controlledMessage == null) {
@@ -215,9 +210,8 @@ public class ReplicationConfiguration implements Serializable {
public List<Edge> getEdge() {
return this.edge;
}
-
- public void setEdge( List<Edge> edges) {
- this.edge=edges;
+
+ public void setEdge(List<Edge> edges) {
+ this.edge = edges;
}
}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
new file mode 100644
index 0000000..e146375
--- /dev/null
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfigurationNode.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 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.model;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+/**
+ *
+ * @author alex
+ */
+@Entity
+@Table(name = "j3_chg_replconfn")
+public class ReplicationConfigurationNode implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private ReplicationConfiguration parent;
+ String rx;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "entity_key_ed", nullable = false)
+ public ReplicationConfiguration getParent() {
+ return this.parent;
+ }
+ private Edge edge;
+
+ public void setParent(ReplicationConfiguration e) {
+ this.parent = e;
+ }
+
+ @Column
+ public String getNodeName() {
+ return this.rx;
+ }
+
+ public void setNodeName(String s) {
+ this.rx = s;
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[18/28] juddi git commit: JUDDI-891 done
Posted by al...@apache.org.
JUDDI-891 done
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/20d9dff5
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/20d9dff5
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/20d9dff5
Branch: refs/heads/master
Commit: 20d9dff566b3a79bcfafbdf4b6f72728f85cbbd6
Parents: 22a846d
Author: Alex <al...@apache.org>
Authored: Mon Nov 24 22:13:29 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Mon Nov 24 22:13:29 2014 -0500
----------------------------------------------------------------------
.../juddi_install_data/root_BusinessEntity.xml | 28 ++++++++++----------
.../impl/API_150_ValueSetValidationTest.java | 6 ++---
.../api/impl/rest/UDDIInquiryJAXRSTest.java | 2 +-
.../src/main/webapp/WEB-INF/classes/juddiv3.xml | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
index 2682dc5..74cdbb6 100644
--- a/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
+++ b/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
@@ -38,7 +38,7 @@
See below for other fields that you may want to edit...
-->
-<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:businesses-asf">
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:node1">
<!-- Change the name field to represent the name of your registry -->
<name xml:lang="en">An Apache jUDDI Node</name>
<!-- Change the description field to provided a brief description of your registry -->
@@ -54,7 +54,7 @@ See below for other fields that you may want to edit...
<!-- As mentioned above, you may want to provide user-defined keys for these (and the services/bindingTemplates below. Services that you
don't intend to support should be removed entirely -->
<!-- inquiry v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API</description>
<bindingTemplates>
@@ -124,7 +124,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- inquiry v2 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiryv2" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDIv2 Inquiry Service</name>
<description xml:lang="en">Web Service supporting UDDIv2 Inquiry API</description>
<bindingTemplates>
@@ -165,7 +165,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- inquiry v3 REST -->
- <businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-inquiry-rest" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Inquiry REST Service</name>
<description xml:lang="en">Web Service supporting UDDI Inquiry API via HTTP GET</description>
<bindingTemplates>
@@ -200,7 +200,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- publish v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publish" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Publish Service</name>
<description xml:lang="en">Web Service supporting UDDI Publish API</description>
<bindingTemplates>
@@ -265,7 +265,7 @@ See below for other fields that you may want to edit...
</businessService>
<!-- publish v2 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publishv2" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDIv2 Publish Service</name>
<description xml:lang="en">Web Service supporting UDDIv2 Publish API</description>
<bindingTemplates>
@@ -302,7 +302,7 @@ See below for other fields that you may want to edit...
<!-- security v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-security" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Security Service</name>
<description xml:lang="en">Web Service supporting UDDI Security API</description>
<bindingTemplates>
@@ -342,7 +342,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- custody v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-custodytransfer" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Custody and Ownership Transfer Service</name>
<description xml:lang="en">Web Service supporting UDDI Custody and Ownership Transfer API</description>
<bindingTemplates>
@@ -411,7 +411,7 @@ See below for other fields that you may want to edit...
</businessService>
<!-- subscription v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscription" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Subscription Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription API</description>
<bindingTemplates>
@@ -477,7 +477,7 @@ See below for other fields that you may want to edit...
</categoryBag>
</businessService>
<!-- subscription listener v3 -->
- <businessService serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-subscriptionlistener" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Subscription Listener Service</name>
<description xml:lang="en">Web Service supporting UDDI Subscription Listener API</description>
<bindingTemplates>
@@ -520,7 +520,7 @@ See below for other fields that you may want to edit...
</businessService>
- <businessService serviceKey="uddi:juddi.apache.org:services-valueset" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-valueset" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Value Set API Service</name>
<description xml:lang="en">Web Service supporting UDDI Value Set Validation service. This service provides tModel value validation and is
configured using the jUDDI Publisher Service</description>
@@ -562,7 +562,7 @@ See below for other fields that you may want to edit...
</businessService>
- <businessService serviceKey="uddi:juddi.apache.org:services-valueset-cache" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-valueset-cache" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Value Set Caching API Service</name>
<description xml:lang="en">Web Service supporting UDDI Value Set Caching service. This service provides tModel value validation and is
configured using the jUDDI Publisher Service</description>
@@ -601,7 +601,7 @@ See below for other fields that you may want to edit...
- <businessService serviceKey="uddi:juddi.apache.org:replication" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:replication" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">UDDI Replication API Version 3</name>
<description xml:lang="en">UDDI Replication API Version 3</description>
<bindingTemplates>
@@ -625,7 +625,7 @@ See below for other fields that you may want to edit...
<!-- juddi api service -->
- <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:businesses-asf">
+ <businessService serviceKey="uddi:juddi.apache.org:services-publisher" businessKey="uddi:juddi.apache.org:node1">
<name xml:lang="en">jUDDI Publisher Service</name>
<description xml:lang="en">Web Service supporting jUDDI specific API</description>
<bindingTemplates>
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
index b797aaa..2e63c35 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_150_ValueSetValidationTest.java
@@ -104,7 +104,7 @@ public class API_150_ValueSetValidationTest {
Assert.fail("Could not obtain authInfo token.");
}
}
- final static String VSV_KEY = "uddi:juddi.apache.org:businesses-asf";
+ static String VSV_KEY = "uddi:juddi.apache.org:node1";
//VIA InVM transport
final static String VSV_BT_KEY = "uddi:juddi.apache.org:servicebindings-valueset-cp";
//VIA JAXWS Transport "uddi:juddi.apache.org:servicebindings-valueset-ws";
@@ -341,7 +341,7 @@ public class API_150_ValueSetValidationTest {
tm.setCategoryBag(new CategoryBag());
tm.setName(new Name("My Custom validated key", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.OWNING_BUSINESS, "",VSV_KEY));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
@@ -632,7 +632,7 @@ public class API_150_ValueSetValidationTest {
tm.setName(new Name("My new tmodel", "en"));
tm.getDescription().add(new Description("valid values include 'one', 'two', 'three'", "en"));
tm.setCategoryBag(new CategoryBag());
- tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "", "uddi:juddi.apache.org:businesses-asf"));
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(UDDIConstants.IS_REPLACED_BY, "",VSV_KEY));
SaveTModel stm = new SaveTModel();
stm.setAuthInfo(authInfoJoe);
stm.getTModel().add(tm);
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
----------------------------------------------------------------------
diff --git a/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java b/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
index 61d066a..c62d288 100644
--- a/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
+++ b/juddi-rest-cxf/src/test/java/org/apache/juddi/api/impl/rest/UDDIInquiryJAXRSTest.java
@@ -56,7 +56,7 @@ import org.uddi.sub_v3.KeyBag;
public class UDDIInquiryJAXRSTest extends Assert {
private final static String ENDPOINT_ADDRESS = "http://localhost:8080/rest";
- private final static String JUDDI_BIZ = "uddi:juddi.apache.org:businesses-asf";
+ private final static String JUDDI_BIZ ="uddi:juddi.apache.org:node1";
private final static String JUDDI_SVC = "uddi:juddi.apache.org:services-inquiry";
private final static String JUDDI_BT = "uddi:juddi.apache.org:servicebindings-inquiry-ws";
private final static String JUDDI_TMODEL = "uddi:uddi.org:transport:smtp";
http://git-wip-us.apache.org/repos/asf/juddi/blob/20d9dff5/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
index 788fdf1..f7c5555 100644
--- a/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
+++ b/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
@@ -26,7 +26,7 @@
<!-- this is the 'root' username, or owner of the node -->
<publisher>root</publisher>
<!-- The key of the root business that all of the UDDI services are registered in, as defined in the install_data -->
- <businessId>uddi:juddi.apache.org:businesses-asf</businessId>
+ <businessId>uddi:juddi.apache.org:node1</businessId>
<partition>uddi:juddi.apache.org</partition>
</root>
<seed>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[04/28] juddi git commit: JUDDI-241 working change journal NOJIRA
removing a number of unnecessary TODO statements
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 32fe3f8..5f97703 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -17,38 +17,48 @@
package org.apache.juddi.api.impl;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Queue;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
+import javax.persistence.Query;
+import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.ws.BindingProvider;
import org.apache.commons.configuration.ConfigurationException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.api.util.PublicationQuery;
+import static org.apache.juddi.api.impl.AuthenticatedService.logger;
import org.apache.juddi.api.util.QueryStatus;
import org.apache.juddi.api.util.ReplicationQuery;
import org.apache.juddi.config.AppConfig;
import org.apache.juddi.config.PersistenceManager;
import org.apache.juddi.config.Property;
import org.apache.juddi.mapping.MappingApiToModel;
+import org.apache.juddi.mapping.MappingModelToApi;
+import org.apache.juddi.model.BusinessEntity;
+import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.Node;
-import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.model.Tmodel;
+import static org.apache.juddi.replication.ReplicationNotifier.FetchEdges;
import org.apache.juddi.v3.client.UDDIService;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
-import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidateReplication;
-import org.uddi.api_v3.DispositionReport;
-import org.uddi.api_v3.Result;
+import org.uddi.api_v3.OperationalInfo;
import org.uddi.custody_v3.DiscardTransferToken;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.DoPing;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
+import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.repl_v3.TransferCustody;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIReplicationPortType;
@@ -69,15 +79,271 @@ import org.uddi.v3_service.UDDIReplicationPortType;
*/
public class UDDIReplicationImpl extends AuthenticatedService implements UDDIReplicationPortType {
- private static Log log = LogFactory.getLog(UDDIReplicationImpl.class);
private UDDIServiceCounter serviceCounter;
+ private static PullTimerTask timer = null;
+ private long startBuffer = 20000l;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ private long interval = 300000l;// AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+
+ private static UDDIPublicationImpl pub = null;
+
public UDDIReplicationImpl() {
super();
+ if (pub == null) {
+ pub = new UDDIPublicationImpl();
+ }
serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
+ Init();
+ try {
+ startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ } catch (ConfigurationException ex) {
+ logger.fatal(ex);
+ }
}
+ private synchronized void Init() {
+ if (queue == null) {
+ queue = new ConcurrentLinkedDeque<NotifyChangeRecordsAvailable>();
+ }
+ timer = new PullTimerTask();
+
+ }
+
+ private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
+ if (changesAlreadySeen != null) {
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
+ && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private class PullTimerTask extends TimerTask {
+
+ private Timer timer = null;
+
+ public PullTimerTask() {
+ super();
+ timer = new Timer(true);
+ timer.scheduleAtFixedRate(this, startBuffer, interval);
+ }
+
+ @Override
+ public void run() {
+
+ //ok someone told me there's a change available
+ while (!queue.isEmpty()) {
+ NotifyChangeRecordsAvailable poll = queue.poll();
+ if (poll != null) {
+ UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
+ try {
+ //ok now get all the changes
+ List<ChangeRecord> records
+ = replicationClient.getChangeRecords(node,
+ null, null, poll.getChangesAvailable());
+ //ok now we need to persist the change records
+ for (int i = 0; i < records.size(); i++) {
+ PersistChangeRecord(records.get(i));
+ }
+ } catch (Exception ex) {
+ logger.equals(ex);
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean cancel() {
+ timer.cancel();
+ return super.cancel();
+ }
+
+ /**
+ * someone told me there's a change available, we retrieved it
+ * and are processing the changes locally
+ *
+ * @param rec
+ */
+ private void PersistChangeRecord(ChangeRecord rec) {
+ if (rec == null) {
+ return;
+ }
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ /**
+ * In nodes that support pre-bundled replication
+ * responses, the recipient of the get_changeRecords
+ * message MAY return more change records than requested
+ * by the caller. In this scenario, the caller MUST also
+ * be prepared to deal with such redundant changes where
+ * a USN is less than the USN specified in the
+ * changesAlreadySeen highWaterMarkVector.
+ */
+ try {
+ tx.begin();
+ //the change record rec must also be persisted!!
+ em.persist(MappingApiToModel.mapChangeRecord(rec));
+ //<editor-fold defaultstate="collapsed" desc="delete a record">
+
+ if (rec.getChangeRecordDelete() != null) {
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
+ //delete a binding template
+ pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
+ //delete a business
+ pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
+ //delete a service
+ pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
+ }
+ if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getTModelKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getTModelKey())) {
+ //delete a tmodel
+ /**
+ * The changeRecordDelete for a
+ * tModel does not correspond to
+ * any API described in this
+ * specification and should only
+ * appear in the replication
+ * stream as the result of an
+ * administrative function to
+ * permanently remove a tModel.
+ */
+ pub.deleteTModel(rec.getChangeRecordDelete().getTModelKey(), em);
+ }
+ }
+ if (rec.getChangeRecordDeleteAssertion() != null && rec.getChangeRecordDeleteAssertion().getPublisherAssertion() != null) {
+ //delete a pa template
+ pub.deletePublisherAssertion(rec.getChangeRecordDeleteAssertion().getPublisherAssertion(), em);
+ }
+
+//</editor-fold>
+ //<editor-fold defaultstate="collapsed" desc="New Data">
+ if (rec.getChangeRecordNewData() != null) {
+
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
+ throw new Exception("Inbound replication data is missiong node id!");
+ }
+
+ //The operationalInfo element MUST contain the operational information associated with the indicated new data.
+ if (rec.getChangeRecordNewData().getOperationalInfo() == null) {
+ logger.warn("Inbound replication data does not have the required OperationalInfo element and is NOT spec compliant. Data will be ignored");
+ } else {
+ if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
+ //fetch the binding template if it exists already
+ //if it exists,
+ // confirm the owning node, it shouldn't be the local node id, if it is, throw
+ // the owning node should be the same as it was before
+
+ BusinessService model = em.find(org.apache.juddi.model.BusinessService.class, rec.getChangeRecordNewData().getBindingTemplate().getServiceKey());
+ if (model == null) {
+ logger.error("Replication error, attempting to insert a binding where the service doesn't exist yet");
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+
+ org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
+ MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getBusinessEntity() != null) {
+
+ BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
+ if (model == null) {
+ model = new BusinessEntity();
+ } else {
+ ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
+ }
+ MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+
+ }
+ if (rec.getChangeRecordNewData().getBusinessService() != null) {
+ BusinessEntity find = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessService().getBusinessKey());
+ if (find == null) {
+ logger.error("Replication error, attempting to insert a service where the business doesn't exist yet");
+ } else {
+ org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
+ MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ } else if (rec.getChangeRecordNewData().getTModel() != null) {
+ Tmodel model = new Tmodel();
+ MappingApiToModel.mapTModel(rec.getChangeRecordNewData().getTModel(), model);
+
+ MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+
+ em.persist(model);
+ }
+
+ }
+
+ }
+//</editor-fold>
+
+ // changeRecordNull no action needed
+ // changeRecordHide tmodel only
+ //<editor-fold defaultstate="collapsed" desc="hide tmodel">
+ if (rec.getChangeRecordHide() != null) {
+ /*
+ A changeRecordHide element corresponds to the behavior of hiding a tModel described in the delete_tModel in the Publish API section of this Specification. A tModel listed in a changeRecordHide should be marked as hidden, so that it is not returned in response to a find_tModel API call.
+
+ The changeRecordHide MUST contain a modified timestamp to allow multi-node registries to calculate consistent modifiedIncludingChildren timestamps as described in Section 3.8 operationalInfo Structure.
+ */
+ String key = rec.getChangeRecordHide().getTModelKey();
+ org.apache.juddi.model.Tmodel existing = em.find(org.apache.juddi.model.Tmodel.class, key);
+ if (existing == null) {
+ logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
+ } else {
+ existing.setDeleted(true);
+ existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
+ em.persist(existing);
+ }
+ }
+//</editor-fold>
+
+ //<editor-fold defaultstate="collapsed" desc="changeRecordPublisherAssertion">
+ if (rec.getChangeRecordPublisherAssertion() != null) {
+//TODO implement
+ }
+//</editor-fold>
+
+ tx.commit();
+
+ } catch (Exception drfm) {
+ logger.warn(drfm);
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ }
+
+ private static void ValidateNodeIdMatches(String nodeId, OperationalInfo operationalInfo) throws Exception {
+ if (nodeId == null || operationalInfo == null) {
+ throw new Exception("either the local node ID is null or the inbound replication data's node id is null");
+ }
+ if (!nodeId.equals(operationalInfo.getNodeID())) {
+ throw new Exception("node id mismatch!");
+ }
+ }
+
private synchronized UDDIReplicationPortType getReplicationClient(String node) {
if (cache.containsKey(node)) {
return cache.get(node);
@@ -92,7 +358,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
cache.put(node, replicationClient);
return replicationClient;
} catch (Exception ex) {
- log.fatal("Node not found!" + node, ex);
+ logger.fatal("Node not found!" + node, ex);
} finally {
if (tx.isActive()) {
tx.rollback();
@@ -115,82 +381,229 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
long startTime = System.currentTimeMillis();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
- try {
- return AppConfig.getConfiguration().getString(Property.JUDDI_NODE_ROOT_BUSINESS);
- } catch (ConfigurationException ex) {
- log.fatal("Unable to load configuration!", ex);
- }
- throw new FatalErrorException(new ErrorMessage("errors.configuration.Retrieval"));
+
+ return node;
+
}
+ @Override
public List<ChangeRecord> getChangeRecords(String requestingNode,
- HighWaterMarkVectorType changesAlreadySeen,
- BigInteger responseLimitCount,
- HighWaterMarkVectorType responseLimitVector)
- throws DispositionReportFaultMessage {
+ HighWaterMarkVectorType changesAlreadySeen,
+ BigInteger responseLimitCount,
+ HighWaterMarkVectorType responseLimitVector)
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
- QueryStatus.SUCCESS, procTime);
- //TODO fetch all records that have changed since changesAlreadySeen
- ChangeRecord r = new ChangeRecord();
-
- ValidateReplication.unsupportedAPICall();
- return null;
+ new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
+
+ //TODO should we validate that "requestingNode" is in the replication config?
+ List<ChangeRecord> ret = new ArrayList<ChangeRecord>();
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+
+ /**
+ * More specifically, the recipient determines the particular
+ * change records that are returned by comparing the originating
+ * USNs in the caller’s high water mark vector with the
+ * originating USNs of each of the changes the recipient has
+ * seen from others or generated by itself. The recipient SHOULD
+ * only return change records that have originating USNs that
+ * are greater than those listed in the changesAlreadySeen
+ * highWaterMarkVector and less than the limit required by
+ * either the responseLimitCount or the responseLimitVector.
+ *
+ *
+ * Part of the message is a high water mark vector that contains
+ * for each node of the registry the originating USN of the most
+ * recent change record that has been successfully processed by
+ * the invocating node
+ */
+ int maxrecords = 100;
+ if (responseLimitCount != null) {
+ maxrecords = responseLimitCount.intValue();
+ }
+ try {
+ tx.begin();
+ Long firstrecord = 1L;
+ Long lastrecord = null;
+
+ if (changesAlreadySeen != null) {
+ //this is basically a lower limit (i.e. the newest record that was processed by the requestor
+ //therefore we want the oldest record stored locally to return to the requestor for processing
+ for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
+ }
+ }
+ }
+ if (responseLimitVector != null) {
+ //using responseLimitVector, indicating for each node in the graph the first change originating there that he does not wish to be returned.
+ //upper limit basically
+ for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ lastrecord = responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN();
+ }
+ }
+ }
+
+ Query createQuery = null;
+ if (lastrecord != null) {
+ createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node and e.id < :lastrecord) OR (e.originatingUSN > :inbound and e.nodeID != :node and e.originatingUSN < :lastrecord) order by e.id ASC");
+ createQuery.setParameter("lastrecord", lastrecord);
+ } else {
+ createQuery = em.createQuery("select e from ChangeRecord e where (e.id > :inbound and e.nodeID = :node) OR (e.originatingUSN > :inbound and e.nodeID != :node) order by e.id ASC");
+ }
+ createQuery.setMaxResults(maxrecords);
+ createQuery.setParameter("inbound", firstrecord);
+ createQuery.setParameter("node", node);
+
+ List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) (org.apache.juddi.model.ChangeRecord) createQuery.getResultList();
+ for (int i = 0; i < records.size(); i++) {
+ ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
+ if (!Excluded(changesAlreadySeen, r)) {
+ ret.add(r);
+ }
+
+ }
+
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_CHANGERECORDS,
+ QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception ex) {
+ logger.fatal("Error, this node is: " + node, ex);
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ return ret;
}
+ /**
+ * This UDDI API message provides a means to obtain a list of
+ * highWaterMark element containing the highest known USN for all nodes
+ * in the replication graph. If there is no graph, we just return the
+ * local bits
+ *
+ * @return
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
public List<ChangeRecordIDType> getHighWaterMarks()
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
- long procTime = System.currentTimeMillis() - startTime;
- serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
+
+ List<ChangeRecordIDType> ret = new ArrayList<ChangeRecordIDType>();
//fetch from database the highest known watermark
- ValidateReplication.unsupportedAPICall();
- return null;
+ ReplicationConfiguration FetchEdges = FetchEdges();
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ if (FetchEdges != null) {
+ Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
+ while (it.hasNext()) {
+ String nextNode = it.next();
+ if (!nextNode.equals(node)) {
+
+ Long id = (Long) em.createQuery("select e.originatingUSN from ChangeRecord e where e.nodeID = :node order by e.originatingUSN desc").setParameter("node", nextNode).setMaxResults(1).getSingleResult();
+ if (id == null) {
+ id = 0L;
+ //per the spec
+ }
+ ChangeRecordIDType x = new ChangeRecordIDType(nextNode, id);
+ ret.add(x);
+ }
+ }
+ }
+ //dont forget this node
+ Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc").setParameter("node", node).setMaxResults(1).getSingleResult();
+ if (id == null) {
+ id = 0L;
+ }
+ ChangeRecordIDType x = new ChangeRecordIDType();
+ x.setNodeID(node);
+ x.setOriginatingUSN(id);
+ ret.add(x);
+
+ tx.rollback();
+ long procTime = System.currentTimeMillis() - startTime;
+ serviceCounter.update(ReplicationQuery.GET_HIGHWATERMARKS, QueryStatus.SUCCESS, procTime);
+
+ } catch (Exception drfm) {
+ throw new FatalErrorException(new ErrorMessage("E_fatalError", drfm.getMessage()));
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+
+ return ret;
}
+ /**
+ * this means that another node has a change and we need to pick up the
+ * change and apply it to our local database.
+ *
+ * @param body
+ * @throws DispositionReportFaultMessage
+ */
+ @Override
public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(ReplicationQuery.NOTIFY_CHANGERECORDSAVAILABLE,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
//some other node just told us there's new records available, call
//getChangeRecords from the remote node asynch
- ValidateReplication.unsupportedAPICall();
+ new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
+
+ queue.add(body);
+
+ //ValidateReplication.unsupportedAPICall();
}
+ private static Queue<NotifyChangeRecordsAvailable> queue = null;
+ /**
+ * transfers custody of an entity from node1/user1 to node2/user2
+ *
+ * @param body
+ * @throws DispositionReportFaultMessage
+ */
public void transferCustody(TransferCustody body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
-
//*this node is transfering data to another node
//body.getTransferOperationalInfo().
-
-
ValidateReplication.unsupportedAPICall();
EntityManager em = PersistenceManager.getEntityManager();
//EntityTransaction tx = em.getTransaction();
-
//The custodial node must verify that it has granted permission to transfer the entities identified and that this permission is still valid. This operation is comprised of two steps:
//1. Verification that the transferToken was issued by it, that it has not expired, that it represents the authority to transfer no more and no less than those entities identified by the businessKey and tModelKey elements and that all these entities are still valid and not yet transferred. The transferToken is invalidated if any of these conditions are not met.
//2. If the conditions above are met, the custodial node will prevent any further changes to the entities identified by the businessKey and tModelKey elements identified. The entity will remain in this state until the replication stream indicates it has been successfully processed via the replication stream.
-
//Upon successful verification of the custody transfer request by the custodial node, an empty message is returned by it indicating the success of the request and acknowledging the custody transfer.
-
//Following the issue of the empty message, the custodial node will submit into the replication stream a changeRecordNewData providing in the operationalInfo, the nodeID accepting custody of the datum and the authorizedName of the publisher accepting ownership. The acknowledgmentRequested attribute of this change record MUST be set to "true".
//TODO enqueue Replication message
-
//Finally, the custodial node invalidates the transferToken in order to prevent additional calls of the transfer_entities API.
DiscardTransferToken dtt = new DiscardTransferToken();
dtt.setKeyBag(body.getKeyBag());
dtt.setTransferToken(body.getTransferToken());
new UDDICustodyTransferImpl().discardTransferToken(dtt);
}
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/8b95902b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Install.java b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
index cd83040..63cbf97 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Install.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
@@ -46,9 +46,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.ClassUtil;
import org.apache.juddi.api.impl.UDDIInquiryImpl;
+import org.apache.juddi.api.impl.UDDIPublicationImpl;
import org.apache.juddi.keygen.KeyGenerator;
import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.model.UddiEntityPublisher;
+import org.apache.juddi.replication.ReplicationNotifier;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
import org.apache.juddi.v3.error.InvalidKeyPassedException;
@@ -56,6 +58,7 @@ import org.apache.juddi.v3.error.KeyUnavailableException;
import org.apache.juddi.v3.error.ValueNotAllowedException;
import org.apache.juddi.validation.ValidatePublish;
import org.apache.juddi.validation.ValidateUDDIKey;
+import org.uddi.api_v3.SaveBusiness;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModel;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -288,7 +291,7 @@ public class Install {
for (org.apache.juddi.model.BusinessService service : modelBusinessEntity.getBusinessServices()) {
service.setAuthorizedName(rootPublisher.getAuthorizedName());
- service.setNodeId(nodeId);
+ service.setNodeId(modelBusinessEntity.getNodeId());
service.setCreated(now);
service.setModified(now);
service.setModifiedIncludingChildren(now);
@@ -310,6 +313,9 @@ public class Install {
}
em.persist(modelBusinessEntity);
+ SaveBusiness sb = new SaveBusiness();
+ sb.getBusinessEntity().add(rootBusinessEntity);
+ ReplicationNotifier.Enqueue(UDDIPublicationImpl.getChangeRecord(modelBusinessEntity, rootBusinessEntity, modelBusinessEntity.getNodeId()));
return modelBusinessEntity.getEntityKey();
@@ -485,6 +491,10 @@ public class Install {
modelTModel.setNodeId(nodeId);
em.persist(modelTModel);
+
+ SaveTModel stm = new SaveTModel();
+ stm.getTModel().add(apiTModel);
+ ReplicationNotifier.Enqueue(UDDIPublicationImpl.getChangeRecord(modelTModel, apiTModel, nodeId));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[15/28] juddi git commit: JUDDI-241 get/set replication cfg now works
for all sub elements. notify changes works,
however getChangeRecords fails when called from within the tomcat container.
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
index e2e11ca..132c530 100644
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
@@ -16,6 +16,7 @@
*/
package org.apache.juddi.replication;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Queue;
@@ -25,6 +26,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
+import javax.xml.bind.JAXB;
import javax.xml.ws.BindingProvider;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
@@ -41,6 +43,7 @@ import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
+import org.uddi.repl_v3.Operator;
import org.uddi.v3_service.UDDIReplicationPortType;
/**
@@ -104,6 +107,7 @@ public class ReplicationNotifier extends TimerTask {
tx = em.getTransaction();
tx.begin();
+
em.persist(j);
tx.commit();
} catch (Exception ex) {
@@ -111,6 +115,7 @@ public class ReplicationNotifier extends TimerTask {
if (tx != null && tx.isActive()) {
tx.rollback();
}
+ JAXB.marshal(MappingModelToApi.mapChangeRecord(j), System.out);
} finally {
em.close();
}
@@ -121,7 +126,7 @@ public class ReplicationNotifier extends TimerTask {
//TODO figure out what this statement means 7.5.3
/**
* In the absence of a communicationGraph element from the
- * Replication Configuration Structure, all nodes listed in the
+ * Replication Configuration Structure (although it's mandatory in the xsd), all nodes listed in the
* node element MAY send any and all messages to any other node
* of the registry.
*/
@@ -130,37 +135,60 @@ public class ReplicationNotifier extends TimerTask {
return;
}
+ List<String> destinationUrls = new ArrayList<String>();
+
+ for (Operator o:repcfg.getOperator())
+ {
+ //no need to tell myself about a change at myself
+ if (!o.getOperatorNodeID().equalsIgnoreCase(node))
+ destinationUrls.add(o.getSoapReplicationURL());
+ }
+ /*
+ Iterator<String> iterator = repcfg.getCommunicationGraph().getNode().iterator();
+ while (iterator.hasNext()) {
+ String next = iterator.next();
+
+ Node destinationNode = getNode(next);
+ if (destinationNode == null) {
+ log.warn(next + " node was not found, cannot deliver replication messages");
+ } else {
+ destinationUrls.add(destinationNode.getReplicationUrl());
+ }
+ }
Iterator<CommunicationGraph.Edge> it = repcfg.getCommunicationGraph().getEdge().iterator();
while (it.hasNext()) {
//send each change set to the replication node in the graph
- UDDIReplicationPortType x = new UDDIService().getUDDIReplicationPort();
+
CommunicationGraph.Edge next = it.next();
//next.getMessageReceiver(); //Node ID
- Node destinationNode = getNode(next.getMessageSender());
+ Node destinationNode = getNode(next.getMessageReceiver());
if (destinationNode == null) {
- log.warn(next.getMessageSender() + " node was not found, cannot deliver replication messages");
+ log.warn(next.getMessageReceiver() + " node was not found, cannot deliver replication messages");
} else {
- //TODO the spec talks about control messages, should we even support it? seems pointless
- ((BindingProvider) x).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, destinationNode.getReplicationUrl());
- NotifyChangeRecordsAvailable req = new NotifyChangeRecordsAvailable();
-
- req.setNotifyingNode(node);
- HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
-
- highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(node, j.getId()));
- req.setChangesAvailable(highWaterMarkVectorType);
-
- try {
- x.notifyChangeRecordsAvailable(req);
- log.info("Successfully sent change record available message to " + destinationNode.getName());
- } catch (Exception ex) {
- log.warn("Unable to send change notification to " + destinationNode.getName(), ex);
- }
+ destinationUrls.add(destinationNode.getReplicationUrl());
}
- }
+ }*/
+ for (String s : destinationUrls) {
+ //TODO the spec talks about control messages, should we even support it? seems pointless
+ UDDIReplicationPortType x = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) x).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, s);
+ NotifyChangeRecordsAvailable req = new NotifyChangeRecordsAvailable();
+
+ req.setNotifyingNode(node);
+ HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
+ highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(node, j.getId()));
+ req.setChangesAvailable(highWaterMarkVectorType);
+
+ try {
+ x.notifyChangeRecordsAvailable(req);
+ log.info("Successfully sent change record available message to " + s);
+ } catch (Exception ex) {
+ log.warn("Unable to send change notification to " + s, ex);
+ }
+ }
}
public synchronized void run() {
@@ -193,19 +221,19 @@ public class ReplicationNotifier extends TimerTask {
try {
tx = em.getTransaction();
tx.begin();
- Query q = em.createQuery("SELECT item FROM ReplicationConfiguration item");
+ Query q = em.createQuery("SELECT item FROM ReplicationConfiguration item order by item.serialNumber DESC");
q.setMaxResults(1);
- List<ReplicationConfiguration> results = (List<ReplicationConfiguration>) q.getResultList();
+ ReplicationConfiguration results = (ReplicationConfiguration) q.getSingleResult();
// ReplicationConfiguration find = em.find(ReplicationConfiguration.class, null);
- if (results != null && !results.isEmpty()) {
- MappingModelToApi.mapReplicationConfiguration(results.get(0), item);
- } else {
- item = null;
+ if (results != null) {
+ MappingModelToApi.mapReplicationConfiguration(results, item);
}
+
tx.commit();
return item;
} catch (Exception ex) {
- log.error("error", ex);
+ //log.error("error", ex);
+ //no config available
if (tx != null && tx.isActive()) {
tx.rollback();
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
index 07fe653..573f39b 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
@@ -87,7 +87,7 @@ public class ValidateNode extends ValidateUDDIApi {
throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoPUB"));
}
if (node.getSubscriptionListenerUrl() == null || node.getSubscriptionListenerUrl().length() == 0 || node.getSubscriptionListenerUrl().length() > 255) {
- throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoSUBL"));
+ // throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoSUBL"));
}
if (node.getReplicationUrl() == null || node.getReplicationUrl().length() == 0 || node.getReplicationUrl().length() > 255) {
//throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoSUBL"));
@@ -96,6 +96,9 @@ public class ValidateNode extends ValidateUDDIApi {
if (node.getSubscriptionUrl() == null || node.getSubscriptionUrl().length() == 0 || node.getSubscriptionUrl().length() > 255) {
throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoSUB"));
}
+ if (node.getSecurityUrl()== null || node.getSecurityUrl().length() == 0 || node.getSecurityUrl().length() > 255) {
+ throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoSec"));
+ }
if (node.getProxyTransport() == null || node.getProxyTransport().length() == 0 || node.getProxyTransport().length() > 255) {
throw new ValueNotAllowedException(new ErrorMessage("errors.node.NoProxy"));
} else {
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index 6ede348..97da3ff 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -17,6 +17,7 @@
package org.apache.juddi.validation;
import java.math.BigInteger;
+import java.util.List;
import javax.persistence.EntityManager;
import javax.xml.ws.WebServiceContext;
import org.apache.juddi.model.Node;
@@ -28,6 +29,7 @@ import org.apache.juddi.v3.error.ValueNotAllowedException;
import org.uddi.repl_v3.CommunicationGraph.Edge;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
+import org.uddi.repl_v3.Operator;
import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -115,31 +117,46 @@ public class ValidateReplication extends ValidateUDDIApi {
return false;
}
- public void validateSetReplicationNodes(ReplicationConfiguration replicationConfiguration, EntityManager em) throws DispositionReportFaultMessage {
+ public void validateSetReplicationNodes(ReplicationConfiguration replicationConfiguration, EntityManager em, String thisnode) throws DispositionReportFaultMessage {
if (replicationConfiguration == null) {
throw new InvalidValueException(new ErrorMessage("errors.replication.configNull"));
}
+ if (replicationConfiguration.getCommunicationGraph() == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNull"));
+ }
+ if (replicationConfiguration.getRegistryContact() == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.contactNull"));
+ }
+ if (replicationConfiguration.getRegistryContact().getContact() == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.contactNull"));
+ }
+ if (replicationConfiguration.getRegistryContact().getContact().getPersonName().get(0) == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.contactNull"));
+ }
+
if (replicationConfiguration.getCommunicationGraph() != null) {
for (String s : replicationConfiguration.getCommunicationGraph().getNode()) {
- Node find = em.find(org.apache.juddi.model.Node.class, s);
- if (find == null) {
+ if (!Contains(replicationConfiguration.getOperator(), s)) {
throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
}
}
for (Edge s : replicationConfiguration.getCommunicationGraph().getEdge()) {
- Node find = em.find(org.apache.juddi.model.Node.class, s.getMessageReceiver());
- if (find == null) {
+ //TODO revisit this for correctness
+ //Node find = null;
+ //if (!thisnode.equalsIgnoreCase(s.getMessageReceiver())) {
+ if (!Contains(replicationConfiguration.getOperator(), s.getMessageReceiver())) {
throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ //}
}
- find = null;
- find = em.find(org.apache.juddi.model.Node.class, s.getMessageSender());
- if (find == null) {
+ //find = null;
+ //if (!thisnode.equalsIgnoreCase(s.getMessageSender())) {
+ if (!Contains(replicationConfiguration.getOperator(), s.getMessageSender())) {
throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ //}
}
for (String id : s.getMessageReceiverAlternate()) {
- find = em.find(org.apache.juddi.model.Node.class, id);
- if (find == null) {
+ if (!Contains(replicationConfiguration.getOperator(), id)) {
throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
}
}
@@ -148,4 +165,16 @@ public class ValidateReplication extends ValidateUDDIApi {
}
}
+ private boolean Contains(List<Operator> operator, String s) {
+ if (operator == null) {
+ return false;
+ }
+ for (Operator o : operator) {
+ if (o.getOperatorNodeID().equalsIgnoreCase(s)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 0a23c78..95d98ce 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -243,6 +243,7 @@ errors.node.NoPUB=A publish url was not specified
errors.node.NoIN=A inquiry url was not specified
errors.node.NoSUBL=A subscription listener url was not specified
errors.node.NoSUB=A subscription url was not specified
+errors.node.NoSec=A security url was not specified
errors.node.NoProxy=A transport proxy class must be specified. If you're not sure, use 'org.apache.juddi.v3.client.transport.JAXWSTransport'
errors.node.illegalProxyTransport=The transport proxy class is invalid. If you're not sure, use 'org.apache.juddi.v3.client.transport.JAXWSTransport'
errors.node.NoRMIData=When using org.apache.juddi.v3.client.transport.RMITransport the factory settings must be specified
@@ -291,6 +292,7 @@ errors.replication.bothLimitsSpecified=responseLimitCount or responseLimitVector
errors.replication.negativeLimit=The specified response limit is either 0 or a negative number.
errors.replication.limitVectorNull=The high water mark vector limit specified OriginatingUSN is null or invalid
errors.replication.limitVectorNoNode=No node name was specified
-errors.replication.configNodeNotFound=No specified node name is not currently registered as a node. Use the jUDDI Service API to register it. Node id:
+errors.replication.configNodeNotFound=No specified node name is not currently listed as a Operator. Add it to the list and try again. Id:
errors.replication.configNull=No replication config was present in the message
+errors.replication.contactNull=No replication contact was present in the message
errors.deleteNode.InReplicationConfig=The node to be deleted is currently referenced in the replication configuration. You must revise the configuration before deleting the node,
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index f64512f..98bdb0b 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -19,6 +19,7 @@ import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.List;
import java.util.UUID;
+import javax.xml.bind.JAXB;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,12 +41,16 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.uddi.api_v3.Contact;
import org.uddi.api_v3.DispositionReport;
+import org.uddi.api_v3.PersonName;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.DoPing;
import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.repl_v3.Operator;
+import org.uddi.repl_v3.OperatorStatusType;
import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDIReplicationPortType;
@@ -126,8 +131,8 @@ public class API_160_ReplicationTest {
}
/**
- * add a clerk and node, delete the clerk, then check that the node is still there
- * it should have been deleted
+ * add a clerk and node, delete the clerk, then check that the node is
+ * still there it should have been deleted
*
* @throws Exception
*/
@@ -177,13 +182,13 @@ public class API_160_ReplicationTest {
//TODO revise cascade deletes on nodes and clerks
Assert.fail("node unexpectedly deleted");
}
-
-
+
/**
* add clerk + node, try to delete the node
- * @throws Exception
+ *
+ * @throws Exception
*/
- @Test
+ @Test
public void testAddClerkNodeThenDelete2() throws Exception {
SaveClerk sc = new SaveClerk();
sc.setAuthInfo(authInfoRoot);
@@ -210,8 +215,7 @@ public class API_160_ReplicationTest {
juddi.deleteNode(new DeleteNode(authInfoRoot, c.getNode().getName()));
//this should success
-
-
+
//the clerk should be gone too
ClerkList allNodes = juddi.getAllClerks(authInfoRoot);
boolean found = false;
@@ -227,10 +231,10 @@ public class API_160_ReplicationTest {
NodeList allNodes1 = juddi.getAllNodes(authInfoRoot);
for (int i = 0; i < allNodes1.getNode().size(); i++) {
if (allNodes1.getNode().get(i).getName().equals(c.getNode().getName())) {
- Assert.fail("node is still there!");
+ Assert.fail("node is still there!");
}
}
-
+
}
@Test
@@ -264,14 +268,12 @@ public class API_160_ReplicationTest {
juddi.saveNode(saveNode);
juddi.saveClerk(sc);
-
+
//success
-
-
//delete it
- juddi.deleteClerk(new DeleteClerk(authInfoRoot,c.getName()));
- System.out.println(c.getName()+" deleted");
-
+ juddi.deleteClerk(new DeleteClerk(authInfoRoot, c.getName()));
+ System.out.println(c.getName() + " deleted");
+
juddi.deleteNode(new DeleteNode(authInfoRoot, c.getNode().getName()));
//confirm it's gone
NodeList allNodes = juddi.getAllNodes(authInfoRoot);
@@ -288,30 +290,23 @@ public class API_160_ReplicationTest {
@Test
public void setReplicationConfig() throws Exception {
- Node node = new Node();
- node.setName("test_node");
- node.setClientName("test_client");
- node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
- node.setCustodyTransferUrl("http://localhost");
- node.setDescription("http://localhost");
- node.setInquiryUrl("http://localhost");
- node.setPublishUrl("http://localhost");
- node.setReplicationUrl("http://localhost");
- node.setSecurityUrl("http://localhost");
- node.setSubscriptionListenerUrl("http://localhost");
- node.setSubscriptionUrl("http://localhost");
-
- SaveNode saveNode = new SaveNode();
- saveNode.setAuthInfo(authInfoRoot);
- saveNode.getNode().add(node);
-
- juddi.saveNode(saveNode);
+
ReplicationConfiguration r = new ReplicationConfiguration();
+ Operator op = new Operator();
+ op.setOperatorNodeID("test_node");
+ op.setSoapReplicationURL("http://localhost");
+ op.setOperatorStatus(OperatorStatusType.NORMAL);
+
+ r.getOperator().add(op);
r.setCommunicationGraph(new CommunicationGraph());
- // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ r.getRegistryContact().setContact(new Contact());
+ r.getRegistryContact().getContact().getPersonName().add(new PersonName("test", null));
+ // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
r.getCommunicationGraph().getNode().add("test_node");
+ JAXB.marshal(r, System.out);
DispositionReport setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
ReplicationConfiguration replicationNodes = juddi.getReplicationNodes(authInfoRoot);
@@ -323,17 +318,20 @@ public class API_160_ReplicationTest {
Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
Assert.assertNotNull(replicationNodes.getSerialNumber());
long firstcommit = replicationNodes.getSerialNumber();
-
-
-
- r = new ReplicationConfiguration();
+
+ r = new ReplicationConfiguration();
+ r.getOperator().add(op);
r.setCommunicationGraph(new CommunicationGraph());
- // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ r.getRegistryContact().setContact(new Contact());
+ r.getRegistryContact().getContact().getPersonName().add(new PersonName("test", null));
+ // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
r.getCommunicationGraph().getNode().add("test_node");
- setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
+ JAXB.marshal(r, System.out);
+ setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
- replicationNodes = juddi.getReplicationNodes(authInfoRoot);
+ replicationNodes = juddi.getReplicationNodes(authInfoRoot);
Assert.assertNotNull(replicationNodes.getCommunicationGraph());
Assert.assertNotNull(replicationNodes.getCommunicationGraph().getNode());
Assert.assertEquals("test_node", replicationNodes.getCommunicationGraph().getNode().get(0));
@@ -344,4 +342,60 @@ public class API_160_ReplicationTest {
Assert.assertTrue(firstcommit < replicationNodes.getSerialNumber());
}
+
+ @Test
+ public void setReplicationConfig2() throws Exception {
+
+
+
+ ReplicationConfiguration r = new ReplicationConfiguration();
+ Operator op = new Operator();
+ op.setOperatorNodeID("test_node");
+ op.setSoapReplicationURL("http://localhost");
+ op.setOperatorStatus(OperatorStatusType.NORMAL);
+
+ r.getOperator().add(op);
+ r.setCommunicationGraph(new CommunicationGraph());
+ r.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ r.getRegistryContact().setContact(new Contact());
+ r.getRegistryContact().getContact().getPersonName().add(new PersonName("test", null));
+ // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.getCommunicationGraph().getNode().add("test_node");
+ r.getCommunicationGraph().getControlledMessage().add("doPing");
+ r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.getCommunicationGraph().getEdge().get(0).setMessageReceiver("test_node");
+ r.getCommunicationGraph().getEdge().get(0).setMessageSender("test_node");
+ r.getCommunicationGraph().getEdge().get(0).getMessage().add("doPing");
+ r.getCommunicationGraph().getEdge().get(0).getMessageReceiverAlternate().add("test_node");
+
+ DispositionReport setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
+
+ ReplicationConfiguration replicationNodes = juddi.getReplicationNodes(authInfoRoot);
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph());
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph().getNode());
+ Assert.assertEquals("test_node", replicationNodes.getCommunicationGraph().getNode().get(0));
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToGetChanges());
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToSyncRegistry());
+ Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
+ Assert.assertNotNull(replicationNodes.getSerialNumber());
+
+ }
+
+ //TODO edges can be listed only once and must be unique
+ //TODO In the absence of a communicationGraph element from the Replication Configuration Structure, all nodes listed in the node element MAY send any and all messages to any other node of the registry.
+ //implies that communicationGraph may be null or empty ,despite the xsd
+ @Test
+ public void getReplicationConfigMandatoryItems() throws Exception {
+
+ ReplicationConfiguration replicationNodes = juddi.getReplicationNodes(authInfoRoot);
+ Assert.assertNotNull(replicationNodes);
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph());
+ Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToGetChanges());
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToSyncRegistry());
+ Assert.assertNotNull(replicationNodes.getRegistryContact());
+ Assert.assertNotNull(replicationNodes.getRegistryContact().getContact());
+ Assert.assertNotNull(replicationNodes.getRegistryContact().getContact().getPersonName().get(0));
+
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
new file mode 100644
index 0000000..4c172b9
--- /dev/null
+++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2014 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.runtime;
+
+import java.math.BigInteger;
+import java.util.Random;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Endpoint;
+import junit.framework.Assert;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.v3.client.JUDDIApiService;
+import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.repl_v3.ReplicationConfiguration;
+import org.uddi.v3_service.UDDIReplicationPortType;
+import org.apache.juddi.v3.client.UDDIService;
+import org.uddi.api_v3.Contact;
+import org.uddi.api_v3.PersonName;
+import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.DoPing;
+
+/**
+ *
+ * @author alex
+ */
+public class CLIServerTest {
+
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ replication.stop();
+ replication = null;
+ juddiapi.stop();
+ juddiapi = null;
+ }
+
+ static Endpoint replication = null;
+ static Endpoint juddiapi = null;
+ static String replUrl = null;
+ static String juddiUrl = null;
+ static boolean sink = false;
+ static replicantImpl repl= new replicantImpl();
+ static juddiTestimpl jude= new juddiTestimpl();
+
+ @BeforeClass
+ public static void startManager() throws Exception {
+
+ Random r = new Random(System.currentTimeMillis());
+ replUrl = "http://localhost:" + (7000 + r.nextInt(1000)) + "/repl";
+ replication = Endpoint.publish(replUrl, repl);
+
+ juddiUrl = "http://localhost:" + (7000 + r.nextInt(1000)) + "/juddi";
+ juddiapi = Endpoint.publish(juddiUrl, jude);
+ System.out.println("Endpoint up at " + replUrl);
+ System.out.println("Endpoint up at " + juddiUrl);
+ }
+
+ @Test
+ public void testGetReplicationConfig() throws Exception {
+
+ JUDDIApiPortType juddiApiService = new JUDDIApiService().getJUDDIApiImplPort();
+ ((BindingProvider) juddiApiService).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, juddiUrl);
+ juddiApiService.getReplicationNodes(null);
+ Assert.assertTrue(sink);
+ sink = false;
+ }
+
+ @Test
+ public void testSetReplicationConfig() throws Exception {
+
+ JUDDIApiPortType juddiApiService = new JUDDIApiService().getJUDDIApiImplPort();
+ ((BindingProvider) juddiApiService).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, juddiUrl);
+ ReplicationConfiguration replicationConfiguration = new ReplicationConfiguration();
+ replicationConfiguration.setCommunicationGraph(new CommunicationGraph());
+ replicationConfiguration.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ replicationConfiguration.getRegistryContact().setContact(new Contact());
+ replicationConfiguration.getRegistryContact().getContact().getPersonName().add(new PersonName("name", null));
+
+ juddiApiService.setReplicationNodes(null, replicationConfiguration);
+ Assert.assertTrue(sink);
+ sink = false;
+ }
+
+ @Test
+ public void testReplicationGetChanges() throws Exception {
+
+ UDDIReplicationPortType juddiApiService = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) juddiApiService).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, replUrl);
+ juddiApiService.getChangeRecords(null, new HighWaterMarkVectorType(), BigInteger.ONE, new HighWaterMarkVectorType());
+ Assert.assertTrue(sink);
+ sink = false;
+ }
+ @Test
+ public void testReplicationPing() throws Exception {
+
+ UDDIReplicationPortType juddiApiService = new UDDIService().getUDDIReplicationPort();
+ ((BindingProvider) juddiApiService).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, replUrl);
+ juddiApiService.doPing(new DoPing());//null, new HighWaterMarkVectorType(), BigInteger.ONE, new HighWaterMarkVectorType());
+ Assert.assertTrue(sink);
+ sink = false;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/java/org/apache/juddi/api/runtime/juddiTestimpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/juddiTestimpl.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/juddiTestimpl.java
new file mode 100644
index 0000000..c127137
--- /dev/null
+++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/juddiTestimpl.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2014 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.runtime;
+
+import java.rmi.RemoteException;
+import java.util.List;
+import javax.jws.WebService;
+import javax.xml.ws.Holder;
+import org.apache.juddi.api_v3.AdminSaveBusinessWrapper;
+import org.apache.juddi.api_v3.AdminSaveTModelWrapper;
+import org.apache.juddi.api_v3.ClerkDetail;
+import org.apache.juddi.api_v3.ClerkList;
+import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
+import org.apache.juddi.api_v3.DeleteClerk;
+import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
+import org.apache.juddi.api_v3.DeleteNode;
+import org.apache.juddi.api_v3.DeletePublisher;
+import org.apache.juddi.api_v3.GetAllPublisherDetail;
+import org.apache.juddi.api_v3.GetPublisherDetail;
+import org.apache.juddi.api_v3.NodeDetail;
+import org.apache.juddi.api_v3.NodeList;
+import org.apache.juddi.api_v3.PublisherDetail;
+import org.apache.juddi.api_v3.SaveClerk;
+import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
+import org.apache.juddi.api_v3.SaveNode;
+import org.apache.juddi.api_v3.SavePublisher;
+import org.apache.juddi.api_v3.SubscriptionWrapper;
+import org.apache.juddi.api_v3.SyncSubscription;
+import org.apache.juddi.api_v3.SyncSubscriptionDetail;
+import org.apache.juddi.v3_service.JUDDIApiPortType;
+import org.uddi.api_v3.Contact;
+import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.DispositionReport;
+import org.uddi.api_v3.PersonName;
+import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.ReplicationConfiguration;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+
+/**
+ *
+ * @author alex
+ */
+
+@WebService(serviceName = "JUDDIApiService",
+ endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
+ targetNamespace = "urn:juddi-apache-org:v3_service")
+public class juddiTestimpl implements JUDDIApiPortType {
+
+
+ @Override
+ public PublisherDetail getPublisherDetail(GetPublisherDetail parameters) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void deleteClientSubscriptionInfo(DeleteClientSubscriptionInfo body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ }
+
+ @Override
+ public PublisherDetail getAllPublisherDetail(GetAllPublisherDetail body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public ClerkDetail saveClerk(SaveClerk body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void deletePublisher(DeletePublisher body) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public NodeDetail saveNode(SaveNode body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public PublisherDetail savePublisher(SavePublisher body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void adminDeleteTModel(DeleteTModel body) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public ClientSubscriptionInfoDetail saveClientSubscriptionInfo(SaveClientSubscriptionInfo body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public SyncSubscriptionDetail invokeSyncSubscription(SyncSubscription syncSubscription) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public NodeList getAllNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public ClerkList getAllClerks(String authInfo) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void deleteNode(DeleteNode body) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public void deleteClerk(DeleteClerk request) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public DispositionReport adminSaveBusiness(String authInfo, List<AdminSaveBusinessWrapper> values) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public DispositionReport adminSaveTModel(String authInfo, List<AdminSaveTModelWrapper> values) throws DispositionReportFaultMessage, RemoteException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public ReplicationConfiguration getReplicationNodes(String authInfo) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ ReplicationConfiguration replicationConfiguration = new ReplicationConfiguration();
+ replicationConfiguration.setCommunicationGraph(new CommunicationGraph());
+ replicationConfiguration.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ replicationConfiguration.getRegistryContact().setContact(new Contact());
+ replicationConfiguration.getRegistryContact().getContact().getPersonName().add(new PersonName("name", null));
+
+
+ return replicationConfiguration;
+ }
+
+ @Override
+ public DispositionReport setReplicationNodes(String authInfo, ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public List<SubscriptionWrapper> getAllClientSubscriptionInfo(String authInfo) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void adminDeleteSubscription(String authInfo, List<String> subscriptionKey) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ }
+
+ @Override
+ public void adminSaveSubscription(String authInfo, String publisherOrUsername, Holder<List<Subscription>> subscriptions) throws DispositionReportFaultMessage {
+ CLIServerTest.sink = true;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
new file mode 100644
index 0000000..f984747
--- /dev/null
+++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 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.runtime;
+
+import java.math.BigInteger;
+import java.rmi.RemoteException;
+import java.util.List;
+import javax.jws.WebService;
+import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.HighWaterMarkVectorType;
+import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
+import org.uddi.repl_v3.TransferCustody;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+import org.uddi.v3_service.UDDIReplicationPortType;
+
+/**
+ *
+ * @author alex
+ */
+@WebService(serviceName = "UDDI_Replication_PortType", targetNamespace = "urn:uddi-org:repl_v3_portType",
+ endpointInterface = "org.uddi.v3_service.UDDIReplicationPortType")
+ public class replicantImpl implements UDDIReplicationPortType {
+
+ public replicantImpl(){
+ }
+
+ @Override
+ public List<ChangeRecord> getChangeRecords(String requestingNode, HighWaterMarkVectorType changesAlreadySeen, BigInteger responseLimitCount, HighWaterMarkVectorType responseLimitVector) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ }
+
+ @Override
+ public String doPing(DoPing body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public List<ChangeRecordIDType> getHighWaterMarks() throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
+
+ @Override
+ public void transferCustody(TransferCustody body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java b/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
index 0931f76..a348134 100644
--- a/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/replication/ReplicationNotifierTest.java
@@ -22,14 +22,9 @@ import org.apache.commons.logging.LogFactory;
import org.apache.juddi.Registry;
import org.apache.juddi.api.impl.API_141_JIRATest;
import org.apache.juddi.api.impl.UDDIReplicationImpl;
-import org.apache.juddi.model.ChangeRecord;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.junit.Assert.*;
import org.junit.BeforeClass;
-import org.uddi.api_v3.BusinessEntity;
-import org.uddi.api_v3.Name;
-import org.uddi.api_v3.SaveBusiness;
import org.uddi.v3_service.UDDIReplicationPortType;
/**
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/resources/META-INF/persistence.xml b/juddi-core/src/test/resources/META-INF/persistence.xml
index adc4a7e..105b67d 100644
--- a/juddi-core/src/test/resources/META-INF/persistence.xml
+++ b/juddi-core/src/test/resources/META-INF/persistence.xml
@@ -73,6 +73,9 @@
<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"/>
<property name="hibernate.hbm2ddl.auto" value="update"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-core/src/test/resources/META-INF/uddi.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/resources/META-INF/uddi.xml b/juddi-core/src/test/resources/META-INF/uddi.xml
index 633da90..f2e993a 100644
--- a/juddi-core/src/test/resources/META-INF/uddi.xml
+++ b/juddi-core/src/test/resources/META-INF/uddi.xml
@@ -27,6 +27,30 @@
<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
</node>
+ <node>
+ <!-- required 'default' node -->
+ <name>jaxws</name>
+ <description>e</description>
+ <properties>
+ <property name="serverName" value="localhost" />
+ <property name="serverPort" value="8080" />
+ <!-- for UDDI nodes that use HTTP u/p, using the following
+ <property name="basicAuthUsername" value="root" />
+ <property name="basicAuthPassword" value="password" />
+ <property name="basicAuthPasswordIsEncrypted" value="false" />
+ <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+ </properties>
+ <!-- In VM Transport Settings -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport�</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ </node>
</nodes>
<clerks registerOnStartup="false">
<clerk name="joe" node="default" publisher="joepublisher" password="joepublisher" isPasswordEncrypted="false" cryptoProvider="">
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml b/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
index aa08feb..225f6b2 100644
--- a/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
+++ b/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
@@ -78,7 +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.ReplicationMessage</class>
+ <class>org.apache.juddi.model.ReplicationConfigurationNode</class>
+ <class>org.apache.juddi.model.EdgeReceiverAlternate</class>
<properties>
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
index 2f9f032..3d0dacd 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/EntryPoint.java
@@ -17,6 +17,7 @@ package org.apache.juddi.samples;
import java.util.List;
import org.apache.juddi.api_v3.Node;
+import static org.apache.juddi.samples.JuddiAdminService.clerkManager;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
@@ -73,6 +74,7 @@ public class EntryPoint {
System.out.println("35) View all registered nodes for this client");
System.out.println("36) UnRegister a node on a jUDDI server");
System.out.println("37) Fetch the replication config from a jUDDI server");
+ System.out.println("38) Set the replication config on a remote jUDDI server");
System.out.println("q) quit");
System.out.print("Selection: ");
@@ -93,7 +95,17 @@ public class EntryPoint {
if (input.equals("1")) {
UDDISecurityPortType security = null;
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
- Transport transport = clerkManager.getTransport();
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+ System.out.println();
+ System.out.println("Select a node (from *this config)");
+ for (int i = 0; i < uddiNodeList.size(); i++) {
+ System.out.print(i + 1);
+ System.out.println(") " + uddiNodeList.get(i).getName() + uddiNodeList.get(i).getDescription());
+ }
+ System.out.println("Node #: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+ String node = uddiNodeList.get(index).getName();
+ Transport transport = clerkManager.getTransport(node);
security = transport.getUDDISecurityService();
System.out.print("username: ");
String uname = System.console().readLine();
@@ -297,8 +309,11 @@ public class EntryPoint {
System.out.print("Change ID to fetch: ");
String id = (System.console().readLine());
+
+ System.out.print("Node id of something in the replication graph: ");
+ String src = (System.console().readLine());
- new UddiReplication().GetChangeRecords(key2, Long.parseLong(id));
+ new UddiReplication().GetChangeRecords(key2, Long.parseLong(id),src);
}
if (input.equals("30")) {
@@ -316,6 +331,7 @@ public class EntryPoint {
UDDINode node = new UDDINode();
System.out.print("Name (must be unique: ");
node.setClientName(System.console().readLine());
+ node.setName(node.getClientName());
System.out.print("Description: ");
node.setDescription(System.console().readLine());
@@ -338,9 +354,13 @@ public class EntryPoint {
node.setSecurityUrl(System.console().readLine());
System.out.print("Subscription URL: ");
node.setSubscriptionUrl(System.console().readLine());
+
+ System.out.print("Subscription Listener URL: ");
+ node.setSubscriptionListenerUrl(System.console().readLine());
+
System.out.print("Transport (defaults to JAXWS): ");
node.setProxyTransport(System.console().readLine());
- if (node.getProxyTransport() == null) {
+ if (node.getProxyTransport() == null || node.getProxyTransport().trim().equalsIgnoreCase("")) {
node.setProxyTransport(org.apache.juddi.v3.client.transport.JAXWSTransport.class.getCanonicalName());
}
System.out.print("Factory Initial (optional): ");
@@ -354,38 +374,37 @@ public class EntryPoint {
clerkManager.getClientConfig().saveConfig();
System.out.println("Saved.");
}
- if (input.equals("32")) {
+ if (input.equals("33")) {
//System.out.println("32) Register a *this node to a jUDDI server");
UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
System.out.println();
-
+
System.out.println("Locally defined nodes:");
for (int i = 0; i < uddiNodeList.size(); i++) {
System.out.println("________________________________________________________________________________");
- System.out.println(i + ") Node name: " + uddiNodeList.get(i).getName());
- System.out.println(i + ") Node description: " + uddiNodeList.get(i).getDescription());
- System.out.println(i + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
- System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
+ System.out.println((i + 1) + ") Node name: " + uddiNodeList.get(i).getName());
+ System.out.println((i + 1) + ") Node description: " + uddiNodeList.get(i).getDescription());
+ System.out.println((i + 1) + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
+ System.out.println((i + 1) + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
}
- System.out.println("Local Node to publish to remote jUDDI instance: ");
- int index=Integer.parseInt(System.console().readLine());
-
- System.out.println("Pick a node (remote jUDDI instance) to publish the selected node information to");
+ System.out.println("Local Source Node: ");
+ int index = Integer.parseInt(System.console().readLine()) - 1;
+
+ System.out.println("Remote Destination(s):");
for (int i = 0; i < uddiNodeList.size(); i++) {
System.out.println("________________________________________________________________________________");
- System.out.println(i + ") Node name: " + uddiNodeList.get(i).getName());
- System.out.println(i + ") Node description: " + uddiNodeList.get(i).getDescription());
- System.out.println(i + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
- System.out.println(i + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
+ System.out.println((i + 1) + ") Node name: " + uddiNodeList.get(i).getName());
+ System.out.println((i + 1) + ") Node description: " + uddiNodeList.get(i).getDescription());
+ System.out.println((i + 1) + ") Transport: " + uddiNodeList.get(i).getProxyTransport());
+ System.out.println((i + 1) + ") jUDDI URL: " + uddiNodeList.get(i).getJuddiApiUrl());
}
- System.out.println("Node to publish to remote jUDDI instance: ");
- int index2=Integer.parseInt(System.console().readLine());
-
-
- new JuddiAdminService().registerLocalNodeToRemoteNode(authtoken, uddiNodeList.get(index), uddiNodeList.get(index2));
-
+ System.out.println("Remote Destination Node to publish to: ");
+ int index2 = Integer.parseInt(System.console().readLine()) - 1;
+
+ new JuddiAdminService().registerLocalNodeToRemoteNode(authtoken, uddiNodeList.get(index), uddiNodeList.get(index2));
+
}
if (input.equals("34")) {
@@ -412,9 +431,31 @@ public class EntryPoint {
new JuddiAdminService().viewRemoveRemoteNode(authtoken);
//System.out.println("35) UnRegister a node on a jUDDI server");
}
- if (input.equals("37")){
+ if (input.equals("37")) {
new JuddiAdminService().viewReplicationConfig(authtoken);
}
+ if (input.equals("38")) {
+ new JuddiAdminService().setReplicationConfig(authtoken);
+ }
+ if (input.equals("magic")) {
+ //secret menu, setups up replication between juddi8080 and 9080 and adds a record or two on 8080
+ UDDISecurityPortType security = null;
+ UDDIClient clerkManager = new UDDIClient("META-INF/simple-publish-uddi.xml");
+
+ Transport transport = clerkManager.getTransport("default");
+ security = transport.getUDDISecurityService();
+
+ String uname = "root";
+
+ GetAuthToken getAuthTokenRoot = new GetAuthToken();
+ getAuthTokenRoot.setUserID(uname);
+ getAuthTokenRoot.setCred("root");
+ authtoken = security.getAuthToken(getAuthTokenRoot).getAuthInfo();
+ System.out.println("Success!");
+ new JuddiAdminService().autoMagic();
+
+ new UddiCreatebulk().publishBusiness(authtoken, 1, 1);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
index f87c637..9cf086f 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/JuddiAdminService.java
@@ -15,6 +15,7 @@
*/
package org.apache.juddi.samples;
+import java.math.BigInteger;
import java.rmi.RemoteException;
import java.util.List;
import javax.xml.bind.JAXB;
@@ -33,9 +34,16 @@ import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.AuthToken;
+import org.uddi.api_v3.Contact;
+import org.uddi.api_v3.Description;
import org.uddi.api_v3.DispositionReport;
+import org.uddi.api_v3.Email;
import org.uddi.api_v3.GetAuthToken;
+import org.uddi.api_v3.PersonName;
+import org.uddi.api_v3.Phone;
import org.uddi.repl_v3.CommunicationGraph;
+import org.uddi.repl_v3.Operator;
+import org.uddi.repl_v3.OperatorStatusType;
import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -157,6 +165,16 @@ public class JuddiAdminService {
Transport transport = clerkManager.getTransport(publishTo.getName());
+ UDDISecurityPortType security2 = transport.getUDDISecurityService();
+ System.out.print("username: ");
+ String uname = System.console().readLine();
+ char passwordArray[] = System.console().readPassword("password: ");
+ GetAuthToken getAuthTokenRoot = new GetAuthToken();
+ getAuthTokenRoot.setUserID(uname);
+ getAuthTokenRoot.setCred(new String(passwordArray));
+ authtoken = security2.getAuthToken(getAuthTokenRoot).getAuthInfo();
+ System.out.println("Success!");
+
JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
SaveNode sn = new SaveNode();
sn.setAuthInfo(authtoken);
@@ -202,9 +220,17 @@ public class JuddiAdminService {
Transport transport = clerkManager.getTransport(node);
JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+ System.out.println("fetching...");
+ //NodeList allNodes = juddiApiService.getAllNodes(authtoken);
+ ReplicationConfiguration replicationNodes = null;
+ try {
+ replicationNodes = juddiApiService.getReplicationNodes(authtoken);
+ } catch (Exception ex) {
+ System.out.println("Error getting replication config");
+ ex.printStackTrace();
+ replicationNodes = new ReplicationConfiguration();
- ReplicationConfiguration replicationNodes = juddiApiService.getReplicationNodes(authtoken);
-
+ }
String input = "";
while (!"d".equalsIgnoreCase(input) && !"q".equalsIgnoreCase(input)) {
System.out.println("Current Config:");
@@ -216,11 +242,33 @@ public class JuddiAdminService {
System.out.println("5) Set Registry Contact");
System.out.println("6) Add Operator info");
System.out.println("7) Remove Operator info");
+ System.out.println("d) Done, save changes");
+ System.out.println("q) Quit and abandon changes");
+
input = System.console().readLine();
if (input.equalsIgnoreCase("1")) {
menu_RemoveReplicationNode(replicationNodes);
} else if (input.equalsIgnoreCase("2")) {
menu_AddReplicationNode(replicationNodes, juddiApiService, authtoken);
+ } else if (input.equalsIgnoreCase("d")) {
+ if (replicationNodes.getCommunicationGraph() == null) {
+ replicationNodes.setCommunicationGraph(new CommunicationGraph());
+ }
+ if (replicationNodes.getRegistryContact() == null) {
+ replicationNodes.setRegistryContact(new ReplicationConfiguration.RegistryContact());
+ }
+ if (replicationNodes.getRegistryContact().getContact() == null) {
+ replicationNodes.getRegistryContact().setContact(new Contact());
+ replicationNodes.getRegistryContact().getContact().getPersonName().add(new PersonName("unknown", null));
+ }
+
+ replicationNodes.setSerialNumber(0L);
+ replicationNodes.setTimeOfConfigurationUpdate("");
+ replicationNodes.setMaximumTimeToGetChanges(BigInteger.ONE);
+ replicationNodes.setMaximumTimeToSyncRegistry(BigInteger.ONE);
+
+ JAXB.marshal(replicationNodes, System.out);
+ juddiApiService.setReplicationNodes(authtoken, replicationNodes);
}
}
@@ -286,19 +334,184 @@ public class JuddiAdminService {
private void menu_AddReplicationNode(ReplicationConfiguration replicationNodes, JUDDIApiPortType juddiApiService, String authtoken) throws Exception {
- NodeList allNodes = juddiApiService.getAllNodes(authtoken);
- if (allNodes == null || allNodes.getNode().isEmpty()) {
- System.out.println("No nodes registered!");
- } else {
- for (int i = 0; i < allNodes.getNode().size(); i++) {
- System.out.println((i + 1) + ") Name :" + allNodes.getNode().get(i).getName());
- System.out.println((i + 1) + ") Replication :" + allNodes.getNode().get(i).getReplicationUrl());
+ if (replicationNodes.getCommunicationGraph() == null) {
+ replicationNodes.setCommunicationGraph(new CommunicationGraph());
+ }
+
+ Operator op = new Operator();
+ System.out.println("The Operator Node id should be the UDDI Node ID of the new node to replicate with. It should also match the root business key in"
+ + " the new registry.");
+ System.out.print("Operator Node id: ");
+ op.setOperatorNodeID(System.console().readLine().trim());
+
+ System.out.print("Replication URL: ");
+ op.setSoapReplicationURL(System.console().readLine().trim());
+ op.setOperatorStatus(OperatorStatusType.NEW);
+ System.out.println("The replication node requires at least one point of contact");
+ System.out.print("Number of contacts: ");
+ int index = Integer.parseInt(System.console().readLine());
+ for (int i = 0; i < index; i++) {
+ System.out.println("_______________________");
+ System.out.println("Info for contact # " + (i + 1));
+ op.getContact().add(getContactInfo());
+ }
+ System.out.println("_______________________");
+ System.out.println("Current Operator:");
+ System.out.println("_______________________");
+ JAXB.marshal(op, System.out);
+
+ System.out.print("Confirm adding? (y/n) :");
+ if (System.console().readLine().trim().equalsIgnoreCase("y")) {
+ replicationNodes.getOperator().add(op);
+ replicationNodes.getCommunicationGraph().getNode().add(op.getOperatorNodeID());
+
+ }
+ }
+ private Contact getContactInfo() {
+ Contact c = new Contact();
+ System.out.print("Use Type (i.e. primary): ");
+ c.setUseType(System.console().readLine().trim());
+ if (c.getUseType().trim().equalsIgnoreCase("")) {
+ c.setUseType("primary");
+ }
+
+ c.getPersonName().add(getPersonName());
+
+ while (true) {
+ System.out.println("Thus far:");
+ JAXB.marshal(c, System.out);
+ System.out.println("Options:");
+ System.out.println("\t1) Add PersonName");
+ System.out.println("\t2) Add Email address");
+ System.out.println("\t3) Add Phone number");
+ System.out.println("\t4) Add Description");
+ System.out.println("\t<enter> Finish and return");
+
+ System.out.print("> ");
+ String input = System.console().readLine();
+ if (input.trim().equalsIgnoreCase("")) {
+ break;
+ } else if (input.trim().equalsIgnoreCase("1")) {
+ c.getPersonName().add(getPersonName());
+ } else if (input.trim().equalsIgnoreCase("2")) {
+ c.getEmail().add(getEmail());
+ } else if (input.trim().equalsIgnoreCase("3")) {
+ c.getPhone().add(getPhoneNumber());
+ } else if (input.trim().equalsIgnoreCase("4")) {
+ c.getDescription().add(getDescription());
}
- System.out.println("Node #: ");
- int index = Integer.parseInt(System.console().readLine()) - 1;
- replicationNodes.getCommunicationGraph().getNode().add(allNodes.getNode().get(index).getName());
}
+ return c;
+ }
+
+ private PersonName getPersonName() {
+ PersonName pn = new PersonName();
+ System.out.print("Name: ");
+ pn.setValue(System.console().readLine().trim());
+ System.out.print("Language (en): ");
+ pn.setLang(System.console().readLine().trim());
+ if (pn.getLang().equalsIgnoreCase("")) {
+ pn.setLang("en");
+ }
+
+ return pn;
+ }
+
+ private Email getEmail() {
+ Email pn = new Email();
+ System.out.print("Email address Value: ");
+
+ pn.setValue(System.console().readLine().trim());
+ System.out.print("Use type (i.e. primary): ");
+ pn.setUseType(System.console().readLine().trim());
+ return pn;
+ }
+
+ private Phone getPhoneNumber() {
+
+ Phone pn = new Phone();
+ System.out.print("Phone Value: ");
+
+ pn.setValue(System.console().readLine().trim());
+ System.out.print("Use type (i.e. primary): ");
+ pn.setUseType(System.console().readLine().trim());
+ return pn;
+ }
+
+ private Description getDescription() {
+ Description pn = new Description();
+ System.out.print("Value: ");
+
+ pn.setValue(System.console().readLine().trim());
+ System.out.print("Language (en): ");
+ pn.setLang(System.console().readLine().trim());
+ if (pn.getLang().equalsIgnoreCase("")) {
+ pn.setLang("en");
+ }
+ return pn;
+ }
+
+ void autoMagic() throws Exception {
+
+ List<Node> uddiNodeList = clerkManager.getClientConfig().getUDDINodeList();
+
+ Transport transport = clerkManager.getTransport("default");
+ String authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
+
+ JUDDIApiPortType juddiApiService = transport.getJUDDIApiService();
+ System.out.println("fetching...");
+
+ ReplicationConfiguration replicationNodes = null;
+ try {
+ replicationNodes = juddiApiService.getReplicationNodes(authtoken);
+ } catch (Exception ex) {
+ System.out.println("Error getting replication config");
+ ex.printStackTrace();
+ replicationNodes = new ReplicationConfiguration();
+
+ }
+ if (replicationNodes.getCommunicationGraph() == null) {
+ replicationNodes.setCommunicationGraph(new CommunicationGraph());
+ }
+ Operator op = new Operator();
+ op.setOperatorNodeID("uddi:juddi.apache.org:node1");
+ op.setSoapReplicationURL("http://localhost:8080/juddiv3/services/replication");
+ op.setOperatorStatus(OperatorStatusType.NORMAL);
+ op.getContact().add(new Contact());
+ op.getContact().get(0).getPersonName().add(new PersonName("bob", "en"));
+ op.getContact().get(0).setUseType("admin");
+ replicationNodes.getOperator().add(op);
+
+ op = new Operator();
+ op.setOperatorNodeID("uddi:another.juddi.apache.org:node2");
+ op.setSoapReplicationURL("http://localhost:9080/juddiv3/services/replication");
+ op.setOperatorStatus(OperatorStatusType.NORMAL);
+ op.getContact().add(new Contact());
+ op.getContact().get(0).getPersonName().add(new PersonName("mary", "en"));
+ op.getContact().get(0).setUseType("admin");
+ replicationNodes.getOperator().add(op);
+ replicationNodes.getCommunicationGraph().getNode().add("uddi:another.juddi.apache.org:node2");
+ replicationNodes.getCommunicationGraph().getNode().add("uddi:juddi.apache.org:node1");
+ replicationNodes.setSerialNumber(0L);
+ replicationNodes.setTimeOfConfigurationUpdate("");
+ replicationNodes.setMaximumTimeToGetChanges(BigInteger.ONE);
+ replicationNodes.setMaximumTimeToSyncRegistry(BigInteger.ONE);
+
+ if (replicationNodes.getRegistryContact().getContact() == null) {
+ replicationNodes.getRegistryContact().setContact(new Contact());
+ replicationNodes.getRegistryContact().getContact().getPersonName().add(new PersonName("unknown", null));
+ }
+
+ JAXB.marshal(replicationNodes, System.out);
+ juddiApiService.setReplicationNodes(authtoken, replicationNodes);
+
+ transport = clerkManager.getTransport("uddi:another.juddi.apache.org:node2");
+ authtoken = transport.getUDDISecurityService().getAuthToken(new GetAuthToken("root", "root")).getAuthInfo();
+
+ juddiApiService = transport.getJUDDIApiService();
+ juddiApiService.setReplicationNodes(authtoken, replicationNodes);
+
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
index 4878202..2e62348 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
@@ -67,7 +67,7 @@ class UddiReplication {
}
}
- void GetChangeRecords(String key2, Long record) {
+ void GetChangeRecords(String key2, Long record, String sourcenode) {
try {
UDDIReplicationPortType uddiReplicationPort = new UDDIService().getUDDIReplicationPort();
HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
@@ -75,7 +75,7 @@ class UddiReplication {
highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(DoPing(key2), record));
((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, key2);
- List<ChangeRecord> changeRecords = uddiReplicationPort.getChangeRecords("random", null, BigInteger.valueOf(100), highWaterMarkVectorType);
+ List<ChangeRecord> changeRecords = uddiReplicationPort.getChangeRecords(sourcenode, highWaterMarkVectorType, BigInteger.valueOf(100), null);
System.out.println("Success...." + changeRecords.size() + " records returned");
System.out.println("Node, USN, type");
for (int i = 0; i < changeRecords.size(); i++) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml b/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
index 1f8be39..c78a3d0 100644
--- a/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
+++ b/juddi-examples/more-uddi-samples/src/main/resources/META-INF/simple-publish-uddi.xml
@@ -4,7 +4,7 @@
<reloadDelay>5000</reloadDelay>
<client name="example-client">
<nodes>
- <node>
+ <node isHomeJUDDI="true">
<!-- required 'default' node -->
<name>default</name>
<properties>
@@ -28,6 +28,31 @@
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
</node>
+ <node>
+ <!-- required 'default' node -->
+ <name>uddi:another.juddi.apache.org:node2</name>
+ <properties>
+ <property name="serverName" value="localhost"/>
+ <property name="serverPort" value="9080"/>
+ <!-- for UDDI nodes that use HTTP u/p, using the following
+ <property name="basicAuthUsername" value="root" />
+ <property name="basicAuthPassword" value="password" />
+ <property name="basicAuthPasswordIsEncrypted" value="false" />
+ <property name="basicAuthPasswordCryptoProvider" value="org.apache.juddi.v3.client.crypto.AES128Cryptor (an example)" />-->
+ </properties>
+ <description>juddi node on 9080</description>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+ <inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+ <replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication</replicationUrl>
+ </node>
</nodes>
<clerks registerOnStartup="false">
<clerk name="default" node="default" publisher="uddi" password="uddi" isPasswordEncrypted="false" cryptoProvider=""/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/22a846dd/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml b/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
index afb2de7..36f93b9 100644
--- a/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
+++ b/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
@@ -78,7 +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.ReplicationMessage</class>
+ <class>org.apache.juddi.model.ReplicationConfigurationNode</class>
+ <class>org.apache.juddi.model.EdgeReceiverAlternate</class>
<properties>
<property name="hibernate.archive.autodetection" value="class"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[21/28] juddi git commit: JUDDI-241 basic functionality of
replication is working. although there are some strange duplication of Name
elements on replication business entities.
Posted by al...@apache.org.
JUDDI-241 basic functionality of replication is working. although there are some strange duplication of Name elements on replication business entities.
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/939ae47f
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/939ae47f
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/939ae47f
Branch: refs/heads/master
Commit: 939ae47f6eb4c9a14f93ca65f5948d386f84c0ee
Parents: 874d02b
Author: Alex <al...@apache.org>
Authored: Sat Dec 6 17:24:47 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sat Dec 6 17:24:47 2014 -0500
----------------------------------------------------------------------
.../juddi/api/impl/UDDIReplicationImpl.java | 126 ++--
.../apache/juddi/mapping/MappingApiToModel.java | 67 ++
.../juddi/replication/ReplicationNotifier.java | 4 +-
.../subscription/SubscriptionNotifier.java | 745 ++++++++++---------
.../juddi/api/impl/API_160_ReplicationTest.java | 8 +-
.../apache/juddi/api/runtime/CLIServerTest.java | 3 +-
.../apache/juddi/api/runtime/replicantImpl.java | 14 +-
.../apache/juddi/samples/UddiReplication.java | 11 +-
uddi-ws/pom.xml | 6 +
.../org/uddi/repl_v3/ChangeRecordDelete.java | 8 +-
.../v3_service/UDDIReplicationPortType.java | 10 +-
.../juddi/api_v3/GetPublisherDetailTest.java | 7 +
12 files changed, 583 insertions(+), 426 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 3971e6b..30cfdec 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -17,6 +17,7 @@
package org.apache.juddi.api.impl;
import java.math.BigInteger;
+import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -26,21 +27,16 @@ import java.util.Queue;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import javax.persistence.Query;
import javax.xml.bind.JAXB;
import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.ws.BindingProvider;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
import org.apache.commons.configuration.ConfigurationException;
import static org.apache.juddi.api.impl.AuthenticatedService.logger;
import org.apache.juddi.api.util.QueryStatus;
@@ -52,7 +48,6 @@ import org.apache.juddi.mapping.MappingApiToModel;
import org.apache.juddi.mapping.MappingModelToApi;
import org.apache.juddi.model.BusinessEntity;
import org.apache.juddi.model.BusinessService;
-import org.apache.juddi.model.Node;
import org.apache.juddi.model.Operator;
import org.apache.juddi.model.Tmodel;
import static org.apache.juddi.replication.ReplicationNotifier.FetchEdges;
@@ -64,7 +59,9 @@ import org.uddi.api_v3.OperationalInfo;
import org.uddi.custody_v3.DiscardTransferToken;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.ChangeRecords;
import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.GetChangeRecords;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
import org.uddi.repl_v3.ReplicationConfiguration;
@@ -176,22 +173,32 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
if (replicationClient == null) {
logger.fatal("unable to obtain a replication client to node " + poll.getNotifyingNode());
- }
- try {
+ } else {
+ try {
//get the high water marks for this node
- //ok now get all the changes
- logger.info("fetching updates...");
-
- List<ChangeRecord> records
- = replicationClient.getChangeRecords(node,
- poll.getChangesAvailable(), BigInteger.valueOf(100), null);
- //ok now we need to persist the change records
- logger.info("Change records retrieved " + records.size());
- for (int i = 0; i < records.size(); i++) {
- PersistChangeRecord(records.get(i));
+ //ok now get all the changes
+ logger.info("fetching updates on, since ");
+ for (int xx = 0; xx < poll.getChangesAvailable().getHighWaterMark().size(); xx++) {
+ logger.info("Node " + poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID()
+ + " USN " + poll.getChangesAvailable().getHighWaterMark().get(xx).getOriginatingUSN());
+ }
+ //JAXB.marshal(poll, System.out);
+ GetChangeRecords body = new GetChangeRecords();
+ body.setRequestingNode(node);
+ body.setResponseLimitCount(BigInteger.valueOf(100));
+ //indexing is screwed up
+ body.setChangesAlreadySeen(poll.getChangesAvailable());
+ List<ChangeRecord> records
+ = replicationClient.getChangeRecords(body).getChangeRecord();
+ //ok now we need to persist the change records
+ logger.info("Change records retrieved " + records.size());
+ for (int i = 0; i < records.size(); i++) {
+ logger.info("Change records retrieved " + records.get(i).getChangeID().getNodeID() + " USN " + records.get(i).getChangeID().getOriginatingUSN());
+ PersistChangeRecord(records.get(i));
+ }
+ } catch (Exception ex) {
+ logger.error("Error caught fetching replication changes from " + poll.getNotifyingNode(), ex);
}
- } catch (Exception ex) {
- logger.error("Error caught fetching replication changes from " + poll.getNotifyingNode(), ex);
}
} else {
logger.warn("weird, popped an object from the queue but it was null.");
@@ -226,10 +233,14 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
* a USN is less than the USN specified in the
* changesAlreadySeen highWaterMarkVector.
*/
+ logger.info("Remote change request");
+ JAXB.marshal(rec, System.out);
try {
tx.begin();
//the change record rec must also be persisted!!
- em.persist(MappingApiToModel.mapChangeRecord(rec));
+ org.apache.juddi.model.ChangeRecord mapChangeRecord = MappingApiToModel.mapChangeRecord(rec);
+ mapChangeRecord.setId(null);
+ em.persist(mapChangeRecord);
//<editor-fold defaultstate="collapsed" desc="delete a record">
if (rec.getChangeRecordDelete() != null) {
@@ -291,7 +302,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
org.apache.juddi.model.BindingTemplate modelT = new org.apache.juddi.model.BindingTemplate();
MappingApiToModel.mapBindingTemplate(rec.getChangeRecordNewData().getBindingTemplate(), modelT, model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ MappingApiToModel.mapOperationalInfo(modelT, rec.getChangeRecordNewData().getOperationalInfo());
+ // MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
em.persist(model);
}
@@ -304,8 +316,9 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
ValidateNodeIdMatches(model.getNodeId(), rec.getChangeRecordNewData().getOperationalInfo());
}
MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
- MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ // MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
em.persist(model);
}
@@ -317,6 +330,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
org.apache.juddi.model.BusinessService model = new org.apache.juddi.model.BusinessService();
MappingApiToModel.mapBusinessService(rec.getChangeRecordNewData().getBusinessService(), model, find);
MappingApiToModel.mapOperationalInfo(model, rec.getChangeRecordNewData().getOperationalInfo());
+ MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
em.persist(model);
}
@@ -366,7 +380,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
tx.commit();
} catch (Exception drfm) {
- logger.warn(drfm);
+ logger.warn("Error persisting change record!", drfm);
} finally {
if (tx.isActive()) {
tx.rollback();
@@ -441,17 +455,28 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
- @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")
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ @WebResult(name = "changeRecords", targetNamespace = "urn:uddi-org:repl_v3", partName = "body")
+ // @WebMethod(operationName = "get_changeRecords", action = "get_changeRecords")
+ public org.uddi.repl_v3.ChangeRecords getChangeRecords(
+ @WebParam(partName = "body", name = "get_changeRecords", targetNamespace = "urn:uddi-org:repl_v3") org.uddi.repl_v3.GetChangeRecords body
+ ) throws DispositionReportFaultMessage, RemoteException {/*
+ @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")
+
+ @Override
+ 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 {*/
- @Override
- 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 {
long startTime = System.currentTimeMillis();
+ String requestingNode = body.getRequestingNode();
+ HighWaterMarkVectorType changesAlreadySeen = body.getChangesAlreadySeen();
+ BigInteger responseLimitCount = body.getResponseLimitCount();
+ HighWaterMarkVectorType responseLimitVector = body.getResponseLimitVector();
new ValidateReplication(null).validateGetChangeRecords(requestingNode, changesAlreadySeen, responseLimitCount, responseLimitVector, FetchEdges(), ctx);
@@ -483,7 +508,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
try {
tx.begin();
- Long firstrecord = 1L;
+ Long firstrecord = 0L;
Long lastrecord = null;
if (changesAlreadySeen != null) {
@@ -491,7 +516,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
//therefore we want the oldest record stored locally to return to the requestor for processing
for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(node)) {
- firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN() + 1;
+ firstrecord = changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN();
}
}
}
@@ -505,25 +530,31 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
}
+ logger.info("Query db for replication changes, lower index is " + (firstrecord - 1) + " last index " + lastrecord + " record limit " + maxrecords);
Query createQuery = null;
if (lastrecord != null) {
- createQuery = em.createQuery("select e from ChangeRecord e where ((e.id >= :inbound and e.nodeID = :node and e.id < :lastrecord) OR "
- + "(e.originatingUSN > :inbound and e.nodeID <> :node and e.originatingUSN < :lastrecord)) order by e.id ASC");
+ createQuery = em.createQuery("select e from ChangeRecord e where "
+ + "((e.id > :inbound AND e.nodeID = :node AND e.id < :lastrecord) OR "
+ + "(e.originatingUSN > :inbound AND e.nodeID <> :node AND e.originatingUSN < :lastrecord)) "
+ + "order by e.id ASC");
createQuery.setParameter("lastrecord", lastrecord);
} else {
- createQuery = em.createQuery("select e from ChangeRecord e where ((e.id >= :inbound and e.nodeID = :node) OR "
- + "(e.originatingUSN > :inbound and e.nodeID <> :node)) order by e.id ASC");
+ createQuery = em.createQuery("select e from ChangeRecord e where "
+ + "((e.id > :inbound AND e.nodeID = :node) OR "
+ + "(e.originatingUSN > :inbound AND e.nodeID <> :node)) "
+ + "order by e.id ASC");
}
createQuery.setMaxResults(maxrecords);
- createQuery.setParameter("inbound", firstrecord);
+ createQuery.setParameter("inbound", firstrecord - 1);
createQuery.setParameter("node", node);
List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) createQuery.getResultList();
+ logger.info(records.size() + " CR records returned from query");
for (int i = 0; i < records.size(); i++) {
ChangeRecord r = MappingModelToApi.mapChangeRecord(records.get(i));
- if (!Excluded(changesAlreadySeen, r)) {
- ret.add(r);
- }
+ //if (!Excluded(changesAlreadySeen, r)) {
+ ret.add(r);
+ //}
}
@@ -544,7 +575,9 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
logger.info("Change records returned for " + requestingNode + ": " + ret.size());
//JAXB.marshal(ret, System.out);
- return ret;
+ ChangeRecords x = new ChangeRecords();
+ x.getChangeRecord().addAll(ret);
+ return x;
}
/**
@@ -639,9 +672,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
- logger.info(body.getNotifyingNode() + " just told me that there are change records available, enqueuing...");
queue.add(body);
-
+ logger.info(body.getNotifyingNode() + " just told me that there are change records available, enqueuing...size is " + queue.size());
//ValidateReplication.unsupportedAPICall();
}
private static Queue<NotifyChangeRecordsAvailable> queue = null;
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index 83a1492..63af296 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.JAXBMarshaller;
import org.apache.juddi.model.Address;
import org.apache.juddi.model.BindingTemplate;
+import org.apache.juddi.model.BusinessEntity;
import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.CanonicalizationMethod;
import org.apache.juddi.model.Contact;
@@ -1381,6 +1382,27 @@ public class MappingApiToModel {
public static org.apache.juddi.model.ChangeRecord mapChangeRecord(ChangeRecord rec) throws UnsupportedEncodingException {
org.apache.juddi.model.ChangeRecord r = new org.apache.juddi.model.ChangeRecord();
r.setId(rec.getChangeID().getOriginatingUSN());
+ r.setOriginatingUSN(rec.getChangeID().getOriginatingUSN());
+ if (rec.getChangeRecordNewData()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordNewData);
+ else if (rec.getChangeRecordAcknowledgement()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordAcknowledgement);
+ else if (rec.getChangeRecordConditionFailed()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordConditionFailed);
+ else if (rec.getChangeRecordCorrection()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordCorrection);
+ else if (rec.getChangeRecordDelete()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordDelete);
+ else if (rec.getChangeRecordDeleteAssertion()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordDeleteAssertion);
+ else if (rec.getChangeRecordHide()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordHide);
+ else if (rec.getChangeRecordNewDataConditional()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordNewDataConditional);
+ else if (rec.getChangeRecordNull()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordNull);
+ else if (rec.getChangeRecordPublisherAssertion()!=null)
+ r.setRecordType(org.apache.juddi.model.ChangeRecord.RecordType.ChangeRecordPublisherAssertion);
r.setNodeID(rec.getChangeID().getNodeID());
StringWriter sw = new StringWriter();
JAXB.marshal(rec, sw);
@@ -1406,6 +1428,30 @@ public class MappingApiToModel {
model.setNodeId(operationalInfo.getNodeID());
}
+
+ public static void mapOperationalInfoIncludingChildren(BusinessEntity model, OperationalInfo operationalInfo) {
+ if (operationalInfo == null || model == null) {
+ return;
+ }
+ if (operationalInfo.getCreated() != null) {
+ model.setCreated(operationalInfo.getCreated().toGregorianCalendar().getTime());
+ }
+ model.setAuthorizedName(operationalInfo.getAuthorizedName());
+ if (operationalInfo.getModified() != null) {
+ model.setModified(operationalInfo.getModified().toGregorianCalendar().getTime());
+ }
+ if (operationalInfo.getModifiedIncludingChildren() != null) {
+ model.setModifiedIncludingChildren(operationalInfo.getModifiedIncludingChildren().toGregorianCalendar().getTime());
+ }
+ model.setNodeId(operationalInfo.getNodeID());
+ for (int i=0; i < model.getBusinessServices().size(); i++)
+ {
+ mapOperationalInfo( model.getBusinessServices().get(i), operationalInfo);
+ for (int k=0; k < model.getBusinessServices().get(i).getBindingTemplates().size(); k++)
+ mapOperationalInfo( model.getBusinessServices().get(i).getBindingTemplates().get(k), operationalInfo);
+ }
+
+ }
public static void mapSaveBindingToChangeRecord(SaveBinding recordIn, List<org.apache.juddi.model.ChangeRecord> recordsOut) {
List<org.apache.juddi.model.ChangeRecord> r = new ArrayList<org.apache.juddi.model.ChangeRecord>();
@@ -1582,5 +1628,26 @@ public class MappingApiToModel {
}
}
+ public static void mapOperationalInfoIncludingChildren(BusinessService model, OperationalInfo operationalInfo) {
+ if (operationalInfo == null || model == null) {
+ return;
+ }
+ if (operationalInfo.getCreated() != null) {
+ model.setCreated(operationalInfo.getCreated().toGregorianCalendar().getTime());
+ }
+ model.setAuthorizedName(operationalInfo.getAuthorizedName());
+ if (operationalInfo.getModified() != null) {
+ model.setModified(operationalInfo.getModified().toGregorianCalendar().getTime());
+ }
+ if (operationalInfo.getModifiedIncludingChildren() != null) {
+ model.setModifiedIncludingChildren(operationalInfo.getModifiedIncludingChildren().toGregorianCalendar().getTime());
+ }
+ model.setNodeId(operationalInfo.getNodeID());
+
+ for (int k=0; k < model.getBindingTemplates().size(); k++)
+ mapOperationalInfo( model.getBindingTemplates().get(k), operationalInfo);
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
index 132c530..d71f2bd 100644
--- a/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/replication/ReplicationNotifier.java
@@ -59,8 +59,8 @@ public class ReplicationNotifier extends TimerTask {
private static Log log = LogFactory.getLog(ReplicationNotifier.class);
private Timer timer = null;
private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
- private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds
+ private long interval = 5000;//AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 10000l); //1000 milliseconds
private static String node = null;
/**
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
index 933f476..3dc0771 100644
--- a/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
+++ b/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
@@ -55,400 +55,417 @@ import org.uddi.subr_v3.NotifySubscriptionListener;
import org.uddi.v3_service.DispositionReportFaultMessage;
/**
- *
+ *
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*
*/
public class SubscriptionNotifier extends TimerTask {
- private Log log = LogFactory.getLog(this.getClass());
- private Timer timer = null;
- private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
- private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
- private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds
- private int maxTries = AppConfig.getConfiguration().getInt(Property.JUDDI_NOTIFICATION_MAX_TRIES, 3);
- private long badListResetInterval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_LIST_RESET_INTERVAL, 1000l * 3600); //one hour
+ private Log log = LogFactory.getLog(this.getClass());
+ private Timer timer = null;
+ private long startBuffer = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_START_BUFFER, 20000l); // 20s startup delay default
+ private long interval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_INTERVAL, 300000l); //5 min default
+ private long acceptableLagTime = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_ACCEPTABLE_LAGTIME, 1000l); //1000 milliseconds
+ private int maxTries = AppConfig.getConfiguration().getInt(Property.JUDDI_NOTIFICATION_MAX_TRIES, 3);
+ private long badListResetInterval = AppConfig.getConfiguration().getLong(Property.JUDDI_NOTIFICATION_LIST_RESET_INTERVAL, 1000l * 3600); //one hour
/**
* @since 3.2
*/
- private boolean sendToken = AppConfig.getConfiguration().getBoolean(Property.JUDDI_NOTIFICATION_SENDAUTHTOKEN, false);
- private UDDISubscriptionImpl subscriptionImpl = new UDDISubscriptionImpl();
- private Boolean alwaysNotify = false;
- private Date desiredDate = null;
- private int lastUpdateCounter;
- private UDDIServiceCounter serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class);
- private String[] attributes = {
- "save_business", "save_service", "save_binding", "save_tmodel",
- "delete_business","delete_service","delete_binding","delete_tmodel",
- "add_publisherassertions","set_publisherassertions","delete_publisherassertions"
- };
- private static Map<String,Integer> badNotifications= new ConcurrentHashMap<String,Integer>();
- private static Date lastBadNotificationReset = new Date();
-
+ private boolean sendToken = AppConfig.getConfiguration().getBoolean(Property.JUDDI_NOTIFICATION_SENDAUTHTOKEN, false);
+ private UDDISubscriptionImpl subscriptionImpl = new UDDISubscriptionImpl();
+ private Boolean alwaysNotify = false;
+ private Date desiredDate = null;
+ private int lastUpdateCounter;
+ private UDDIServiceCounter serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class);
+ private String[] attributes = {
+ "save_business", "save_service", "save_binding", "save_tmodel",
+ "delete_business", "delete_service", "delete_binding", "delete_tmodel",
+ "add_publisherassertions", "set_publisherassertions", "delete_publisherassertions"
+ };
+ private static Map<String, Integer> badNotifications = new ConcurrentHashMap<String, Integer>();
+ private static Date lastBadNotificationReset = new Date();
+
/**
* default constructor
- * @throws ConfigurationException
+ *
+ * @throws ConfigurationException
+ */
+ public SubscriptionNotifier() throws ConfigurationException {
+ super();
+ timer = new Timer(true);
+ timer.scheduleAtFixedRate(this, startBuffer, interval);
+ }
+
+ @Override
+ public boolean cancel() {
+ timer.cancel();
+ return super.cancel();
+ }
+
+ /**
+ * If the CRUD methods on the publication API where not called, this
+ * registry node does not contain changes. If the registry database is
+ * shared with other registry nodes and one of those registries pushed
+ * in a change, then that registry node will take care of sending out
+ * notifications.
+ *
+ * @return true/false
*/
- public SubscriptionNotifier() throws ConfigurationException {
- super();
- timer = new Timer(true);
- timer.scheduleAtFixedRate(this, startBuffer, interval);
- }
-
- @Override
- public boolean cancel() {
- timer.cancel();
- return super.cancel();
- }
-
- /**
- * If the CRUD methods on the publication API where not called, this registry node does not contain changes. If
- * the registry database is shared with other registry nodes and one of those registries pushed in a change, then
- * that registry node will take care of sending out notifications.
- * @return true/false
- */
- protected boolean registryMayContainUpdates() {
- boolean isUpdated = false;
- int updateCounter = 0;
+ protected boolean registryMayContainUpdates() {
+ boolean isUpdated = false;
+ int updateCounter = 0;
//if the desiredDate is set it means that we've declined sending out a notification before
- //because the a client did not want a notification yet. However if this desired
- //notification time has come we should try sending out the notification now.
- if (desiredDate!=null && new Date().getTime() > desiredDate.getTime()) {
- return true;
- }
- try {
- for (String attribute : attributes) {
- String counter = serviceCounter.getAttribute(attribute + " successful queries").toString();
- updateCounter += Integer.valueOf(counter);
- }
+ //because the a client did not want a notification yet. However if this desired
+ //notification time has come we should try sending out the notification now.
+ if (desiredDate != null && new Date().getTime() > desiredDate.getTime()) {
+ return true;
+ }
+ try {
+ for (String attribute : attributes) {
+ String counter = serviceCounter.getAttribute(attribute + " successful queries").toString();
+ updateCounter += Integer.valueOf(counter);
+ }
// if the counts are not the same something has changed,
- // this accounts for the case where the counters where reset.
- if (updateCounter != lastUpdateCounter) {
- lastUpdateCounter = updateCounter;
- isUpdated = true;
- }
- } catch (Exception e) {
- log.error(e.getMessage(),e);
- }
- return isUpdated;
- }
+ // this accounts for the case where the counters where reset.
+ if (updateCounter != lastUpdateCounter) {
+ lastUpdateCounter = updateCounter;
+ isUpdated = true;
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return isUpdated;
+ }
+
+ public synchronized void run() {
+ if (badListResetInterval > 0 && new Date().getTime() > lastBadNotificationReset.getTime() + badListResetInterval) {
+ badNotifications = new ConcurrentHashMap<String, Integer>();
+ lastBadNotificationReset = new Date();
+ log.debug("badNotificationList was reset");
+ }
+ if ((firedOnTime(scheduledExecutionTime()) || alwaysNotify) && registryMayContainUpdates()) {
+ long startTime = System.currentTimeMillis();
+ desiredDate = null;
+ log.info("Start Notification background task; checking if subscription notifications need to be send out..");
- public synchronized void run()
- {
- if (badListResetInterval > 0 && new Date().getTime() > lastBadNotificationReset.getTime() + badListResetInterval) {
- badNotifications = new ConcurrentHashMap<String,Integer>();
- lastBadNotificationReset = new Date();
- log.debug("badNotificationList was reset");
- }
- if ((firedOnTime(scheduledExecutionTime()) || alwaysNotify) && registryMayContainUpdates()) {
- long startTime = System.currentTimeMillis();
- desiredDate = null;
- log.info("Start Notification background task; checking if subscription notifications need to be send out..");
-
- Collection<Subscription> subscriptions = getAllAsyncSubscriptions();
- for (Subscription subscription : subscriptions) {
-
-
- if (subscription.getExpiresAfter()==null || subscription.getExpiresAfter().getTime() > startTime ||
- !isTemporarilyDisabled(subscription.getSubscriptionKey())) {
- try {
+ Collection<Subscription> subscriptions = getAllAsyncSubscriptions();
+ for (Subscription subscription : subscriptions) {
+
+ if (subscription.getExpiresAfter() == null || subscription.getExpiresAfter().getTime() > startTime
+ || !isTemporarilyDisabled(subscription.getSubscriptionKey())) {
+ try {
//build a query with a coverage period from the lastNotified time to
- //now (the scheduled Execution time)
- Date notificationDate = new Date(scheduledExecutionTime());
- GetSubscriptionResults getSubscriptionResults =
- buildGetSubscriptionResults(subscription, notificationDate);
- if (getSubscriptionResults!=null) {
- getSubscriptionResults.setSubscriptionKey(subscription.getSubscriptionKey());
- UddiEntityPublisher publisher = new UddiEntityPublisher();
- publisher.setAuthorizedName(subscription.getAuthorizedName());
- SubscriptionResultsList resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
+ //now (the scheduled Execution time)
+ Date notificationDate = new Date(scheduledExecutionTime());
+ GetSubscriptionResults getSubscriptionResults
+ = buildGetSubscriptionResults(subscription, notificationDate);
+ if (getSubscriptionResults != null) {
+ getSubscriptionResults.setSubscriptionKey(subscription.getSubscriptionKey());
+ UddiEntityPublisher publisher = new UddiEntityPublisher();
+ publisher.setAuthorizedName(subscription.getAuthorizedName());
+ SubscriptionResultsList resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
String token = resultList.getChunkToken();
- if (resultListContainsChanges(resultList)) {
- log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
+ if (resultListContainsChanges(resultList)) {
+ log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
resultList.setChunkToken(null);
- //Note that the chunkToken is not returned with this structure for this API.
- notify(getSubscriptionResults,resultList, notificationDate);
- } else {
- log.info("No changes where recorded, no need to notify.");
- }
- while (!token.equalsIgnoreCase("0"))
- {
- resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
- if (resultListContainsChanges(resultList)) {
- log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
- resultList.setChunkToken(null);
- //Note that the chunkToken is not returned with this structure for this API.
- notify(getSubscriptionResults,resultList, notificationDate);
- } else {
- log.info("No changes where recorded, no need to notify.");
- }
+ //Note that the chunkToken is not returned with this structure for this API.
+ notify(getSubscriptionResults, resultList, notificationDate);
+ } else {
+ log.info("No changes where recorded, no need to notify.");
+ }
+ while (!token.equalsIgnoreCase("0")) {
+ resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
+ if (resultListContainsChanges(resultList)) {
+ log.info("We have a change and need to notify " + subscription.getSubscriptionKey());
+ resultList.setChunkToken(null);
+ //Note that the chunkToken is not returned with this structure for this API.
+ notify(getSubscriptionResults, resultList, notificationDate);
+ } else {
+ log.info("No changes where recorded, no need to notify.");
+ }
}
-
- }
- } catch (Exception e) {
- log.error("Could not obtain subscriptionResult for subscriptionKey "
- + subscription.getSubscriptionKey() + ". " + e.getMessage(),e);
- }
- } else {
- // the subscription expired, we should delete it
- log.info("Subcription with key " + subscription.getSubscriptionKey()
- + " expired " + subscription.getExpiresAfter());
- deleteSubscription(subscription);
- }
- }
- long endTime = System.currentTimeMillis();
-
- if ((endTime-startTime) > interval) {
- log.info("Notification background task duration exceeds the JUDDI_NOTIFICATION_INTERVAL" +
- " of " + interval + ". Notification background task took "
- + (endTime - startTime) + " milliseconds.");
- } else {
- log.info("Notification background task took " + (endTime - startTime) + " milliseconds.");
- }
- } else {
- log.warn("Skipping current notification cycle because lagtime is too great.");
- }
- }
- /**
- * Checks to see that the event are fired on time. If they are late this may indicate that the server
- * is under load. The acceptableLagTime is configurable using the "juddi.notification.acceptable.lagtime"
- * property and is defaulted to 500ms. A negative value means that you do not care about the lag time
- * and you simply always want to go do the notification work.
- *
- * @param scheduleExecutionTime
- * @return true if the server is within the acceptable latency lag.
- */
- private boolean firedOnTime(long scheduleExecutionTime) {
- long lagTime = System.currentTimeMillis() - scheduleExecutionTime;
- if (lagTime <= acceptableLagTime || acceptableLagTime < 0) {
- return true;
- } else {
- log.debug("NotificationTimer is lagging " + lagTime + " milli seconds behind. A lag time "
- + "which exceeds an acceptable lagtime of " + acceptableLagTime + "ms indicates "
- + "that the registry server is under load or was in sleep mode. We are therefore skipping this notification "
- + "cycle.");
- return false;
- }
- }
- protected GetSubscriptionResults buildGetSubscriptionResults(Subscription subscription, Date endPoint)
- throws DispositionReportFaultMessage, DatatypeConfigurationException {
-
- GetSubscriptionResults getSubscriptionResults = null;
- Duration duration = TypeConvertor.convertStringToDuration(subscription.getNotificationInterval());
- Date startPoint = subscription.getLastNotified();
- Date nextDesiredNotificationDate = null;
- if (startPoint==null) startPoint = subscription.getCreateDate();
- nextDesiredNotificationDate = new Date(startPoint.getTime());
- duration.addTo(nextDesiredNotificationDate);
+
+ }
+ } catch (Exception e) {
+ log.error("Could not obtain subscriptionResult for subscriptionKey "
+ + subscription.getSubscriptionKey() + ". " + e.getMessage(), e);
+ }
+ } else {
+ // the subscription expired, we should delete it
+ log.info("Subcription with key " + subscription.getSubscriptionKey()
+ + " expired " + subscription.getExpiresAfter());
+ deleteSubscription(subscription);
+ }
+ }
+ long endTime = System.currentTimeMillis();
+
+ if ((endTime - startTime) > interval) {
+ log.info("Notification background task duration exceeds the JUDDI_NOTIFICATION_INTERVAL"
+ + " of " + interval + ". Notification background task took "
+ + (endTime - startTime) + " milliseconds.");
+ } else {
+ log.info("Notification background task took " + (endTime - startTime) + " milliseconds.");
+ }
+ } else {
+ log.debug("Skipping current notification cycle because lagtime is too great.");
+ }
+ }
+
+ /**
+ * Checks to see that the event are fired on time. If they are late this
+ * may indicate that the server is under load. The acceptableLagTime is
+ * configurable using the "juddi.notification.acceptable.lagtime"
+ * property and is defaulted to 500ms. A negative value means that you
+ * do not care about the lag time and you simply always want to go do
+ * the notification work.
+ *
+ * @param scheduleExecutionTime
+ * @return true if the server is within the acceptable latency lag.
+ */
+ private boolean firedOnTime(long scheduleExecutionTime) {
+ long lagTime = System.currentTimeMillis() - scheduleExecutionTime;
+ if (lagTime <= acceptableLagTime || acceptableLagTime < 0) {
+ return true;
+ } else {
+ log.debug("NotificationTimer is lagging " + lagTime + " milli seconds behind. A lag time "
+ + "which exceeds an acceptable lagtime of " + acceptableLagTime + "ms indicates "
+ + "that the registry server is under load or was in sleep mode. We are therefore skipping this notification "
+ + "cycle.");
+ return false;
+ }
+ }
+
+ protected GetSubscriptionResults buildGetSubscriptionResults(Subscription subscription, Date endPoint)
+ throws DispositionReportFaultMessage, DatatypeConfigurationException {
+
+ GetSubscriptionResults getSubscriptionResults = null;
+ Duration duration = TypeConvertor.convertStringToDuration(subscription.getNotificationInterval());
+ Date startPoint = subscription.getLastNotified();
+ Date nextDesiredNotificationDate = null;
+ if (startPoint == null) {
+ startPoint = subscription.getCreateDate();
+ }
+ nextDesiredNotificationDate = new Date(startPoint.getTime());
+ duration.addTo(nextDesiredNotificationDate);
//nextDesiredNotificationDate = lastTime + the Interval Duration, which should be:
- //AFTER the lastNotified time and BEFORE the endTime (current time). If it is
- //after the endTime, then the user does not want a notification yet, so we accumulate.
- if (subscription.getLastNotified()==null || nextDesiredNotificationDate.after(startPoint) && nextDesiredNotificationDate.before(endPoint)) {
- getSubscriptionResults = new GetSubscriptionResults();
- CoveragePeriod period = new CoveragePeriod();
- GregorianCalendar calendar = new GregorianCalendar();
- calendar.setTimeInMillis(startPoint.getTime());
- period.setStartPoint(DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar));
- calendar.setTimeInMillis(endPoint.getTime());
- period.setEndPoint(DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar));
- if (log.isDebugEnabled()) log.debug("Period " + period.getStartPoint() + " " + period.getEndPoint());
- getSubscriptionResults.setCoveragePeriod(period);
- } else {
- log.info("Client does not yet want a notification. The next desidered notification Date " + nextDesiredNotificationDate + ". The current interval ["
- + startPoint + " , " + endPoint + "] therefore skipping this notification cycle.");
- if (desiredDate==null || nextDesiredNotificationDate.getTime() < desiredDate.getTime()) {
- desiredDate = nextDesiredNotificationDate;
- }
- }
- return getSubscriptionResults;
-
- }
-
- protected boolean resultListContainsChanges(SubscriptionResultsList resultList)
- {
- if (resultList==null) return false;
- if (resultList.getBindingDetail() !=null || resultList.getBusinessDetail()!=null
- || resultList.getBusinessList() !=null || resultList.getServiceDetail() !=null
- || resultList.getServiceList() !=null || resultList.getTModelDetail() !=null
- || resultList.getTModelList() !=null || resultList.getRelatedBusinessesList() !=null) {
- return true;
- }
- //When the response is 'brief', or when there are deleted only keyBags are used.
- if (resultList.getKeyBag()!=null && resultList.getKeyBag().size() > 0) return true;
- //there are no changes to what was subscribed to
- return false;
- }
- /**
- * Obtains all subscriptions in the system.
- * @return Collection of All Subscriptions in the system.
- */
- @SuppressWarnings("unchecked")
- protected Collection<Subscription> getAllAsyncSubscriptions() {
- Collection<Subscription> subscriptions = null;
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
- Query query = em.createQuery("SELECT s FROM Subscription s WHERE s.bindingKey IS NOT NULL");
- subscriptions = (Collection<Subscription>) query.getResultList();
- tx.commit();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- return subscriptions;
- }
- /**
- * Deletes the subscription. i.e. when it is expired.
- * @param subscription
- */
- protected void deleteSubscription(Subscription subscription) {
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- tx.begin();
- em.remove(subscription);
- tx.commit();
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
- /**
- * Sends out the notifications.
+ //AFTER the lastNotified time and BEFORE the endTime (current time). If it is
+ //after the endTime, then the user does not want a notification yet, so we accumulate.
+ if (subscription.getLastNotified() == null || nextDesiredNotificationDate.after(startPoint) && nextDesiredNotificationDate.before(endPoint)) {
+ getSubscriptionResults = new GetSubscriptionResults();
+ CoveragePeriod period = new CoveragePeriod();
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTimeInMillis(startPoint.getTime());
+ period.setStartPoint(DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar));
+ calendar.setTimeInMillis(endPoint.getTime());
+ period.setEndPoint(DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar));
+ if (log.isDebugEnabled()) {
+ log.debug("Period " + period.getStartPoint() + " " + period.getEndPoint());
+ }
+ getSubscriptionResults.setCoveragePeriod(period);
+ } else {
+ log.info("Client does not yet want a notification. The next desidered notification Date " + nextDesiredNotificationDate + ". The current interval ["
+ + startPoint + " , " + endPoint + "] therefore skipping this notification cycle.");
+ if (desiredDate == null || nextDesiredNotificationDate.getTime() < desiredDate.getTime()) {
+ desiredDate = nextDesiredNotificationDate;
+ }
+ }
+ return getSubscriptionResults;
+
+ }
+
+ protected boolean resultListContainsChanges(SubscriptionResultsList resultList) {
+ if (resultList == null) {
+ return false;
+ }
+ if (resultList.getBindingDetail() != null || resultList.getBusinessDetail() != null
+ || resultList.getBusinessList() != null || resultList.getServiceDetail() != null
+ || resultList.getServiceList() != null || resultList.getTModelDetail() != null
+ || resultList.getTModelList() != null || resultList.getRelatedBusinessesList() != null) {
+ return true;
+ }
+ //When the response is 'brief', or when there are deleted only keyBags are used.
+ if (resultList.getKeyBag() != null && resultList.getKeyBag().size() > 0) {
+ return true;
+ }
+ //there are no changes to what was subscribed to
+ return false;
+ }
+
+ /**
+ * Obtains all subscriptions in the system.
+ *
+ * @return Collection of All Subscriptions in the system.
+ */
+ @SuppressWarnings("unchecked")
+ protected Collection<Subscription> getAllAsyncSubscriptions() {
+ Collection<Subscription> subscriptions = null;
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ Query query = em.createQuery("SELECT s FROM Subscription s WHERE s.bindingKey IS NOT NULL");
+ subscriptions = (Collection<Subscription>) query.getResultList();
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ return subscriptions;
+ }
+
+ /**
+ * Deletes the subscription. i.e. when it is expired.
+ *
+ * @param subscription
+ */
+ protected void deleteSubscription(Subscription subscription) {
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ tx.begin();
+ em.remove(subscription);
+ tx.commit();
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ /**
+ * Sends out the notifications.
+ *
* @param getSubscriptionResults
- * @param resultList
- * @param notificationDate
- */
- protected void notify(GetSubscriptionResults getSubscriptionResults, SubscriptionResultsList resultList, Date notificationDate)
- {
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- try {
- String subscriptionKey = resultList.getSubscription().getSubscriptionKey();
- org.apache.juddi.model.Subscription modelSubscription =
- em.find(org.apache.juddi.model.Subscription.class, subscriptionKey);
- Date lastNotifiedDate = modelSubscription.getLastNotified();
- //now log to the db that we are sending the notification.
- tx.begin();
- modelSubscription.setLastNotified(notificationDate);
- em.persist(modelSubscription);
- tx.commit();
-
- org.apache.juddi.model.BindingTemplate bindingTemplate= em.find(org.apache.juddi.model.BindingTemplate.class, modelSubscription.getBindingKey());
- NotifySubscriptionListener body = new NotifySubscriptionListener();
+ * @param resultList
+ * @param notificationDate
+ */
+ protected void notify(GetSubscriptionResults getSubscriptionResults, SubscriptionResultsList resultList, Date notificationDate) {
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ try {
+ String subscriptionKey = resultList.getSubscription().getSubscriptionKey();
+ org.apache.juddi.model.Subscription modelSubscription
+ = em.find(org.apache.juddi.model.Subscription.class, subscriptionKey);
+ Date lastNotifiedDate = modelSubscription.getLastNotified();
+ //now log to the db that we are sending the notification.
+ tx.begin();
+ modelSubscription.setLastNotified(notificationDate);
+ em.persist(modelSubscription);
+ tx.commit();
+
+ org.apache.juddi.model.BindingTemplate bindingTemplate = em.find(org.apache.juddi.model.BindingTemplate.class, modelSubscription.getBindingKey());
+ NotifySubscriptionListener body = new NotifySubscriptionListener();
// if (resultList.getServiceList()!=null && resultList.getServiceList().getServiceInfos()!=null &&
// resultList.getServiceList().getServiceInfos().getServiceInfo().size() == 0) {
// resultList.getServiceList().setServiceInfos(null);
// }
- body.setSubscriptionResultsList(resultList);
-
+ body.setSubscriptionResultsList(resultList);
+
//TODO if the endpoint requires an auth token, look up the security endpoint of the remote registry
//via ClientSubscriptionInfo
-
- if (sendToken)
- {
- String authorizedName = modelSubscription.getAuthorizedName();
- UDDISecurityImpl security = new UDDISecurityImpl();
+ if (sendToken) {
+ String authorizedName = modelSubscription.getAuthorizedName();
+ UDDISecurityImpl security = new UDDISecurityImpl();
- if (authorizedName != null) { // add a security token if needed
- try {
- //obtain a token for this publisher
- org.uddi.api_v3.AuthToken token = security.getAuthToken(authorizedName);
- body.setAuthInfo(token.getAuthInfo());
- } catch (DispositionReportFaultMessage e) {
- body.setAuthInfo("Failed to generate token, please contact UDDI admin");
- log.error(e.getMessage(),e);
- }
- }
- }
-
- if (bindingTemplate!=null) {
- if (AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType()) ||
- AccessPointType.WSDL_DEPLOYMENT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) {
- try {
- Notifier notifier = new NotifierFactory().getNotifier(bindingTemplate);
- if (notifier!=null) {
- log.info("Sending out notification to " + bindingTemplate.getAccessPointUrl());
- notifier.notifySubscriptionListener(body);
- //there maybe more chunks we have to send
- String chunkToken=body.getSubscriptionResultsList().getChunkToken();
- while(chunkToken!=null) {
- UddiEntityPublisher publisher = new UddiEntityPublisher();
- publisher.setAuthorizedName(modelSubscription.getAuthorizedName());
- log.debug("Sending out next chunk: " + chunkToken + " to " + bindingTemplate.getAccessPointUrl());
- getSubscriptionResults.setChunkToken(chunkToken);
- resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
- body.setSubscriptionResultsList(resultList);
- if (resultListContainsChanges(resultList))
- //if (!IsEmpty(resultList))
- notifier.notifySubscriptionListener(body);
- chunkToken=body.getSubscriptionResultsList().getChunkToken();
- }
- //successful notification so remove from the badNotificationList
- if (badNotifications.containsKey(resultList.getSubscription().getSubscriptionKey()))
- badNotifications.remove(resultList.getSubscription().getSubscriptionKey());
- }
+ if (authorizedName != null) { // add a security token if needed
+ try {
+ //obtain a token for this publisher
+ org.uddi.api_v3.AuthToken token = security.getAuthToken(authorizedName);
+ body.setAuthInfo(token.getAuthInfo());
+ } catch (DispositionReportFaultMessage e) {
+ body.setAuthInfo("Failed to generate token, please contact UDDI admin");
+ log.error(e.getMessage(), e);
}
- catch (Exception e) {
+ }
+ }
+
+ if (bindingTemplate != null) {
+ if (AccessPointType.END_POINT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())
+ || AccessPointType.WSDL_DEPLOYMENT.toString().equalsIgnoreCase(bindingTemplate.getAccessPointType())) {
+ try {
+ Notifier notifier = new NotifierFactory().getNotifier(bindingTemplate);
+ if (notifier != null) {
+ log.info("Sending out notification to " + bindingTemplate.getAccessPointUrl());
+ notifier.notifySubscriptionListener(body);
+ //there maybe more chunks we have to send
+ String chunkToken = body.getSubscriptionResultsList().getChunkToken();
+ while (chunkToken != null) {
+ UddiEntityPublisher publisher = new UddiEntityPublisher();
+ publisher.setAuthorizedName(modelSubscription.getAuthorizedName());
+ log.debug("Sending out next chunk: " + chunkToken + " to " + bindingTemplate.getAccessPointUrl());
+ getSubscriptionResults.setChunkToken(chunkToken);
+ resultList = subscriptionImpl.getSubscriptionResults(getSubscriptionResults, publisher);
+ body.setSubscriptionResultsList(resultList);
+ if (resultListContainsChanges(resultList)) //if (!IsEmpty(resultList))
+ {
+ notifier.notifySubscriptionListener(body);
+ }
+ chunkToken = body.getSubscriptionResultsList().getChunkToken();
+ }
+ //successful notification so remove from the badNotificationList
+ if (badNotifications.containsKey(resultList.getSubscription().getSubscriptionKey())) {
+ badNotifications.remove(resultList.getSubscription().getSubscriptionKey());
+ }
+ }
+ } catch (Exception e) {
if (e.getCause() instanceof IOException) {
- addBadNotificationToList(subscriptionKey, bindingTemplate.getAccessPointUrl());
- //we could not notify so compensate the transaction above
- modelSubscription.setLastNotified(lastNotifiedDate);
- tx.begin();
- em.persist(modelSubscription);
- tx.commit();
+ addBadNotificationToList(subscriptionKey, bindingTemplate.getAccessPointUrl());
+ //we could not notify so compensate the transaction above
+ modelSubscription.setLastNotified(lastNotifiedDate);
+ tx.begin();
+ em.persist(modelSubscription);
+ tx.commit();
//} else {
- //log.warn("Unexpected WebServiceException " + e.getMessage() + e.getCause());
- }
- log.error("Unexpected notification exception:" +e.getClass().getCanonicalName() + " " + e.getMessage() +" "+ e.getCause());
- log.debug("Unexpected notification exception:" +e.getClass().getCanonicalName() + " "+ e.getMessage() + " "+e.getCause(),e);
- }
- } else {
- log.info("Binding " + bindingTemplate.getEntityKey() + " has an unsupported binding type of "
- + bindingTemplate.getAccessPointType() + ". Only "
- + AccessPointType.END_POINT.toString() + " and "
- + AccessPointType.WSDL_DEPLOYMENT.toString() + " are supported.");
- addBadNotificationToList(subscriptionKey, bindingTemplate.getAccessPointType() + " not supported");
- }
- } else {
- log.info("There is no valid binding template defined for this subscription: " + modelSubscription.getBindingKey());
- addBadNotificationToList(subscriptionKey, modelSubscription.getBindingKey() + " not found");
- }
-
- } finally {
- if (tx.isActive()) {
- tx.rollback();
- }
- em.close();
- }
- }
+ //log.warn("Unexpected WebServiceException " + e.getMessage() + e.getCause());
+ }
+ log.error("Unexpected notification exception:" + e.getClass().getCanonicalName() + " " + e.getMessage() + " " + e.getCause());
+ log.debug("Unexpected notification exception:" + e.getClass().getCanonicalName() + " " + e.getMessage() + " " + e.getCause(), e);
+ }
+ } else {
+ log.info("Binding " + bindingTemplate.getEntityKey() + " has an unsupported binding type of "
+ + bindingTemplate.getAccessPointType() + ". Only "
+ + AccessPointType.END_POINT.toString() + " and "
+ + AccessPointType.WSDL_DEPLOYMENT.toString() + " are supported.");
+ addBadNotificationToList(subscriptionKey, bindingTemplate.getAccessPointType() + " not supported");
+ }
+ } else {
+ log.info("There is no valid binding template defined for this subscription: " + modelSubscription.getBindingKey());
+ addBadNotificationToList(subscriptionKey, modelSubscription.getBindingKey() + " not found");
+ }
+
+ } finally {
+ if (tx.isActive()) {
+ tx.rollback();
+ }
+ em.close();
+ }
+ }
+
+ protected UDDISubscriptionImpl getSubscriptionImpl() {
+ return subscriptionImpl;
+ }
+
+ private boolean isTemporarilyDisabled(String subscriptionKey) {
+ if (maxTries > 0 && badNotifications.containsKey(subscriptionKey) && badNotifications.get(subscriptionKey) > maxTries) {
+ log.debug("Subscription " + subscriptionKey + " is temperarily disabled. The notification endpoint"
+ + " could not be reached more then " + maxTries + " times");
+ return true;
+ }
+ return false;
+ }
- protected UDDISubscriptionImpl getSubscriptionImpl() {
- return subscriptionImpl;
- }
-
- private boolean isTemporarilyDisabled(String subscriptionKey) {
- if (maxTries > 0 && badNotifications.containsKey(subscriptionKey) && badNotifications.get(subscriptionKey) > maxTries ) {
- log.debug("Subscription " + subscriptionKey + " is temperarily disabled. The notification endpoint" +
- " could not be reached more then " + maxTries + " times");
- return true;
- }
- return false;
- }
-
- private int addBadNotificationToList(String subscriptionKey, String endPoint) {
- Integer numberOfBadNotifications = 0;
- if (badNotifications.containsKey(subscriptionKey))
- numberOfBadNotifications = badNotifications.get(subscriptionKey);
- badNotifications.put(subscriptionKey, ++numberOfBadNotifications);
- log.debug("bad notification number " + numberOfBadNotifications + " for subscription "
- + subscriptionKey + " " + endPoint);
- return numberOfBadNotifications;
- }
+ private int addBadNotificationToList(String subscriptionKey, String endPoint) {
+ Integer numberOfBadNotifications = 0;
+ if (badNotifications.containsKey(subscriptionKey)) {
+ numberOfBadNotifications = badNotifications.get(subscriptionKey);
+ }
+ badNotifications.put(subscriptionKey, ++numberOfBadNotifications);
+ log.debug("bad notification number " + numberOfBadNotifications + " for subscription "
+ + subscriptionKey + " " + endPoint);
+ return numberOfBadNotifications;
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index 98bdb0b..700c96d 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -48,6 +48,7 @@ import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.GetChangeRecords;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.Operator;
import org.uddi.repl_v3.OperatorStatusType;
@@ -126,7 +127,12 @@ public class API_160_ReplicationTest {
HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
highWaterMarkVectorType.getHighWaterMark().add(highWaterMarks.get(0));
- List<ChangeRecord> changeRecords = repl.getChangeRecords("test", null, BigInteger.valueOf(highWaterMarks.get(0).getOriginatingUSN()), highWaterMarkVectorType);
+ GetChangeRecords req = new GetChangeRecords();
+ req.setRequestingNode("test");
+ req.setChangesAlreadySeen(null);
+
+ req.setResponseLimitVector(highWaterMarkVectorType);
+ repl.getChangeRecords(req);//"test", null, BigInteger.valueOf(highWaterMarks.get(0).getOriginatingUSN()), highWaterMarkVectorType);
Assert.fail("unexpected success");
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
index 4c172b9..dbb5bba 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/CLIServerTest.java
@@ -34,6 +34,7 @@ import org.uddi.api_v3.Contact;
import org.uddi.api_v3.PersonName;
import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.GetChangeRecords;
/**
*
@@ -101,7 +102,7 @@ public class CLIServerTest {
UDDIReplicationPortType juddiApiService = new UDDIService().getUDDIReplicationPort();
((BindingProvider) juddiApiService).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, replUrl);
- juddiApiService.getChangeRecords(null, new HighWaterMarkVectorType(), BigInteger.ONE, new HighWaterMarkVectorType());
+ juddiApiService.getChangeRecords(new GetChangeRecords());
Assert.assertTrue(sink);
sink = false;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java b/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
index f984747..7d05569 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/runtime/replicantImpl.java
@@ -21,7 +21,9 @@ import java.util.List;
import javax.jws.WebService;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.ChangeRecords;
import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.GetChangeRecords;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
import org.uddi.repl_v3.TransferCustody;
@@ -39,11 +41,7 @@ import org.uddi.v3_service.UDDIReplicationPortType;
public replicantImpl(){
}
- @Override
- public List<ChangeRecord> getChangeRecords(String requestingNode, HighWaterMarkVectorType changesAlreadySeen, BigInteger responseLimitCount, HighWaterMarkVectorType responseLimitVector) throws DispositionReportFaultMessage, RemoteException {
- CLIServerTest.sink = true;
- return null;
- }
+
@Override
public void notifyChangeRecordsAvailable(NotifyChangeRecordsAvailable body) throws DispositionReportFaultMessage, RemoteException {
@@ -66,5 +64,11 @@ import org.uddi.v3_service.UDDIReplicationPortType;
public void transferCustody(TransferCustody body) throws DispositionReportFaultMessage, RemoteException {
CLIServerTest.sink = true;
}
+
+ @Override
+ public ChangeRecords getChangeRecords(GetChangeRecords body) throws DispositionReportFaultMessage, RemoteException {
+ CLIServerTest.sink = true;
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
----------------------------------------------------------------------
diff --git a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
index 2e62348..ea6fc52 100644
--- a/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
+++ b/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiReplication.java
@@ -20,11 +20,14 @@ import java.rmi.RemoteException;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.xml.bind.JAXB;
import javax.xml.ws.BindingProvider;
import org.apache.juddi.v3.client.UDDIService;
import org.uddi.repl_v3.ChangeRecord;
import org.uddi.repl_v3.ChangeRecordIDType;
+import org.uddi.repl_v3.ChangeRecords;
import org.uddi.repl_v3.DoPing;
+import org.uddi.repl_v3.GetChangeRecords;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.v3_service.UDDIReplicationPortType;
@@ -75,7 +78,12 @@ class UddiReplication {
highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(DoPing(key2), record));
((BindingProvider) uddiReplicationPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, key2);
- List<ChangeRecord> changeRecords = uddiReplicationPort.getChangeRecords(sourcenode, highWaterMarkVectorType, BigInteger.valueOf(100), null);
+ GetChangeRecords req = new GetChangeRecords();
+ req.setRequestingNode(sourcenode);
+ req.setChangesAlreadySeen(highWaterMarkVectorType);
+ req.setResponseLimitCount(BigInteger.valueOf(100));
+ ChangeRecords res = uddiReplicationPort.getChangeRecords(req);
+ List<ChangeRecord> changeRecords = res.getChangeRecord();
System.out.println("Success...." + changeRecords.size() + " records returned");
System.out.println("Node, USN, type");
for (int i = 0; i < changeRecords.size(); i++) {
@@ -83,6 +91,7 @@ class UddiReplication {
changeRecords.get(i).getChangeID().getNodeID() + ", "
+ changeRecords.get(i).getChangeID().getOriginatingUSN() + ": "
+ GetChangeType(changeRecords.get(i)));
+ JAXB.marshal(changeRecords.get(i), System.out);
}
} catch (Exception ex) {
Logger.getLogger(UddiReplication.class.getName()).log(Level.SEVERE, null, ex);
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/uddi-ws/pom.xml
----------------------------------------------------------------------
diff --git a/uddi-ws/pom.xml b/uddi-ws/pom.xml
index 14f53a4..e63f59b 100644
--- a/uddi-ws/pom.xml
+++ b/uddi-ws/pom.xml
@@ -61,5 +61,11 @@
<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/939ae47f/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
index 3e70b67..d7fa1c7 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/ChangeRecordDelete.java
@@ -66,13 +66,13 @@ The changeRecordDelete MUST contain a modified timestamp to allow multi-node reg
public class ChangeRecordDelete implements Serializable{
@XmlTransient
private static final long serialVersionUID = -7081596275330679517L;
- @XmlElement(namespace = "urn:uddi-org:api_v3")
+ @XmlElement(namespace = "urn:uddi-org:repl_v3")
protected String businessKey;
- @XmlElement(namespace = "urn:uddi-org:api_v3")
+ @XmlElement(namespace = "urn:uddi-org:repl_v3")
protected String tModelKey;
- @XmlElement(namespace = "urn:uddi-org:api_v3")
+ @XmlElement(namespace = "urn:uddi-org:repl_v3")
protected String serviceKey;
- @XmlElement(namespace = "urn:uddi-org:api_v3")
+ @XmlElement(namespace = "urn:uddi-org:repl_v3")
protected String bindingKey;
@XmlElement(required = true)
protected XMLGregorianCalendar modified;
http://git-wip-us.apache.org/repos/asf/juddi/blob/939ae47f/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 2dda681..684c7a3 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
@@ -155,6 +155,14 @@ public interface UDDIReplicationPortType extends Remote {
* code. Error reporting SHALL be that specified by Section 4.8 – Success
* and Error Reporting of this specification.
*/
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ @WebResult(name = "changeRecords", targetNamespace = "urn:uddi-org:repl_v3", partName = "body")
+ @WebMethod(operationName = "get_changeRecords", action = "get_changeRecords")
+ public org.uddi.repl_v3.ChangeRecords getChangeRecords(
+ @WebParam(partName = "body", name = "get_changeRecords", targetNamespace = "urn:uddi-org:repl_v3")
+ org.uddi.repl_v3.GetChangeRecords body
+ ) throws DispositionReportFaultMessage,RemoteException;
+ /*
@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")
@@ -169,7 +177,7 @@ public interface UDDIReplicationPortType extends Remote {
@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
* change records available for consumption by replication by using this
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[26/28] juddi git commit: JUDDI-896 resolved a number of typos and
formatting issues JUDDI-241 business, service,
binding templates and models now replicate
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
new file mode 100644
index 0000000..f1b543d
--- /dev/null
+++ b/juddi-tomcat/juddi_install_data_node2/UDDI_tModels.xml
@@ -0,0 +1,2362 @@
+<?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.
+*
+*/ -->
+
+<!-- Important notes on editing this file
+
+1) if you add a new find qualifier item, you must then increase the count in
+ org.apache.juddi.v3.tck.TckSubscription.FINDQUALIFIER_TMODEL_TOTAL
+
+-->
+
+
+<save_tModel xmlns="urn:uddi-org:api_v3">
+ <tModel tModelKey="uddi:uddi.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:keyGenerator</name>
+ <description>UDDI domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:categorization:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:categorization:keyGenerator
+ </name>
+ <description>Key Generator for UDDI Categorization tModels
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#categorizationKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:categorization:types">
+ <name>uddi-org:types</name>
+ <description>UDDI Type Category System</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#UDDITypes
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:cacheable" keyValue="cacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:categorization:general_keywords">
+ <name>uddi-org:general_keywords</name>
+ <description>Category system consisting of namespace
+ identifiers and the keywords associated with
+ the namespaces.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#GenKW
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:sortorder:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:sortorder:keyGenerator
+ </name>
+ <description>Key Generator for UDDI Sort Order tModels
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#sortorderKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:transport:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:transport:keyGenerator
+ </name>
+ <description>Key Generator for UDDI Transport tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#transportKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:protocol:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi-org:protocol:keyGenerator</name>
+ <description> Key Generator for UDDI Protocol tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:v3_inquiry">
+ <name>uddi-org:inquiry_v3</name>
+ <description>UDDI Inquiry API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_api_v3_binding.wsdl#UDDI_Inquiry_SoapBinding
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#InqV3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:soap" keyValue="soapSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:xml" keyValue="xmlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:specification" keyValue="specification" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:categorization:nodes">
+ <name>uddi-org:nodes</name>
+ <description>Category system for identifying the nodes
+ of a registry.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#Nodes
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:v3_publication">
+ <name>uddi-org:publication_v3</name>
+ <description>UDDI Publication API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_api_v3_binding.wsdl#UDDI_Publication_SoapBinding
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#PubV3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:soap" keyValue="soapSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:xml" keyValue="xmlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:specification" keyValue="specification" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:v3_security">
+ <name>uddi-org:security_v3</name>
+ <description>UDDI Security API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_api_v3_binding.wsdl#UDDI_Security_SoapBinding
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#SecV3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:soap" keyValue="soapSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:xml" keyValue="xmlSpec" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:specification" keyValue="specification" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:relationships">
+ <name>uddi-org:relationships</name>
+ <description>Basic types of business relationships
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#Relationships
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:categorization:owningbusiness">
+ <name>uddi-org:owningBusiness_v3</name>
+ <description>Category system used to point to the
+ businessEntity
+ associated with the publisher of the tModel.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#owningBusiness
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="entityKeyValues" keyValue="businessKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:identifier:isreplacedby">
+ <name>uddi-org:isReplacedBy</name>
+ <description>Identifier system used to point to the UDDI
+ entity,
+ using UDDI keys, that is the logical replacement
+ for the one in which isReplacedBy is used.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#IsReplacedBy
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:identifier" keyValue="identifier" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="entityKeyValues" keyValue="businessKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:identifier:taxid">
+ <name>Tax ID</name>
+ <description>The Tax Identifier for this business
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc515847032
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:identifier" keyValue="identifier" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+
+ <keyedReference keyName="entityKeyValues" keyValue="businessKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+
+ <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:categorization:validatedby">
+ <name>uddi-org:validatedBy</name>
+ <description xml:lang="en">Category system used to point a value set or
+ category
+ group system tModel to associated value set Web service
+ implementations.
+ </description>
+ <description xml:lang="en">This is typically used on tModels to validate tModel Instances via the Value Set Validation service. The keyValue
+ should be an existing binding key pointing to that service.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#validatedBy
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="entityKeyValues" keyValue="bindingKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:categorization:derivedfrom">
+ <name>uddi-org:derivedFrom</name>
+ <description>Category system for referring tModels to other
+ tModels for the purpose of reuse.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#DerivedFrom
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uuid:5678dd4f-f95d-35f9-9ea6-f79a7dd64656">
+ <name>uddi-org:derivedFrom</name>
+ <description>Category system for referring tModels to other
+ tModels for the purpose of reuse.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#DerivedFrom
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:uncacheable" keyValue="uncacheable" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="entityKeyValues" keyValue="tModelKey" tModelKey="uddi:uddi.org:categorization:entitykeyvalues" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:categorization:entitykeyvalues">
+ <name>uddi-org:entityKeyValues</name>
+ <description>Category system used to declare that a value set
+ uses entity keys as valid values.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#entityKeyValues
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uddi:uddi.org:categorization:validatedby"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uuid:916b87bf-0756-3919-8eae-97dfa325e5a4">
+ <name>uddi-org:entityKeyValues</name>
+ <description>Category system used to declare that a value set
+ uses entity keys as valid values.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#entityKeyValues
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="" keyValue="uddi:juddi.apache.org:servicebindings-valueset-cp" tModelKey="uuid:25b22e3e-3dfa-3024-b02a-3438b9050b59"/>
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3">
+ <name>uddi-org:serverAuthenticatedSSL3</name>
+ <description>Secure Sockets Layer Version 3.0 with Server
+ Authentication
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#serverSSL3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!--
+ <tModel tModelKey="uuid:c8aea832-3faf-33c6-b32a-bbfd1b926294">
+ <name>uddi-org:serverAuthenticatedSSL3
+ </name>
+ <description>Secure Sockets Layer Version 3.0 with Server
+ Authentication
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#serverSSL3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ -->
+ <tModel tModelKey="uddi:uddi.org:protocol:mutualauthenticatedssl3">
+ <name>uddi-org:mutualAuthenticatedSSL3
+ </name>
+ <description>Secure Sockets Layer Version 3.0 with Mutual
+ Authentication
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#mutualSSL3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uuid:9555b5b6-55d4-3b0e-bb17-e084fed4e33f">
+ <name>uddi-org:mutualAuthenticatedSSL3
+ </name>
+ <description>Secure Sockets Layer Version 3.0 with Mutual
+ Authentication
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#mutualSSL3
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:http">
+ <name>uddi-org:http</name>
+ <description> A Web service that uses HTTP transport</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overHTTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uuid:68DE9E80-AD09-469D-8A37-088422BFBC36">
+ <name>uddi-org:http</name>
+ <description> A Web service that uses HTTP transport</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overHTTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:smtp">
+ <name>uddi-org:smtp</name>
+ <description>E-mail based Web service</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overSMTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uuid:93335D49-3EFB-48A0-ACEA-EA102B60DDC6">
+ <name>uddi-org:smtp</name>
+ <description>E-mail based Web service</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overSMTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:userfriendlysmtp">
+ <name>Human Readable SMTP Email Deliveries</name>
+ <description>This is a jUDDI extension for providing SMTP based subscription alerts in a human readable fashion.</description>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:ftp">
+ <name>uddi-org:ftp</name>
+ <description>File Transfer Protocol (FTP) based Web service
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overFTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uuid:5FCF5CD0-629A-4C50-8B16-F94E9CF2A674">
+ <name>uddi-org:ftp</name>
+ <description>File Transfer Protocol (FTP) based Web service
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overFTP
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:transport:fax">
+ <name>uddi-org:fax</name>
+ <description>Fax-based Web service</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overFax
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:transport:telephone">
+ <name>uddi-org:telephone</name>
+ <description>Telephone based service</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#overPhone
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:transport:rmi">
+ <name>uddi-org:rmi</name>
+ <description>Java RMI based service registered to the Java Registry</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overRMI
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:transport:jndi-rmi">
+ <name>uddi-org:jndi-rmi</name>
+ <description>A Java RMI based service registered to a JNDI Registry</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://juddi.apache.org/docs/3.0/userguide/html_single/index.html#sect-overJNDIRMI
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:amqp">
+ <name>uddi-org:amqp</name>
+ <description> A Web service that uses the AMQP transport</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://www.amqp.org/
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:omgdds">
+ <name>uddi-org:omgdds</name>
+ <description> A Web service that uses the OMG DDS transport</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://portals.omg.org/dds/
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:transport:udp">
+ <name>uddi-org:udp</name>
+ <description> A Web service that uses the UDP transport</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://docs.oasis-open.org/ws-dd/soapoverudp/1.1/os/wsdd-soapoverudp-1.1-spec-os.html
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:transport:jms">
+ <name>uddi-org:jms</name>
+ <description> A Web service that uses the JMS API</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://docs.oasis-open.org/ws-dd/soapoverudp/1.1/os/wsdd-soapoverudp-1.1-spec-os.html
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:transport" keyValue="transport" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:protocol:rest">
+ <name>uddi-org:protocol:rest</name>
+ <description xml:lang="en">A tModel that represents the Representational State Transfer architectural style</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:findqualifier:approximatematch">
+ <name>uddi-org:approximateMatch:SQL99
+ </name>
+ <description>UDDI approximate matching find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#wildcard
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:exactmatch">
+ <name>uddi-org:exactMatch</name>
+ <description>UDDI exact name matching findQualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#exactmatch
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:caseinsensitivematch">
+ <name>uddi-org:caseInsensitiveMatch
+ </name>
+ <description>UDDI case insensitive matching find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#caseinsens
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:casesensitivematch">
+ <name>uddi-org:caseSensitiveMatch</name>
+ <description>UDDI Case Sensitive Matching find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#casesens
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:diacriticsinsensitivematch">
+ <name>uddi-org:diacriticsInsensitiveMatch
+ </name>
+ <description>UDDI Diacritics Insensitive Matching find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#diacritInsens
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:diacriticssensitivematch">
+ <name>uddi-org:diacriticsSensitiveMatch
+ </name>
+ <description>UDDI Diacritics Sensitive Matching find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#diacritSens
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:sortorder:binarysort">
+ <name>uddi-org:binarySort</name>
+ <description>UDDI binary sort sortOrder qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#sortOrd
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:sortOrder" keyValue="sortOrder" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:sortorder:uts-10">
+ <name>uddi-org:UTS-10</name>
+ <description>UDDI Unicode Technical Standard #10 sort
+ collation sequence find qualifier
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#UCASort
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:sortOrder" keyValue="sortOrder" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:caseinsensitivesort">
+ <name>uddi-org:caseInsensitiveSort</name>
+ <description>UDDI sort qualifier used to sort results without
+ regard to case
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#caseInsensSort
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:casesensitivesort">
+ <name>uddi-org:caseSensitiveSort</name>
+ <description>UDDI sort qualifier used to sort results using
+ case sensitivity
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#caseSensSort
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+
+ <keyedReference keyName="uddi-org:types:sortOrder" keyValue="sortOrder" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:sortbynameasc">
+ <name>uddi-org:sortByNameAsc</name>
+ <description>UDDI sort qualifier used to sort results by name
+ in ascending order
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#nameAsc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:sortbynamedesc">
+ <name>uddi-org:sortByNameDesc</name>
+ <description>UDDI sort qualifier used to sort results by
+ name in descending order
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#nameDesc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:sortbydateasc">
+ <name>uddi-org:sortByDateAsc</name>
+ <description>UDDI sort qualifier used to sort results by date in
+ ascending order
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#dateAsc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:sortbydatedesc">
+ <name>uddi-org:sortByDateDesc</name>
+ <description>UDDI sort qualifier used to sort results
+ by date in descending order
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#dateDesc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:andallkeys">
+ <name>uddi-org:andAllKeys</name>
+ <description>UDDI find qualifier used to request that a
+ logical AND be performed on bag contents
+ prior to a search
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#andAll
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:orallkeys">
+ <name>uddi-org:orAllKeys</name>
+ <description>UDDI find qualifier used to request that a
+ logical OR be performed on bag contents
+ prior to a search
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#orAll
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:orlikekeys">
+ <name>uddi-org:orLikeKeys</name>
+ <description>UDDI find qualifier used to find entities
+ that reference one of the values from each
+ referenced value set
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#orLike
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:combinecategorybags">
+ <name>uddi-org:combineCategoryBags</name>
+ <description>UDDI find qualifier used to treat all of the
+ categoryBags within a businessEntity as if
+ they were one during inquiry
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#combineCatBags
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:servicesubset">
+ <name>uddi-org:serviceSubset</name>
+ <description>UDDI find qualifier used to use categoryBags
+ of businessService elements to satisfy the
+ find_business inquiry.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#servSubset
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:bindingsubset">
+ <name>uddi-org:bindingSubset</name>
+ <description>UDDI find qualifier for specifying use of
+ categoryBags of bindingTempate elements to satisfy
+ the find_business or find_service inquiries.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#bindSubset
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:suppressprojectedservices">
+ <name>uddi-org:suppressProjectedServices
+ </name>
+ <description>UDDI find qualifier used to exclude service
+ projections from an inquiry function at all
+ levels.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#suppressProjSvcs
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:findqualifier:signaturepresent">
+ <name>uddi-org:signaturePresent</name>
+ <description>UDDI findQualifier used to return only entities
+ that have or are contained in entities that have
+ XML Digital Signatures.
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#sign
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:findQualifier" keyValue="findQualifier" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:specification:hostingredirector">
+ <name>uddi-org:hostingRedirector</name>
+ <description>UDDI Hosting Redirector service specification
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#hostDir
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:specification" keyValue="specification" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:specification:v3_policy">
+ <name>uddi-org:v3_policy</name>
+ <description>UDDI Policy Description service specification
+ </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#policyDesc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:specification" keyValue="specification" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:v3_ownership_transfer">
+ <name>uddi-org:ownership_transfer_v3</name>
+ <description>UDDI Custody and Ownership Transfer API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_custody_v3_binding.wsdl
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#OwnershipTransfer
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl"
+ keyValue="wsdlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:soap"
+ keyValue="soapSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:xml"
+ keyValue="xmlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:specification"
+ keyValue="specification"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:v3_subscription">
+ <name>uddi-org:subscription_v3</name>
+ <description>UDDI Subscription API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_sub_v3_binding.wsdl
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#Sub
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl"
+ keyValue="wsdlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:soap"
+ keyValue="soapSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:xml"
+ keyValue="xmlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:specification"
+ keyValue="specification"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:v3_subscriptionlistener">
+ <name>uddi-org:subscriptionListener_v3</name>
+ <description>UDDI Subscription Listener API V3.0</description>
+ <overviewDoc>
+ <overviewURL useType="wsdlInterface">
+ http://uddi.org/wsdl/uddi_subr_v3_binding.wsdl
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#Subscribe
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:wsdl"
+ keyValue="wsdlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:soap"
+ keyValue="soapSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:xml"
+ keyValue="xmlSpec"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:specification"
+ keyValue="specification"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+ <!-- New Canonical tModels (see also JUDDI-461) -->
+ <!-- 1. WSDL Entity Type tModel -->
+ <tModel tModelKey="uddi:uddi.org:wsdl:types">
+ <name>uddi-org:wsdl:types</name>
+ <description xml:lang="en">WSDL Type Category System</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#wsdlTypes
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:wadl:types">
+ <name>uddi-org:wadl:types</name>
+ <description xml:lang="en">WADL Type Category System</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <!-- 2. XML Namespace tModel -->
+ <tModel tModelKey="uddi:uddi.org:xml:namespace">
+ <name>uddi-org:xml:namespace</name>
+ <description xml:lang="en">A category system used to indicate namespaces</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlNamespace
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 3. XML Local Name tModel -->
+ <tModel tModelKey="uddi:uddi.org:xml:localname">
+ <name>uddi-org:xml:localName</name>
+ <description xml:lang="en">A category system used to indicate XML local names</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlLocalName
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 4. WSDL portType Reference tModel -->
+ <tModel tModelKey="uddi:uddi.org:wsdl:porttypereference">
+ <name>uddi-org:wsdl:portTypeReference</name>
+ <description xml:lang="en">A category system used to reference a wsdl:portType tModel</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#portTypeReference
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 5. SOAP Protocol tModel -->
+ <tModel tModelKey="uddi:uddi.org:protocol:soap">
+ <name>uddi-org:protocol:soap</name>
+ <description xml:lang="en">A tModel that represents the SOAP 1.1 protocol</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#soap
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:protocol:soap12">
+ <name>uddi-org:protocol:soap12</name>
+ <description xml:lang="en">A tModel that represents the SOAP 1.2 protocol</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#soap
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <!-- 6. HTTP Protocol tModel -->
+ <tModel tModelKey="uddi:uddi.org:protocol:http">
+ <name>uddi-org:protocol:http</name>
+ <description xml:lang="en">A tModel that represents the HTTP protocol</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#http
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:protocol" keyValue="protocol" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 7. Protocol Categorization -->
+ <tModel tModelKey="uddi:uddi.org:wsdl:categorization:protocol">
+ <name>uddi-org:wsdl:categorization:protocol</name>
+ <description xml:lang="en">Category system used to describe the protocol supported by a wsdl:binding</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#protocol
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 8. Transport Categorization -->
+ <tModel tModelKey="uddi:uddi.org:wsdl:categorization:transport">
+ <name>uddi-org:wsdl:categorization:transport</name>
+ <description xml:lang="en">Category system used to describe the transport supported by a wsdl:binding</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#transport
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <!-- 9. WSDL Address tModel -->
+ <tModel tModelKey="uddi:uddi.org:wsdl:address" >
+ <name>uddi-org:wsdl:address</name>
+ <description xml:lang="en">A tModel used to indicate the WSDL address option</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#Address
+ </overviewURL>
+ </overviewDoc>
+ </tModel>
+ <!-- BPEL Categorization -->
+ <tModel tModelKey="uddi:uddi.org:bpel:types">
+ <name>uddi-org:bpel:types</name>
+ <description xml:lang="en">Category system used indicate BPEL processes</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-bpel-20040725.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:tmodelkey:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>uddi:tmodelkey:keygenerator
+ </name>
+ <description>Key Generator for generic UDDI tModel Keys
+ </description>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:tmodelkey:address">
+ <name>uddi:tmodelkey:address</name>
+ <description xml:lang="en">Identifies an address. This can be a physical, mailing, or electric address.</description>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
+ keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:tmodelkey:group">
+ <name>uddi:tmodelkey:group</name>
+ <description xml:lang="en">Identifies a tModel group.</description>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:tmodelkey:blank">
+ <name>uddi:tmodelkey:blank</name>
+ <description xml:lang="en">Identifies a blank tModel</description>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+
+
+
+
+ <tModel tModelKey="urn:wsdm.org:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>urn:wsdm.org:keygenerator</name>
+ <description>Key Generator for WSDM.org tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:metric:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>urn:wsdm.org:metric:keygenerator</name>
+ <description>Key Generator for WSDM.org Metric tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:identity:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>urn:wsdm.org:identity:keygenerator</name>
+ <description>Key Generator for WSDM.org Identity tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>urn:wsdm.org:qos:keygenerator</name>
+ <description>Key Generator for WSDM.org Quality of Service tModels </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:metric:requestcount">
+ <name>RequestCount</name>
+ <description xml:lang="en">The number of requests to a given service. (number of requests)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:metric:replycount">
+ <name>ReplyCount</name>
+ <description xml:lang="en">The number of replies from a given service. (number of replies)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:metric:faultcount">
+ <name>FaultCount</name>
+ <description xml:lang="en">The number of faults from a given service. (number of faults)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:identity:resourceId">
+ <name>ResourceId</name>
+ <description xml:lang="en">This is the unique identity by which the resource (service) is known to the management system. It is useful for further queries. (resource identification in URI format)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="urn:wsdm.org:metric:lastupdatetime">
+ <name>LastUpdateTime</name>
+ <description xml:lang="en">Represents the last time this metric was updated. (time value)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="urn:wsdm.org:qos:responsetime_average">
+ <name>ResponseTime_Average</name>
+ <description xml:lang="en">Average response time of the service. (numeric value or symbolic rating)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:throughput_count">
+ <name>Throughput_count</name>
+ <description xml:lang="en">Throughput count. (numeric value or symbolic rating)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:throughput_bytes">
+ <name>Throughput_bytes</name>
+ <description xml:lang="en">Throughput bytes. (numeric value or symbolic rating)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:reliability">
+ <name>Reliability</name>
+ <description xml:lang="en">Reliability or the measure of. (numeric value or symbolic rating)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:reportingperiodstart">
+ <name>ReportingPeriodStart</name>
+ <description xml:lang="en">The beginning on the reporting time period used for the information above. (dateTime)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:reportingperiodend">
+ <name>ReportingPeriodEnd</name>
+ <description xml:lang="en">The end of the reporting time period used for the information above. (dateTime)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="urn:wsdm.org:qos:updateinterval">
+ <name>UpdateInterval</name>
+ <description xml:lang="en">How often is this information updated in UDDI (it is not assumed to be realtime). (duration)</description>
+ <overviewDoc>
+ <overviewURL>
+ https://www.oasis-open.org/committees/download.php/6227/uddi-spec-tc-tn-QoS-metrics-20040224.doc
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="urn:uddi:uddi.org:version">
+ <name>Service Interface Version</name>
+ <description xml:lang="en">When using this tModel as a tModelInstance, it can be used to describe a version associated with either a service interface, a bindingTemplate service instance. Note: This is a jUDDI specific addon and may not be present in other registries.</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ibm.com/developerworks/webservices/library/ws-version/
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:iso3166">
+ <name>ubr-uddi-org:iso-ch:3166-2003</name>
+ <name>ISO 3166 Country Codes</name>
+ <description xml:lang="en">When used in a Category Bag for a Business or Service, it can indicate the physical or logically location of the Business or Service.</description>
+ <description xml:lang="en">ISO 3166 Codes for names of countries or regions. Updated with newsletters ISO 3166-1 V-1, V-2, V-3, V-4, V-5, V-6, V-7, ISO 3166-2 I-1, I-2, I-3, I-4.</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.iso.org/iso/country_codes
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:cacheable" keyValue="cacheable" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:valueSet" keyValue="valueSet" tModelKey="uddi:uddi.org:categorization:types"/>
+
+
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:unspsc_geo3166">
+ <name>United Nations Standard Products and Services Code with ISO 3166 Grouping</name>
+ <description xml:lang="en">Grouping of the category systems for UNSPSC and ISO 3166. As a consequence, keyedReferenceGroups that reference this tModel describe countries or regions where a product category is offered.</description>
+ <overviewDoc>
+ <overviewURL>
+ http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc535251470
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL>
+ http://www.unspsc.org/
+ </overviewURL>
+ </overviewDoc>
+
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:keygenerator">
+ <name>World Geodetic System Key Generator</name>
+ <description xml:lang="en">Key Generator for Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#protocolKeyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84">
+ <name>World Geodetic System</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:latitude">
+ <name>WGS Latitude</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:wgs84:longitude">
+ <name>WGS Longitude</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="org:ubr:categorization:geo_precision">
+ <name xml:lang="en">WGS Geographic Precision</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:keygenerator">
+ <name>Universal Business Registry Key Generator</name>
+ <description>UBR domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:keygenerator">
+ <name>Universal Business Registry Categorization Group Key Generator</name>
+ <description>UBR Categorization Group domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:keygenerator">
+ <name>Universal Business Registry Categorization Key Generator</name>
+ <description>UBR Categorization domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
+ <name>ubr-uddi-org:postalAddress</name>
+ <description xml:lang="en">Postal address structure</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:postalAddress" keyValue="postalAddress" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:relationships">
+ <name>ubr-uddi-org:relationships</name>
+ <description xml:lang="en">relationships in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:keygenerator">
+ <name>ubr-uddi-org:identifier key generator</name>
+ <description>UBR Identifier Group domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:owningbusiness">
+ <name>UBR Identifier Owning Business</name>
+ <description xml:lang="en">Identifier for an Owning Business in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:unspsc">
+ <name>UBR Categorization United Nations Standard Products and Services Code</name>
+ <description xml:lang="en">UNSPSC Categorization in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://www.unspsc.org/
+ </overviewURL>
+ </overviewDoc>
+
+ <categoryBag>
+ <!--<keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types"/>-->
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:cacheable" keyValue="cacheable" tModelKey="uddi:uddi.org:categorization:types"/>
+
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:keygenerator">
+ <name>North American Industry Classification System Key Generator</name>
+ <description xml:lang="en">North American Industry Classification System Key Generator.</description>
+ <description xml:lang="en">The North American Industry Classification System (NAICS) is the standard used by Federal statistical agencies in classifying business establishments for the purpose of collecting, analyzing, and publishing statistical data in the U.S. business economy</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ <overviewURL useType="text">
+ https://www.census.gov/eos/www/naics/index.html
+ </overviewURL>
+
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:1997">
+ <name>North American Industry Classification System 1997</name>
+ <description xml:lang="en">North American Industry Classification System 1997</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/eos/www/naics/reference_files_tools/1997/1997.html
+ </overviewURL>
+
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <!--<keyedReference keyName="uddi-org:types:unchecked" keyValue="unchecked" tModelKey="uddi:uddi.org:categorization:types"/>-->
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:cacheable" keyValue="cacheable" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2012">
+ <name>North American Industry Classification System 2012</name>
+ <description xml:lang="en">North American Industry Classification System 2012</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2012
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2002">
+ <name>ntis-gov:naics:2002</name>
+ <name>North American Industry Classification System 2002</name>
+ <description xml:lang="en">North American Industry Classification System 2002</description>
+ <description xml:lang="en">Business Taxonomy: NAICS (2002 Release)</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2002
+ </overviewURL>
+ </overviewDoc>
+ <overviewDoc>
+ <overviewURL>
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS2002
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization" keyValue="categorization" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:cacheable" keyValue="cacheable" tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2007">
+ <name>North American Industry Classification System 2007</name>
+ <description xml:lang="en">North American Industry Classification System 2007</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2007
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:taxonomy:keygenerator">
+ <name>UBR Taxonomies</name>
+ <description xml:lang="en">Universal Business Registry Taxonomy Key Generator.</description>
+
<TRUNCATED>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[12/28] juddi git commit: JUDDI-241 adjusting database configuration.
get/setReplicationConfig now function as expected
Posted by al...@apache.org.
JUDDI-241 adjusting database configuration. get/setReplicationConfig now function as expected
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/a975954b
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/a975954b
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/a975954b
Branch: refs/heads/master
Commit: a975954b140694096ac3f81cd5bf77da19922cbb
Parents: 7aa78f6
Author: Alex <al...@apache.org>
Authored: Sat Nov 15 21:45:07 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sat Nov 15 21:45:07 2014 -0500
----------------------------------------------------------------------
.../org/apache/juddi/api/impl/JUDDIApiImpl.java | 194 +++++++++--------
.../apache/juddi/mapping/MappingApiToModel.java | 123 ++++++-----
.../apache/juddi/mapping/MappingModelToApi.java | 4 +-
.../apache/juddi/model/CommunicationGraph.java | 99 ---------
.../main/java/org/apache/juddi/model/Edge.java | 21 +-
.../juddi/model/ReplicationConfiguration.java | 70 +++---
.../juddi/validation/ValidateReplication.java | 43 +++-
.../src/main/resources/messages.properties | 2 +-
.../juddi/api/impl/API_160_ReplicationTest.java | 20 ++
.../src/test/resources/META-INF/persistence.xml | 212 +++++++++----------
10 files changed, 371 insertions(+), 417 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index 1f7ca77..e2b9dc5 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -118,8 +118,8 @@ import org.uddi.v3_service.UDDISubscriptionPortType;
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
@WebService(serviceName = "JUDDIApiService",
- endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
- targetNamespace = "urn:juddi-apache-org:v3_service")
+ endpointInterface = "org.apache.juddi.v3_service.JUDDIApiPortType",
+ targetNamespace = "urn:juddi-apache-org:v3_service")
public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortType {
private Log log = LogFactory.getLog(this.getClass());
@@ -134,7 +134,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public PublisherDetail savePublisher(SavePublisher body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -167,12 +167,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_PUBLISHER,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_PUBLISHER,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -190,7 +190,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public void deletePublisher(DeletePublisher body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -249,11 +249,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_PUBLISHER,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_PUBLISHER,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -272,7 +272,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public PublisherDetail getPublisherDetail(GetPublisherDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidatePublisher(null).validateGetPublisherDetail(body);
@@ -306,12 +306,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_PUBLISHER_DETAIL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_PUBLISHER_DETAIL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -335,7 +335,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public PublisherDetail getAllPublisherDetail(GetAllPublisherDetail body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
new ValidatePublisher(null).validateGetAllPublisherDetail(body);
@@ -363,12 +363,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_PUBLISHER_DETAIL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_PUBLISHER_DETAIL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -390,7 +390,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public void adminDeleteTModel(DeleteTModel body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -410,11 +410,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_DELETE_TMODEL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_DELETE_TMODEL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -433,7 +433,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws RemoteException
*/
public void deleteClientSubscriptionInfo(DeleteClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -453,11 +453,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -479,7 +479,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws RemoteException
*/
public ClientSubscriptionInfoDetail saveClientSubscriptionInfo(SaveClientSubscriptionInfo body)
- throws DispositionReportFaultMessage, RemoteException {
+ throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -513,12 +513,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -539,7 +539,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public ClientSubscriptionInfoDetail getAllClientSubscriptionInfoDetail(GetAllClientSubscriptionInfoDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidateClientSubscriptionInfo(null).validateGetAllClientSubscriptionDetail(body);
@@ -559,7 +559,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo, em);
result.getClientSubscriptionInfo().add(apiClientSubscriptionInfo);
}
@@ -567,12 +567,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -594,7 +594,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public ClientSubscriptionInfoDetail getClientSubscriptionInfoDetail(GetClientSubscriptionInfoDetail body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
new ValidateClientSubscriptionInfo(null).validateGetClientSubscriptionInfoDetail(body);
@@ -622,7 +622,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo, em);
result.getClientSubscriptionInfo().add(apiClientSubscriptionInfo);
}
@@ -631,12 +631,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -658,7 +658,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@Override
public ClerkDetail saveClerk(SaveClerk body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -678,35 +678,34 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
MappingApiToModel.mapClerk(apiClerk, modelClerk);
org.apache.juddi.model.Node node2 = em.find(org.apache.juddi.model.Node.class, apiClerk.getNode().getName());
- if (node2==null)
- {
+ if (node2 == null) {
//it doesn't exist yet
node2 = new Node();
MappingApiToModel.mapNode(apiClerk.getNode(), node2);
em.persist(node2);
}
-
+
modelClerk.setNode(node2.getName());
Object existingUddiEntity = em.find(modelClerk.getClass(), modelClerk.getClerkName());
if (existingUddiEntity != null) {
-
+
em.merge(modelClerk);
} else {
em.persist(modelClerk);
}
-
+
result.getClerk().add(apiClerk);
}
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLERK,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_CLERK,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -728,7 +727,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
* @throws DispositionReportFaultMessage
*/
public NodeDetail saveNode(SaveNode body)
- throws DispositionReportFaultMessage {
+ throws DispositionReportFaultMessage {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -761,12 +760,12 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return result;
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -788,14 +787,14 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
*/
@SuppressWarnings("unchecked")
public SyncSubscriptionDetail invokeSyncSubscription(
- SyncSubscription body) throws DispositionReportFaultMessage,
- RemoteException {
+ SyncSubscription body) throws DispositionReportFaultMessage,
+ RemoteException {
long startTime = System.currentTimeMillis();
//validate
SyncSubscriptionDetail syncSubscriptionDetail = new SyncSubscriptionDetail();
Map<String, org.apache.juddi.api_v3.ClientSubscriptionInfo> clientSubscriptionInfoMap
- = new HashMap<String, org.apache.juddi.api_v3.ClientSubscriptionInfo>();
+ = new HashMap<String, org.apache.juddi.api_v3.ClientSubscriptionInfo>();
//find the clerks to go with these subscriptions
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -815,7 +814,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
throw new InvalidKeyPassedException(new ErrorMessage("errors.invalidkey.SubscripKeyNotFound", subscriptionKey));
}
org.apache.juddi.api_v3.ClientSubscriptionInfo apiClientSubscriptionInfo = new org.apache.juddi.api_v3.ClientSubscriptionInfo();
- MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo,em);
+ MappingModelToApi.mapClientSubscriptionInfo(modelClientSubscriptionInfo, apiClientSubscriptionInfo, em);
clientSubscriptionInfoMap.put(apiClientSubscriptionInfo.getSubscriptionKey(), apiClientSubscriptionInfo);
}
@@ -823,7 +822,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.INVOKE_SYNCSUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -852,23 +851,23 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
marshaller.marshal(list, sw);
log.info(
- "Notification received by UDDISubscriptionListenerService : " + sw.toString());
+ "Notification received by UDDISubscriptionListenerService : " + sw.toString());
NotificationList<String> nl = NotificationList.getInstance();
nl.getNotifications()
- .add(sw.toString());
+ .add(sw.toString());
//update the registry with the notification list.
XRegisterHelper.handle(fromClerk, toClerk, list);
syncSubscriptionDetail.getSubscriptionResultsList()
- .add(list);
+ .add(list);
} catch (Exception ce) {
log.error(ce.getMessage(), ce);
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SAVE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
if (ce instanceof DispositionReportFaultMessage) {
throw (DispositionReportFaultMessage) ce;
}
@@ -882,7 +881,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.INVOKE_SYNCSUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
return syncSubscriptionDetail;
}
@@ -915,11 +914,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -951,18 +950,18 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
List<org.apache.juddi.model.Clerk> resultList = qry.getResultList();
for (int i = 0; i < resultList.size(); i++) {
Clerk api = new Clerk();
- MappingModelToApi.mapClerk(resultList.get(i), api,em);
+ MappingModelToApi.mapClerk(resultList.get(i), api, em);
ret.getClerk().add(api);
}
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLERKS,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLERKS,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -991,27 +990,25 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Node existingUddiEntity = em.find(org.apache.juddi.model.Node.class, req.getNodeID());
if (existingUddiEntity != null) {
-
//cascade delete all clerks tied to this node, confirm that it works
-
- Query createQuery = em.createQuery("delete from Clerk c where c.node = :nodename");
- createQuery.setParameter("nodename", req.getNodeID());
- createQuery.executeUpdate();
-
- em.remove(existingUddiEntity);
- found=true;
+ Query createQuery = em.createQuery("delete from Clerk c where c.node = :nodename");
+ createQuery.setParameter("nodename", req.getNodeID());
+ createQuery.executeUpdate();
+
+ em.remove(existingUddiEntity);
+ found = true;
+ } else {
+ throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NotFound"));
}
- else
- throw new InvalidKeyPassedException(new ErrorMessage("errors.deleteNode.NotFound"));
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_NODE,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_NODE,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1042,7 +1039,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
org.apache.juddi.model.Clerk existingUddiEntity = em.find(org.apache.juddi.model.Clerk.class, req.getClerkID());
if (existingUddiEntity
- != null) {
+ != null) {
em.remove(existingUddiEntity);
found = true;
}
@@ -1050,11 +1047,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLERK,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.DELETE_CLERK,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1148,11 +1145,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SubscriptionQuery.DELETE_SUBSCRIPTION,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(SubscriptionQuery.DELETE_SUBSCRIPTION,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1168,7 +1165,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
long startTime = System.currentTimeMillis();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_BUSINESS,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
ValidatePublish.unsupportedAPICall();
return null;
}
@@ -1196,11 +1193,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_TMODEL,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_TMODEL,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
@@ -1247,11 +1244,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_CLIENT_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1264,7 +1261,7 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
}
@Override
- public DispositionReport setReplicationNodes(String authInfo, org.uddi.repl_v3.ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage, RemoteException {
+ public synchronized DispositionReport setReplicationNodes(String authInfo, org.uddi.repl_v3.ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage, RemoteException {
long startTime = System.currentTimeMillis();
EntityManager em = PersistenceManager.getEntityManager();
@@ -1276,20 +1273,37 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
if (!((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.AdminReqd"));
}
- new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration);
+ new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration,em);
- org.apache.juddi.model.ReplicationConfiguration model = new ReplicationConfiguration();
- MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
- em.persist(model);
+ org.apache.juddi.model.ReplicationConfiguration model = null;
+ try {
+ model = (ReplicationConfiguration) em.createQuery("select c FROM ReplicationConfiguration c order by c.serialNumber desc").getSingleResult();
+ } catch (Exception ex) {
+ }
+ if (model == null) {
+ model = new ReplicationConfiguration();
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
+ model.setSerialNumber(System.currentTimeMillis());
+ em.persist(model);
+
+ } else {
+ //long oldid = model.getSerialNumber();
+ em.remove(model);
+ model = new ReplicationConfiguration();
+ MappingApiToModel.mapReplicationConfiguration(replicationConfiguration, model, em);
+ model.setSerialNumber(System.currentTimeMillis());
+ em.persist(model);
+
+ }
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.SET_REPLICATION_NODES,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1327,11 +1341,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.GET_ALL_NODES,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
if (tx.isActive()) {
@@ -1366,11 +1380,11 @@ public class JUDDIApiImpl extends AuthenticatedService implements JUDDIApiPortTy
tx.commit();
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_SUB,
- QueryStatus.SUCCESS, procTime);
+ QueryStatus.SUCCESS, procTime);
} catch (DispositionReportFaultMessage drfm) {
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(JUDDIQuery.ADMIN_SAVE_SUB,
- QueryStatus.FAILED, procTime);
+ QueryStatus.FAILED, procTime);
throw drfm;
} finally {
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index 65739a4..b42cf81 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -35,7 +35,6 @@ import org.apache.juddi.model.Address;
import org.apache.juddi.model.BindingTemplate;
import org.apache.juddi.model.BusinessService;
import org.apache.juddi.model.CanonicalizationMethod;
-import org.apache.juddi.model.CommunicationGraph;
import org.apache.juddi.model.Contact;
import org.apache.juddi.model.ControlMessage;
import org.apache.juddi.model.Edge;
@@ -60,6 +59,7 @@ import org.uddi.api_v3.Description;
import org.uddi.api_v3.OperationalInfo;
import org.uddi.api_v3.SaveBinding;
import org.uddi.repl_v3.ChangeRecord;
+import org.uddi.repl_v3.CommunicationGraph;
import org.uddi.repl_v3.ReplicationConfiguration;
import org.uddi.sub_v3.ObjectFactory;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -1425,7 +1425,7 @@ public class MappingApiToModel {
if (replicationConfiguration.getRegistryContact() != null) {
model.setContact(mapContact(replicationConfiguration.getRegistryContact().getContact()));
}
- model.setCommunicationGraph(mapCommunicationGraph(replicationConfiguration.getCommunicationGraph(), em));
+ mapCommunicationGraph(model,replicationConfiguration.getCommunicationGraph(), em);
model.setOperator(mapOperators(replicationConfiguration.getOperator()));
if (replicationConfiguration.getSignature() != null) {
model.setSignatures(mapApiSignaturesToModelSignatures(replicationConfiguration.getSignature()));
@@ -1443,12 +1443,65 @@ public class MappingApiToModel {
return model;
}
- private static CommunicationGraph mapCommunicationGraph(org.uddi.repl_v3.CommunicationGraph communicationGraph, EntityManager em) throws DispositionReportFaultMessage {
- if (communicationGraph == null) {
+
+
+ private static List<Operator> mapOperators(List<org.uddi.repl_v3.Operator> api) throws DispositionReportFaultMessage {
+ if (api == null) {
return null;
}
- CommunicationGraph model = new CommunicationGraph();
+ List<Operator> model = new ArrayList<Operator>();
+ for (int i = 0; i < api.size(); i++) {
+ Operator op = new Operator();
+ op.setSoapReplicationURL(api.get(i).getSoapReplicationURL());
+ if (!api.get(i).getContact().isEmpty()) {
+ op.setContact(new ArrayList<Contact>());
+ for (int k = 0; k < api.get(i).getContact().size(); k++) {
+ op.getContact().add(mapContact(api.get(i).getContact().get(k)));
+ }
+ }
+ op.setOperatorNodeID(api.get(i).getOperatorNodeID());
+ op.setOperatorStatus(mapOperatorStatus(api.get(i).getOperatorStatus()));
+ if (!api.get(i).getKeyInfo().isEmpty()) {
+ op.setKeyInfo(new ArrayList<KeyInfo>());
+ for (int k = 0; k < api.get(i).getKeyInfo().size(); k++) {
+ org.apache.juddi.model.KeyInfo modelKeyInfo = new KeyInfo();
+ modelKeyInfo.setXmlID(api.get(i).getKeyInfo().get(i).getId());
+ modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
+ if (api.get(i).getKeyInfo().get(i).getContent() != null) {
+ modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
+ for (int x = 0; x < api.get(i).getKeyInfo().get(k).getContent().size(); x++) {
+ mapKeyValue((JAXBElement) api.get(i).getKeyInfo().get(k).getContent().get(x), modelKeyInfo.getKeyDataValue());
+ }
+ }
+ op.getKeyInfo().add(modelKeyInfo);
+ }
+
+ }
+ model.add(op);
+
+ }
+ return model;
+ }
+
+ private static OperatorStatusType mapOperatorStatus(org.uddi.repl_v3.OperatorStatusType operatorStatus) {
+ switch (operatorStatus) {
+ case NEW:
+ return OperatorStatusType.NEW;
+ case NORMAL:
+ return OperatorStatusType.NORMAL;
+ case RESIGNED:
+ return OperatorStatusType.RESIGNED;
+ }
+ return null;
+ }
+
+ private static void mapCommunicationGraph(org.apache.juddi.model.ReplicationConfiguration model, CommunicationGraph communicationGraph, EntityManager em) throws ValueNotAllowedException {
+
+ if (model == null) {
+ return;
+ }
+
/**
* Following the listing of nodes is the controlledMessage
* element that lists the set of messages over which this
@@ -1478,7 +1531,7 @@ public class MappingApiToModel {
List<Edge> ret = new ArrayList<Edge>();
for (int i = 0; i < communicationGraph.getEdge().size(); i++) {
Edge e = new Edge();
- e.setCommunicationGraph(model);
+
if (communicationGraph.getEdge().get(i).getMessageReceiver() == null) {
throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNodeNotFound", communicationGraph.getEdge().get(i).getMessageReceiver()));
}
@@ -1524,61 +1577,7 @@ public class MappingApiToModel {
ret.add(e);
}
model.setEdge(ret);
- }
-
- return model;
-
- }
-
- private static List<Operator> mapOperators(List<org.uddi.repl_v3.Operator> api) throws DispositionReportFaultMessage {
- if (api == null) {
- return null;
- }
- List<Operator> model = new ArrayList<Operator>();
- for (int i = 0; i < api.size(); i++) {
- Operator op = new Operator();
- op.setSoapReplicationURL(api.get(i).getSoapReplicationURL());
+ }} }
+
- if (!api.get(i).getContact().isEmpty()) {
- op.setContact(new ArrayList<Contact>());
- for (int k = 0; k < api.get(i).getContact().size(); k++) {
- op.getContact().add(mapContact(api.get(i).getContact().get(k)));
- }
- }
- op.setOperatorNodeID(api.get(i).getOperatorNodeID());
- op.setOperatorStatus(mapOperatorStatus(api.get(i).getOperatorStatus()));
- if (!api.get(i).getKeyInfo().isEmpty()) {
- op.setKeyInfo(new ArrayList<KeyInfo>());
- for (int k = 0; k < api.get(i).getKeyInfo().size(); k++) {
- org.apache.juddi.model.KeyInfo modelKeyInfo = new KeyInfo();
- modelKeyInfo.setXmlID(api.get(i).getKeyInfo().get(i).getId());
- modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
- if (api.get(i).getKeyInfo().get(i).getContent() != null) {
- modelKeyInfo.setKeyDataValue(new ArrayList<KeyDataValue>());
- for (int x = 0; x < api.get(i).getKeyInfo().get(k).getContent().size(); x++) {
- mapKeyValue((JAXBElement) api.get(i).getKeyInfo().get(k).getContent().get(x), modelKeyInfo.getKeyDataValue());
- }
- }
- op.getKeyInfo().add(modelKeyInfo);
- }
-
- }
- model.add(op);
-
- }
- return model;
- }
-
- private static OperatorStatusType mapOperatorStatus(org.uddi.repl_v3.OperatorStatusType operatorStatus) {
- switch (operatorStatus) {
- case NEW:
- return OperatorStatusType.NEW;
- case NORMAL:
- return OperatorStatusType.NORMAL;
- case RESIGNED:
- return OperatorStatusType.RESIGNED;
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index 0b5d9a3..50535da 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -1220,7 +1220,7 @@ public class MappingModelToApi {
item.setTimeOfConfigurationUpdate(find.getTimeOfConfigurationUpdate());
CommunicationGraph xcom = new CommunicationGraph();
- mapCommunicationGraph(find.getCommunicationGraph(), xcom);
+ mapCommunicationGraph(find, xcom);
item.setCommunicationGraph(xcom);
//(List<org.apache.juddi.model.Contact> modelContactList,
//org.uddi.api_v3.Contacts apiContacts,
@@ -1263,7 +1263,7 @@ public class MappingModelToApi {
}
- private static void mapCommunicationGraph(org.apache.juddi.model.CommunicationGraph model,
+ private static void mapCommunicationGraph(org.apache.juddi.model.ReplicationConfiguration model,
CommunicationGraph api) {
mapEdge(model.getEdge(), api.getEdge());
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java b/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
deleted file mode 100644
index b2ec7d0..0000000
--- a/juddi-core/src/main/java/org/apache/juddi/model/CommunicationGraph.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * 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.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.TableGenerator;
-
-@Entity
-@Table(name = "j3_chg_graph")
-public class CommunicationGraph implements Serializable {
-
- private Long id;
- private List<Node> node;
- private List<ControlMessage> controlledMessage;
- private List<Edge> edge;
-
-
- @OneToMany(targetEntity = Node.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- public List<Node> getNode() {
- if (node == null) {
- node = new ArrayList<Node>();
- }
- return this.node;
- }
-
- public void setNode(List<Node> nodes) {
-
- this.node = nodes;
- }
-
- @OneToMany(targetEntity = ControlMessage.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- public List<ControlMessage> getControlMessage() {
- if (controlledMessage == null) {
- controlledMessage = new ArrayList<ControlMessage>();
- }
- return this.controlledMessage;
- }
-
- public void setControlMessage(List<ControlMessage> controlledMessages) {
-
- this.controlledMessage = controlledMessages;
- }
-
- // @OneToMany( fetch = FetchType.LAZY,targetEntity = Edge.class, mappedBy = "Edge")
- @OneToMany(targetEntity = Edge.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- public List<Edge> getEdge() {
- return this.edge;
- }
-
- public void setEdge( List<Edge> edges) {
- this.edge=edges;
- }
-
- @Id
- @Column(name = "j3_id")
- @GeneratedValue(strategy = GenerationType.TABLE,
- generator = "cfggrphGen")
- @TableGenerator(name = "cfggrphGen",
- table = "JPAGEN_CFGGRPH",
- pkColumnName = "NAME",
- pkColumnValue = "JPAGEN_PERSON_GEN",
- valueColumnName = "VALUE")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-}
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
index 768bb23..bc25990 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/Edge.java
@@ -40,26 +40,9 @@ public class Edge {
private Node messageSender;
private Node messageReceiver;
private Set<Node> messageReceiverAlternate;
- private CommunicationGraph parent;
-
- /**
- * link the parent object
- * @param val
- */
- @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = CommunicationGraph.class)
- //@JoinColumn(name = "OWNER_ID")
- public CommunicationGraph getCommunicationGraph() {
- return parent;
- }
-
- /**
- * link the parent object
- * @param val
- */
- public void setCommunicationGraph(CommunicationGraph val) {
- parent = val;
- }
+ private ReplicationConfiguration parent;
+
/**
* The message elements contain the local name of the Replication API message elements
* @return
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
index a481412..72c717b 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/ReplicationConfiguration.java
@@ -43,7 +43,6 @@ public class ReplicationConfiguration implements Serializable {
private Long serialNumber;
private String timeOfConfigurationUpdate;
private List<Operator> operator = new ArrayList<Operator>(0);
- private CommunicationGraph communicationGraph;
private BigInteger maximumTimeToSyncRegistry;
private BigInteger maximumTimeToGetChanges;
private List<Signature> signatures = new ArrayList<Signature>(0);
@@ -77,13 +76,6 @@ public class ReplicationConfiguration implements Serializable {
@Column(name = "serialnumb")
@OrderBy(value = "SerialNumber DESC")
@Id
- @GeneratedValue(strategy = GenerationType.TABLE,
- generator = "replcfgGen")
- @TableGenerator(name = "replcfgGen",
- table = "JPAGEN_REPLGEN",
- pkColumnName = "NAME",
- pkColumnValue = "JPAGEN_PERSON_GEN",
- valueColumnName = "VALUE")
public Long getSerialNumber() {
return serialNumber;
}
@@ -131,26 +123,7 @@ public class ReplicationConfiguration implements Serializable {
this.operator=v;
}
- /**
- * Gets the value of the communicationGraph property.
- *
- * @return possible object is {@link CommunicationGraph }
- *
- */
- @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, targetEntity = CommunicationGraph.class)
- public CommunicationGraph getCommunicationGraph() {
- return communicationGraph;
- }
-
- /**
- * Sets the value of the communicationGraph property.
- *
- * @param value allowed object is {@link CommunicationGraph }
- *
- */
- public void setCommunicationGraph(CommunicationGraph value) {
- this.communicationGraph = value;
- }
+
/**
* Gets the value of the maximumTimeToSyncRegistry property.
@@ -204,6 +177,47 @@ public class ReplicationConfiguration implements Serializable {
this.signatures = signatures;
}
+ private List<Node> node;
+ private List<ControlMessage> controlledMessage;
+ private List<Edge> edge;
+
+ //To use a Node or a String reference...
+ //Node will give us strict ref integ but makes a change history of the replication config impossible
+ //Strig increases code logic for ref integ,but makes chage history possible
+ @OneToMany(targetEntity = Node.class, orphanRemoval = false,fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.REFRESH, CascadeType.PERSIST})
+ public List<Node> getNode() {
+ if (node == null) {
+ node = new ArrayList<Node>();
+ }
+ return this.node;
+ }
+
+ public void setNode(List<Node> nodes) {
+
+ this.node = nodes;
+ }
+
+ @OneToMany(targetEntity = ControlMessage.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ public List<ControlMessage> getControlMessage() {
+ if (controlledMessage == null) {
+ controlledMessage = new ArrayList<ControlMessage>();
+ }
+ return this.controlledMessage;
+ }
+
+ public void setControlMessage(List<ControlMessage> controlledMessages) {
+
+ this.controlledMessage = controlledMessages;
+ }
+
+ // @OneToMany( fetch = FetchType.LAZY,targetEntity = Edge.class, mappedBy = "Edge")
+ @OneToMany(targetEntity = Edge.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+ public List<Edge> getEdge() {
+ return this.edge;
+ }
+ public void setEdge( List<Edge> edges) {
+ this.edge=edges;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
index 460c94d..6ede348 100644
--- a/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
+++ b/juddi-core/src/main/java/org/apache/juddi/validation/ValidateReplication.java
@@ -17,11 +17,15 @@
package org.apache.juddi.validation;
import java.math.BigInteger;
+import javax.persistence.EntityManager;
import javax.xml.ws.WebServiceContext;
+import org.apache.juddi.model.Node;
import org.apache.juddi.model.UddiEntityPublisher;
import org.apache.juddi.v3.error.ErrorMessage;
import org.apache.juddi.v3.error.FatalErrorException;
+import org.apache.juddi.v3.error.InvalidValueException;
import org.apache.juddi.v3.error.ValueNotAllowedException;
+import org.uddi.repl_v3.CommunicationGraph.Edge;
import org.uddi.repl_v3.HighWaterMarkVectorType;
import org.uddi.repl_v3.NotifyChangeRecordsAvailable;
import org.uddi.repl_v3.ReplicationConfiguration;
@@ -75,11 +79,11 @@ public class ValidateReplication extends ValidateUDDIApi {
if (responseLimitVector != null) {
for (int i = 0; i < responseLimitVector.getHighWaterMark().size(); i++) {
if (responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN() == null
- || responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN() <= 0) {
+ || responseLimitVector.getHighWaterMark().get(i).getOriginatingUSN() <= 0) {
throw new FatalErrorException(new ErrorMessage("errors.replication.limitVectorNull"));
}
- if (responseLimitVector.getHighWaterMark().get(i).getNodeID()== null
- || responseLimitVector.getHighWaterMark().get(i).getNodeID().trim().equalsIgnoreCase("")) {
+ if (responseLimitVector.getHighWaterMark().get(i).getNodeID() == null
+ || responseLimitVector.getHighWaterMark().get(i).getNodeID().trim().equalsIgnoreCase("")) {
throw new FatalErrorException(new ErrorMessage("errors.replication.limitVectorNoNode"));
}
}
@@ -111,8 +115,37 @@ public class ValidateReplication extends ValidateUDDIApi {
return false;
}
- public void validateSetReplicationNodes(ReplicationConfiguration replicationConfiguration) throws DispositionReportFaultMessage {
-
+ public void validateSetReplicationNodes(ReplicationConfiguration replicationConfiguration, EntityManager em) throws DispositionReportFaultMessage {
+ if (replicationConfiguration == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNull"));
+
+ }
+ if (replicationConfiguration.getCommunicationGraph() != null) {
+ for (String s : replicationConfiguration.getCommunicationGraph().getNode()) {
+ Node find = em.find(org.apache.juddi.model.Node.class, s);
+ if (find == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ }
+ }
+ for (Edge s : replicationConfiguration.getCommunicationGraph().getEdge()) {
+ Node find = em.find(org.apache.juddi.model.Node.class, s.getMessageReceiver());
+ if (find == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ }
+ find = null;
+ find = em.find(org.apache.juddi.model.Node.class, s.getMessageSender());
+ if (find == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ }
+ for (String id : s.getMessageReceiverAlternate()) {
+ find = em.find(org.apache.juddi.model.Node.class, id);
+ if (find == null) {
+ throw new InvalidValueException(new ErrorMessage("errors.replication.configNodeNotFound"));
+ }
+ }
+
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/resources/messages.properties b/juddi-core/src/main/resources/messages.properties
index 9665589..0a23c78 100644
--- a/juddi-core/src/main/resources/messages.properties
+++ b/juddi-core/src/main/resources/messages.properties
@@ -293,4 +293,4 @@ errors.replication.limitVectorNull=The high water mark vector limit specified Or
errors.replication.limitVectorNoNode=No node name was specified
errors.replication.configNodeNotFound=No specified node name is not currently registered as a node. Use the jUDDI Service API to register it. Node id:
errors.replication.configNull=No replication config was present in the message
-errors.deleteNode.InReplicationConfig=The node to be deleted is currently referenced in the replication configuration. You must revise the configuration before deleting the node,
\ No newline at end of file
+errors.deleteNode.InReplicationConfig=The node to be deleted is currently referenced in the replication configuration. You must revise the configuration before deleting the node,
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index d1719c2..f64512f 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -322,6 +322,26 @@ public class API_160_ReplicationTest {
Assert.assertNotNull(replicationNodes.getMaximumTimeToSyncRegistry());
Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
Assert.assertNotNull(replicationNodes.getSerialNumber());
+ long firstcommit = replicationNodes.getSerialNumber();
+
+
+
+ r = new ReplicationConfiguration();
+ r.setCommunicationGraph(new CommunicationGraph());
+ // r.getCommunicationGraph().getEdge().add(new CommunicationGraph.Edge());
+ r.getCommunicationGraph().getNode().add("test_node");
+
+ setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
+
+ replicationNodes = juddi.getReplicationNodes(authInfoRoot);
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph());
+ Assert.assertNotNull(replicationNodes.getCommunicationGraph().getNode());
+ Assert.assertEquals("test_node", replicationNodes.getCommunicationGraph().getNode().get(0));
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToGetChanges());
+ Assert.assertNotNull(replicationNodes.getMaximumTimeToSyncRegistry());
+ Assert.assertNotNull(replicationNodes.getTimeOfConfigurationUpdate());
+ Assert.assertNotNull(replicationNodes.getSerialNumber());
+ Assert.assertTrue(firstcommit < replicationNodes.getSerialNumber());
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/a975954b/juddi-core/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddi-core/src/test/resources/META-INF/persistence.xml b/juddi-core/src/test/resources/META-INF/persistence.xml
index afb2de7..adc4a7e 100644
--- a/juddi-core/src/test/resources/META-INF/persistence.xml
+++ b/juddi-core/src/test/resources/META-INF/persistence.xml
@@ -1,111 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
- version="1.0">
- <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
-
- <!-- entity classes -->
- <class>org.apache.juddi.model.Address</class>
- <class>org.apache.juddi.model.AddressLine</class>
- <class>org.apache.juddi.model.AuthToken</class>
- <class>org.apache.juddi.model.BindingCategoryBag</class>
- <class>org.apache.juddi.model.BindingDescr</class>
- <class>org.apache.juddi.model.BindingTemplate</class>
- <class>org.apache.juddi.model.BusinessCategoryBag</class>
- <class>org.apache.juddi.model.BusinessDescr</class>
- <class>org.apache.juddi.model.BusinessEntity</class>
- <class>org.apache.juddi.model.BusinessIdentifier</class>
- <class>org.apache.juddi.model.BusinessName</class>
- <class>org.apache.juddi.model.BusinessService</class>
- <class>org.apache.juddi.model.CanonicalizationMethod</class>
- <class>org.apache.juddi.model.CategoryBag</class>
- <class>org.apache.juddi.model.Clerk</class>
- <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
- <class>org.apache.juddi.model.Contact</class>
- <class>org.apache.juddi.model.ContactDescr</class>
- <class>org.apache.juddi.model.DiscoveryUrl</class>
- <class>org.apache.juddi.model.Email</class>
- <class>org.apache.juddi.model.InstanceDetailsDescr</class>
- <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
- <class>org.apache.juddi.model.KeyedReference</class>
- <class>org.apache.juddi.model.KeyedReferenceGroup</class>
- <class>org.apache.juddi.model.KeyDataValue</class>
- <class>org.apache.juddi.model.KeyInfo</class>
- <class>org.apache.juddi.model.Node</class>
- <class>org.apache.juddi.model.ObjectType</class>
- <class>org.apache.juddi.model.ObjectTypeContent</class>
- <class>org.apache.juddi.model.OverviewDoc</class>
- <class>org.apache.juddi.model.OverviewDocDescr</class>
- <class>org.apache.juddi.model.PersonName</class>
- <class>org.apache.juddi.model.Phone</class>
- <class>org.apache.juddi.model.Publisher</class>
- <class>org.apache.juddi.model.PublisherAssertion</class>
- <class>org.apache.juddi.model.PublisherAssertionId</class>
- <class>org.apache.juddi.model.Reference</class>
- <class>org.apache.juddi.model.ServiceCategoryBag</class>
- <class>org.apache.juddi.model.ServiceDescr</class>
- <class>org.apache.juddi.model.ServiceName</class>
- <class>org.apache.juddi.model.ServiceProjection</class>
- <class>org.apache.juddi.model.ServiceProjectionId</class>
- <class>org.apache.juddi.model.Signature</class>
- <class>org.apache.juddi.model.SignatureMethod</class>
- <class>org.apache.juddi.model.SignatureTransform</class>
- <class>org.apache.juddi.model.SignatureTransformDataValue</class>
- <class>org.apache.juddi.model.SignatureValue</class>
- <class>org.apache.juddi.model.SignedInfo</class>
- <class>org.apache.juddi.model.Subscription</class>
- <class>org.apache.juddi.model.SubscriptionChunkToken</class>
- <class>org.apache.juddi.model.SubscriptionMatch</class>
- <class>org.apache.juddi.model.TempKey</class>
- <class>org.apache.juddi.model.TempKeyPK</class>
- <class>org.apache.juddi.model.Tmodel</class>
- <class>org.apache.juddi.model.TmodelCategoryBag</class>
- <class>org.apache.juddi.model.TmodelDescr</class>
- <class>org.apache.juddi.model.TmodelIdentifier</class>
- <class>org.apache.juddi.model.TmodelInstanceInfo</class>
- <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
- <class>org.apache.juddi.model.TransferToken</class>
- <class>org.apache.juddi.model.TransferTokenKey</class>
- <class>org.apache.juddi.model.UddiEntity</class>
- <class>org.apache.juddi.model.UddiEntityPublisher</class>
- <class>org.apache.juddi.model.ValueSetValues</class>
-
- <class>org.apache.juddi.model.ChangeRecord</class>
- <class>org.apache.juddi.model.CommunicationGraph</class>
- <class>org.apache.juddi.model.Operator</class>
- <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.ReplicationMessage</class>
-
- <properties>
- <property name="hibernate.archive.autodetection" value="class"/>
- <property name="hibernate.hbm2ddl.auto" value="update"/>
- <property name="hibernate.show_sql" value="false"/>
-
- <!-- derby connection properties -->
- <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
- <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"/>
- <property name="hibernate.connection.url" value="jdbc:derby:memory:juddi-derby-test-db;create=true"/>
- <property name="hibernate.connection.username" value=""/>
- <property name="hibernate.connection.password" value=""/>
-
- <!-- mysql connection properties
-
- <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
- <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
- <property name="hibernate.connection.username" value="juddiv3" />
- <property name="hibernate.connection.password" value="" />
- <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/juddiv3" />
--->
-
- <!-- connection pool properties -->
- <property name="hibernate.dbcp.maxActive" value="100"/>
- <property name="hibernate.dbcp.maxIdle" value="30"/>
- <property name="hibernate.dbcp.maxWait" value="10000"/>
-
- </properties>
- </persistence-unit>
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+ <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CanonicalizationMethod</class>
+ <class>org.apache.juddi.model.CategoryBag</class>
+ <class>org.apache.juddi.model.Clerk</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.KeyDataValue</class>
+ <class>org.apache.juddi.model.KeyInfo</class>
+ <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.ObjectType</class>
+ <class>org.apache.juddi.model.ObjectTypeContent</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.Reference</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.ServiceProjectionId</class>
+ <class>org.apache.juddi.model.Signature</class>
+ <class>org.apache.juddi.model.SignatureMethod</class>
+ <class>org.apache.juddi.model.SignatureTransform</class>
+ <class>org.apache.juddi.model.SignatureTransformDataValue</class>
+ <class>org.apache.juddi.model.SignatureValue</class>
+ <class>org.apache.juddi.model.SignedInfo</class>
+ <class>org.apache.juddi.model.Subscription</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
+ <class>org.apache.juddi.model.ValueSetValues</class>
+ <class>org.apache.juddi.model.ChangeRecord</class>
+ <class>org.apache.juddi.model.CommunicationGraph</class>
+ <class>org.apache.juddi.model.Operator</class>
+ <class>org.apache.juddi.model.ReplicationConfiguration</class>
+ <class>org.apache.juddi.model.Edge</class>
+ <class>org.apache.juddi.model.ControlMessage</class>
+ <properties>
+ <property name="hibernate.archive.autodetection" value="class"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <!-- derby connection properties -->
+ <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+ <property name="hibernate.connection.driver_class" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+ <property name="hibernate.connection.url" value="jdbc:derby:memory:juddi-derby-test-db;create=true"/>
+ <property name="hibernate.connection.username" value=""/>
+ <property name="hibernate.connection.password" value=""/>
+ <!-- mysql connection properties
+
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
+ <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
+ <property name="hibernate.connection.username" value="juddiv3" />
+ <property name="hibernate.connection.password" value="" />
+ <property name="hibernate.connection.url" value="jdbc:mysql://localhost:3306/juddiv3" />
+-->
+ <!-- connection pool properties -->
+ <!--<property name = "hibernate.show_sql" value = "true" />-->
+ <property name="hibernate.dbcp.maxActive" value="100"/>
+ <property name="hibernate.dbcp.maxIdle" value="30"/>
+ <property name="hibernate.dbcp.maxWait" value="10000"/>
+ </properties>
+ </persistence-unit>
+</persistence>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[24/28] juddi git commit: JUDDI-894 added
Posted by al...@apache.org.
JUDDI-894 added
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/962f8d85
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/962f8d85
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/962f8d85
Branch: refs/heads/master
Commit: 962f8d851bb1c8e913397becbc40d55e797643aa
Parents: d53875c
Author: Alex <al...@apache.org>
Authored: Sun Dec 7 16:20:50 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sun Dec 7 16:20:50 2014 -0500
----------------------------------------------------------------------
juddi-tomcat/build.xml | 9 ++
juddi-tomcat/index.html | 202 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 211 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/962f8d85/juddi-tomcat/build.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/build.xml b/juddi-tomcat/build.xml
index 836f808..f2349f9 100644
--- a/juddi-tomcat/build.xml
+++ b/juddi-tomcat/build.xml
@@ -13,6 +13,11 @@
</target>
<target name="copy-resources" depends="unzip-tomcat">
+
+ <!-- JUDDI-894 -->
+ <move file="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.html" tofile="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/>
+ <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/>
+
<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
<copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
<copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
@@ -59,6 +64,10 @@
</target>
<target name="copy-resources2" depends="unzip-tomcat2">
+ <!-- JUDDI-894 -->
+ <move file="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index.html" tofile="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT/index-tomcat.html" overwrite="true"/>
+ <copy file="${basedir}/index.html" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/webapps/ROOT" overwrite="true"/>
+
<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
<copy file="${basedir}/catalina.bat" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
<copy file="${basedir}/truststore.jks" todir="${basedir}/target/tomcat2/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
http://git-wip-us.apache.org/repos/asf/juddi/blob/962f8d85/juddi-tomcat/index.html
----------------------------------------------------------------------
diff --git a/juddi-tomcat/index.html b/juddi-tomcat/index.html
new file mode 100644
index 0000000..c38ff51
--- /dev/null
+++ b/juddi-tomcat/index.html
@@ -0,0 +1,202 @@
+<html>
+ <head>
+ <title>Apache jUDDI Registry</title>
+ <style type="text/css">
+ body {
+ margin: 0px 10px 10px 10px;
+ font-family: "Trebuchet MS", sans-serif;
+ font-size: 10pt;
+ background: #FFF;
+ color: #000;
+}
+
+h1 {
+ font-family: "Trebuchet MS", sans-serif;
+ background: #00005A;
+ font-weight: normal;
+ color: White;
+ padding: 5px 10px;
+ margin: 0px -10px 10px -10px;
+}
+
+h2 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+h3 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+h4 {
+ font-family: "Trebuchet MS", sans-serif;
+ color: #00005A;
+}
+
+.sidebar {
+ border: 1px solid #00005A;
+ background: #EEE;
+ padding: 5px;
+}
+
+pre.code_sample {
+ background: #EEE;
+ padding: 5px;
+}
+
+dt {
+ font-weight: bold;
+}
+
+dl {
+ margin-left: 3em;
+}
+
+td {
+ font-size: 10pt;
+}
+
+DIV.announcement dl {
+ margin-left: 0px;
+}
+
+div.LINK {
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #000;
+ font-size: 10pt;
+}
+
+div.LINK A {
+ color: #6d0000;
+ text-decoration: none;
+}
+
+div.LINK A:hover {
+ color: #006200;
+ text-decoration: underline;
+}
+
+div.NAV {
+ background: #000;
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #CCC;
+ font-size: 12pt;
+ font-weight: bold;
+}
+
+div.NAV A {
+ color: #CCC;
+ text-decoration: none;
+}
+
+div.NAV A:hover {
+ color: #FFF;
+}
+
+.msgs {
+ background-color: #FFD;
+ color: #005500;
+}
+
+.ednote {
+ color: #999;
+ font-style: italic;
+}
+
+.cvs_id {
+ color: #999;
+ font-size: 8pt;
+ border-top: solid 1px #999;
+}
+
+.author {
+ font-size: 14pt;
+ font-style: italic;
+}
+
+var {
+ font-style: italic;
+ color: #900;
+}
+
+div.footer {
+ color: #666699; margin: 0px -10px; padding: 2px 10px; font-size: 8pt; font-weight: normal;
+}
+
+div.footer a {
+ color: #666699; text-decoration: none;
+}
+
+div.footer a:hover {
+ color: #666699; text-decoration: underline;
+}
+
+div.header {
+ background: #000;
+ margin: 0px -10px;
+ padding: 2px 10px;
+ color: #CCC;
+ font-size: 8pt;
+ font-weight: bold;
+}
+
+div.header a {
+ color: #CCC;
+ text-decoration: none;
+}
+
+div.header a:hover {
+ color: #FFF;
+}
+
+div.error {
+ color: #F00;
+}
+
+div.install {width:650px; background-color: #00005a;}
+div.install h4 {margin:0; padding:0; color: #fff;}
+div.install .content {margin:0; padding:4px 4px 0 4px; border-style:solid; border-color:#bbb; border-width:0 1px 1px 1px; background-color: #fff;}
+
+ </style>
+ </head>
+ <body>
+ <div class="header" align="right"><a href="http://juddi.apache.org/" target="_top">jUDDI@Apache</a></div>
+ <h1>Welcome</h1>
+
+
+ <h2><em>Welcome</em> to Apache jUDDI!</h2>
+ jUDDI is an open source implementation of <a href="http://oasis-open.org">OASIS</a>'s <a href="http://oasis-open.org/committees/uddi-spec/doc/tcspecs.htm#uddiv3">Universal Discovery Description and Integration (UDDI)</a>.
+ You've reached the splash page for jUDDI web server.<br>
+
+
+ <h4><a href="/juddi-gui">View the jUDDI User Interface</a> - This is a nearly complete UDDIv3 end user web application.</h4>
+
+ <h4><a href="/juddiv3">View the jUDDI Administration Interface</a> - This is for administrators to use to reconfigure jUDDI, check the status, and perform administrative actions.</h4>
+
+ <h4><a href="index-tomcat.html">Tomcat Administration Interface</a> - This is for administrators to use to reconfigure Tomcat, check the status, and perform administrative actions.</h4>
+
+
+ Here's some useful links to learn more about the UDDI and jUDDI.
+ <ul>
+ <li><a href="http://juddi.apache.org/">The Apache-jUDDI Home Page</a></li>
+ <li><a href="http://juddi.apache.org/docs.html" >Documentation</a></li>
+ <li><a href="http://wiki.apache.org/juddi" >jUDDI Wiki</a></li>
+ <li><a href="http://juddi.apache.org/issue-tracking.html" >jUDDI's Issue Tracker (report a bug)</a></li>
+ <li><a href="http://juddi.apache.org/source.html" >jUDDI's Source Code</a></li>
+ <li><a href="http://juddi.apache.org/mailing-list.html">jUDDI's Mailing lists</a></li>
+ </ul>
+
+ <hr />
+ <table width="100%" border="0">
+ <tr>
+ <td height="50" align="center" valign="bottom" nowrap>
+ <div class="footer"> </div>
+ </td>
+ </tr>
+ </table>
+
+ </body>
+</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[25/28] juddi git commit: JUDDI-896 resolved a number of typos and
formatting issues JUDDI-241 business, service,
binding templates and models now replicate
Posted by al...@apache.org.
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
----------------------------------------------------------------------
diff --git a/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml b/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
index 6c8b682..8c923d9 100644
--- a/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
+++ b/juddi-tomcat/juddi_install_data_node2/root_BusinessEntity.xml
@@ -40,7 +40,7 @@ See below for other fields that you may want to edit...
-->
<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:another.juddi.apache.org:businesses-asf">
<!-- Change the name field to represent the name of your registry -->
- <name xml:lang="en">An Apache jUDDI Node</name>
+ <name xml:lang="en">An Apache jUDDI Node (2)</name>
<!-- Change the description field to provided a brief description of your registry -->
<description xml:lang="en">This is a UDDI registry node as implemented by Apache jUDDI.</description>
<discoveryURLs>
http://git-wip-us.apache.org/repos/asf/juddi/blob/9d22690e/uddi-ws/src/main/java/org/uddi/repl_v3/NotifyChangeRecordsAvailable.java
----------------------------------------------------------------------
diff --git a/uddi-ws/src/main/java/org/uddi/repl_v3/NotifyChangeRecordsAvailable.java b/uddi-ws/src/main/java/org/uddi/repl_v3/NotifyChangeRecordsAvailable.java
index f1fcfaa..dc5300d 100644
--- a/uddi-ws/src/main/java/org/uddi/repl_v3/NotifyChangeRecordsAvailable.java
+++ b/uddi-ws/src/main/java/org/uddi/repl_v3/NotifyChangeRecordsAvailable.java
@@ -55,6 +55,11 @@ import javax.xml.bind.annotation.XmlType;
})
@XmlRootElement(name = "notify_changeRecordsAvailable")
public class NotifyChangeRecordsAvailable implements Serializable{
+ public NotifyChangeRecordsAvailable(){}
+ public NotifyChangeRecordsAvailable(String node, HighWaterMarkVectorType changesAvailable){
+ this.notifyingNode = node;
+ this.changesAvailable = changesAvailable;
+ }
@XmlTransient
private static final long serialVersionUID = -8280288001706059769L;
@XmlElement(required = true)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org
[23/28] juddi git commit: JUDDI-892 fixed links for both nav bars
(juddiv3/admin and juddi-gui and for juddiv3/index.html. Fix is pending svn
commit to cms-site
Posted by al...@apache.org.
JUDDI-892 fixed links for both nav bars (juddiv3/admin and juddi-gui and for juddiv3/index.html. Fix is pending svn commit to cms-site
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/d53875c0
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/d53875c0
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/d53875c0
Branch: refs/heads/master
Commit: d53875c0f4eef6309be45cd60a38a59eb761c4ac
Parents: daf9de2
Author: Alex <al...@apache.org>
Authored: Sun Dec 7 15:31:32 2014 -0500
Committer: Alex <al...@apache.org>
Committed: Sun Dec 7 15:31:32 2014 -0500
----------------------------------------------------------------------
juddi-gui/src/main/webapp/header-top.jsp | 4 ++--
juddiv3-war/src/main/webapp/admin/header-top.jsp | 8 +++-----
juddiv3-war/src/main/webapp/index.jsp | 10 ++++------
3 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/d53875c0/juddi-gui/src/main/webapp/header-top.jsp
----------------------------------------------------------------------
diff --git a/juddi-gui/src/main/webapp/header-top.jsp b/juddi-gui/src/main/webapp/header-top.jsp
index d6a8ab1..e7b8ee8 100644
--- a/juddi-gui/src/main/webapp/header-top.jsp
+++ b/juddi-gui/src/main/webapp/header-top.jsp
@@ -249,8 +249,8 @@
<li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session, "navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session, "navbar.help.wiki")%></a></li>
<li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
<li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
- <li><a href="http://mail-archives.apache.org/mod_mbox/juddi-user/" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
- <li><a href="http://svn.apache.org/viewvc/juddi/" title="<%=ResourceLoader.GetResource(session, "navbar.help.source")%>"><%=ResourceLoader.GetResource(session, "navbar.help.source")%></a></li>
+ <li><a href="http://juddi.apache.org/mailing-list.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
+ <li><a href="http://juddi.apache.org/source.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.source")%>"><%=ResourceLoader.GetResource(session, "navbar.help.source")%></a></li>
<li><a href="about.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.help.about.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.help.about")%></a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/juddi/blob/d53875c0/juddiv3-war/src/main/webapp/admin/header-top.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/admin/header-top.jsp b/juddiv3-war/src/main/webapp/admin/header-top.jsp
index 4a730cf..4b455bc 100644
--- a/juddiv3-war/src/main/webapp/admin/header-top.jsp
+++ b/juddiv3-war/src/main/webapp/admin/header-top.jsp
@@ -117,14 +117,12 @@
<li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-question-sign icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
- <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.devguide")%></a></li>
- <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.api")%>"><%=ResourceLoader.GetResource(session, "navbar.help.api")%></a></li>
+ <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
<li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session, "navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session, "navbar.help.wiki")%></a></li>
<li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
<li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
- <li><a href="http://mail-archives.apache.org/mod_mbox/juddi-user/" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
- <li><a href="http://svn.apache.org/viewvc/juddi/" title="<%=ResourceLoader.GetResource(session, "navbar.help.source")%>"><%=ResourceLoader.GetResource(session, "navbar.help.source")%></a></li>
+ <li><a href="http://juddi.apache.org/mailing-list.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
+ <li><a href="http://juddi.apache.org/source.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.source")%>"><%=ResourceLoader.GetResource(session, "navbar.help.source")%></a></li>
<li><a href="about.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.help.about.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.help.about")%></a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/juddi/blob/d53875c0/juddiv3-war/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/juddiv3-war/src/main/webapp/index.jsp b/juddiv3-war/src/main/webapp/index.jsp
index 649049b..1874cc1 100644
--- a/juddiv3-war/src/main/webapp/index.jsp
+++ b/juddiv3-war/src/main/webapp/index.jsp
@@ -38,14 +38,12 @@
Here's some useful links to learn more about the UDDI and jUDDI.
<ul>
<li><a href="services">View the service listing on this UDDI node</a></li>
- <li><a href="http://juddi.apache.org/">Visit</a> the Apache-jUDDI Home Page</li>
- <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html">jUDDI Users Guide</a></li>
- <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" >jUDDI Developers Guide</a></li>
- <li><a href="http://juddi.apache.org/docs.html" >jUDDI API Documentation</a></li>
+ <li><a href="http://juddi.apache.org/">The Apache-jUDDI Home Page</a></li>
+ <li><a href="http://juddi.apache.org/docs.html" >Documentation</a></li>
<li><a href="http://wiki.apache.org/juddi" >jUDDI Wiki</a></li>
<li><a href="http://juddi.apache.org/issue-tracking.html" >jUDDI's Issue Tracker (report a bug)</a></li>
- <li><a href="http://svn.apache.org/viewvc/juddi/" >jUDDI's Source Code</a></li>
- <li><a href="http://www.nabble.com/jUDDI-f218.html">jUDDI's Mailing lists</a></li>
+ <li><a href="http://juddi.apache.org/source.html" >jUDDI's Source Code</a></li>
+ <li><a href="http://juddi.apache.org/mailing-list.html">jUDDI's Mailing lists</a></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org