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/JUDDI-241 Commit: 03dce361e8c06a036cd1a5534a1f0a105e615b3d Parents: a975954 Author: Alex <[email protected]> Authored: Sun Nov 16 13:16:11 2014 -0500 Committer: Alex <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
