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 2013/04/26 22:46:15 UTC
svn commit: r1476397 - in /juddi/branches/juddi-3.2.x:
juddi-core/src/main/resources/juddi_install_data/
juddi-gui/src/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/java/org/apache/juddi/webconsole/resources/
juddi-gui/test/selenium/ juddi-gui/we...
Author: alexoree
Date: Fri Apr 26 20:46:14 2013
New Revision: 1476397
URL: http://svn.apache.org/r1476397
Log:
fix for jUDDI JUDDI-598
altering apis to make modals easiers
adding some basic selenium test cases for the ui
Added:
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessEditorRender.html
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessSearchBasic.html
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect1.html
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect2.html
juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LoginRoot.html
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp
- copied, changed from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp
- copied, changed from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js
- copied, changed from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js
Modified:
juddi/branches/juddi-3.2.x/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js
juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml Fri Apr 26 20:46:14 2013
@@ -411,6 +411,78 @@
<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>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java Fri Apr 26 20:46:14 2013
@@ -266,7 +266,8 @@ public class UddiHub {
//private JUDDIApiPortType juddi = null;
private String token = null;
- public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword, String lang) {
+ public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword, String lang, boolean isChooser) {
+ //TODO chooser
PagableContainer ret = new PagableContainer();
ret.offset = offset;
ret.displaycount = 0;
@@ -775,7 +776,8 @@ public class UddiHub {
HTTP_CLIENT_CERT
}
- public PagableContainer SearchForServices(String keyword, String lang, int maxrecords, int offset) {
+ public PagableContainer SearchForServices(String keyword, String lang, int maxrecords, int offset, boolean isChooser) {
+ //TODO chooser
PagableContainer ret = new PagableContainer();
ret.displaycount = 0;
ret.offset = offset;
@@ -1016,9 +1018,9 @@ public class UddiHub {
} else {
if (!isChooser) {
ret.renderedHtml = Printers.PrintTModelListAsHtml(findTModel, session);
- }
- else
+ } else {
ret.renderedHtml = Printers.PrintTModelListAsHtmlModel(findTModel, session);
+ }
}
} catch (Exception ex) {
@@ -2407,6 +2409,131 @@ public class UddiHub {
return sb.toString();
}
+ public PagableContainer SearchForBinding(String keyword, String lang, int offset, int maxrecords, boolean isChooser) {
+ PagableContainer ret = new PagableContainer();
+ ret.displaycount = 0;
+ ret.offset = offset;
+ ret.totalrecords = 0;
+ try {
+
+ FindService fs = new FindService();
+ fs.setAuthInfo(GetToken());
+ fs.setMaxRows(maxrecords);
+ fs.setListHead(offset);
+ Name n = new Name();
+ if (lang == null || lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
+ n.setLang(null);
+ } else {
+ n.setLang(lang);
+ }
+ n.setValue(keyword);
+ fs.getName().add(n);
+ fs.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ ServiceList findService = null;//inquiry.findService(fs);
+ try {
+ findService = inquiry.findService(fs);
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ fs.setAuthInfo(GetToken());
+ findService = inquiry.findService(fs);
+ }
+ } else {
+ throw ex;
+ }
+ }
+
+ if (findService == null || findService.getServiceInfos() == null) {
+ ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
+ return ret;
+ }
+ ret.displaycount = findService.getListDescription().getIncludeCount();
+ ret.totalrecords = findService.getListDescription().getActualCount();
+
+ GetServiceDetail gs = new GetServiceDetail();
+ gs.setAuthInfo(GetToken());
+ for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
+ gs.getServiceKey().add(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey());
+ }
+ ServiceDetail serviceDetail = null;
+ try {
+ serviceDetail = inquiry.getServiceDetail(gs);
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ fs.setAuthInfo(GetToken());
+ serviceDetail = inquiry.getServiceDetail(gs);
+ }
+ } else {
+ throw ex;
+ }
+ }
+ if (serviceDetail == null || serviceDetail.getBusinessService().isEmpty()) {
+ ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
+ return ret;
+ }
+
+
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("<table class=\"table\"><tr><th>").
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.business")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.service")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.bindingtemplate.key")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.accesspoint.value")).
+ append("</th></tr>");
+
+ for (int i = 0; i < serviceDetail.getBusinessService().size(); i++) {
+ // System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size());
+ if (serviceDetail.getBusinessService().get(i).getBindingTemplates() != null) {
+ for (int k = 0; k < serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size(); k++) {
+ //System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue());
+ sb.append("<tr><td><input type=\"checkbox\" class=\"modalable\" id=\"").
+ append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
+ append("\">").
+ append("</td><td>").
+ append("<a href=\"businessEditor2.jsp?id=").
+ append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey())).
+ append("\">").
+ append(StringEscapeUtils.escapeHtml((findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()))).
+ append("</a>").
+ append("</td><td>").append("<a href=\"serviceEditor.jsp?id=").
+ append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
+ append("\" title=\"").
+ append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getServiceKey())).
+ append("\">").
+ append(Printers.ListNamesToString(serviceDetail.getBusinessService().get(i).getName())).
+ append("</a>").
+ append("</td><td>").
+ append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
+ append("</td><td>");
+ if (serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint() != null) {
+ sb.append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue()));
+ }
+ sb.append("</td></tr>");
+ }
+ }
+ }
+
+ sb.append("</table>");
+ ret.renderedHtml = sb.toString();
+ return ret;
+ } catch (Exception ex) {
+ ret.renderedHtml = HandleException(ex);
+ }
+ return ret;
+
+ }
+
public String TransferCustody() {
return null;
}
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Fri Apr 26 20:46:14 2013
@@ -258,3 +258,6 @@ actions.deleted=Deleted
navbar.subscriptions.feed=News Feed
items.picker=Picker
navbar.subscriptions.feed.tooltip=A new feed based on your subscription settings.
+items.tmodel.chooser=tModel Chooser
+actions.select=Select
+actions.cancel=Cancel
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Fri Apr 26 20:46:14 2013
@@ -259,3 +259,6 @@ actions.deleted=Suprimido
navbar.subscriptions.feed=Noticias Corriente
items.picker=Selector
navbar.subscriptions.feed.tooltip=asdUn nuevo avance basado en la configuraci\u00f3n de la suscripci\u00f3n.
+items.tmodel.chooser=tModel Selector
+actions.select=Seleccionar
+actions.cancel=Cancelar
Added: juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessEditorRender.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessEditorRender.html?rev=1476397&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessEditorRender.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessEditorRender.html Fri Apr 26 20:46:14 2013
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>BusinessEditor render</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">BusinessEditor render</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/UDDIBrowser/businessBrowse.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Discover</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=An Apache jUDDI Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>View as XML</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Operational Info</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=View as XML</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>businessEntity</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Close')])[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Signatures</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Services')])[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Identifiers</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Categories</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=General</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=i.icon-plus-sign.icon-large</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=Name1Value</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name=value</td>
+ <td>new name</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=button[type="submit"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=password</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=loginbutton</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=Name0Lang</td>
+ <td>Click to edit</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=Name0Lang</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name=value</td>
+ <td>en</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=button[type="submit"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=Name1Lang</td>
+ <td>en</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=Name1Value</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessSearchBasic.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessSearchBasic.html?rev=1476397&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessSearchBasic.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/BusinessSearchBasic.html Fri Apr 26 20:46:14 2013
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>BusinessSearchBasic</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">BusinessSearchBasic</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/UDDIBrowser/home.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>An Apache jUDDI Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Show 7</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>UDDI Custody and Ownership Transfer Service</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect1.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect1.html?rev=1476397&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect1.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect1.html Fri Apr 26 20:46:14 2013
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>BusinessSearchBasic</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">BusinessSearchBasic</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/UDDIBrowser/home.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>An Apache jUDDI Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Show 7</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>UDDI Custody and Ownership Transfer Service</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect2.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect2.html?rev=1476397&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect2.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LangSelect2.html Fri Apr 26 20:46:14 2013
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>BusinessSearchBasic</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">BusinessSearchBasic</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/UDDIBrowser/home.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>An Apache jUDDI Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Show 7</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>UDDI Custody and Ownership Transfer Service</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LoginRoot.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LoginRoot.html?rev=1476397&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LoginRoot.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/selenium/LoginRoot.html Fri Apr 26 20:46:14 2013
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>BusinessSearchBasic</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">BusinessSearchBasic</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/UDDIBrowser/home.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>An Apache jUDDI Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Show 7</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>UDDI Custody and Ownership Transfer Service</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp (from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp&r1=1471182&r2=1476397&rev=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp Fri Apr 26 20:46:14 2013
@@ -45,14 +45,14 @@
isChooser = Boolean.parseBoolean(request.getParameter("chooser"));
} catch (Exception ex) {
}
- PagableContainer ret = (x.tModelListAsHtml(keyword, lang, offset, maxrecords, isChooser));
+ PagableContainer ret = (x.SearchForBinding(keyword, lang, offset, maxrecords, isChooser));
out.write(ret.renderedHtml);
%>
<script type="text/javascript">
- totalrecords=<%=ret.totalrecords%>;
- $("#totalrecords").text(totalrecords);
- $("#offset").text(<%=offset%>);
- $("#displayrecords").text (<%=ret.displaycount%>);
+ totalrecordsBinding=<%=ret.totalrecords%>;
+ $("#totalrecordsBinding").text(totalrecords);
+ $("#offsetBinding").text(<%=offset%>);
+ $("#displayrecordsBinding").text (<%=ret.displaycount%>);
refresh();
</script>
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp Fri Apr 26 20:46:14 2013
@@ -45,7 +45,7 @@
} catch (Exception ex) {
}
//public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword) {
- PagableContainer ret= (x.GetBusinessListAsHtml(offset, maxrecords, keyword, lang));
+ PagableContainer ret= (x.GetBusinessListAsHtml(offset, maxrecords, keyword, lang, false));
out.write(ret.renderedHtml);
%>
<script type="text/javascript">
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp Fri Apr 26 20:46:14 2013
@@ -43,7 +43,7 @@
maxrecords = 50;
}
- PagableContainer ret = (x.SearchForServices(keyword, lang, maxrecords, offset));
+ PagableContainer ret = (x.SearchForServices(keyword, lang, maxrecords, offset, false));
out.write(ret.renderedHtml);
%>
Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp (from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp&r1=1471182&r2=1476397&rev=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp Fri Apr 26 20:46:14 2013
@@ -1,40 +1,39 @@
<%--
- Document : tmodelChooser
- Created on : Apr 17, 2013, 6:25:00 PM
+ Document : bindingChooser
+ Created on : Apr 24, 2013, 6:25:00 PM
Author : Alex O'Ree
this page is meant to be included via jsp:include
--%>
<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade" id="tmodelChooser">
+<div class="modal hide fade" id="bindingChooser">
<div class="modal-header">
- <a href="javascript:$('#tmodelChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">×</a>
- <h3>tModel Chooser</h3>
+ <a href="javascript:$('#bindingChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">×</a>
+ <h3>Binding Chooser</h3>
</div>
<div class="modal-body">
- <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
- <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-
- <a href="javascript:pagedownChooser();"><i class="icon-circle-arrow-left disabled icon-large" id="pageup"></i></a>
- <a href="javascript:reload();"><i class="icon-refresh icon-large"></i></a>
- <a href="javascript:pageupChooser();"><i class="icon-circle-arrow-right disabled icon-large" id="pagedown"></i></a>
+ <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
+ <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
+ <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
+ <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langBinding" class="edit"></span><br>
- <div id="tmodellist">
+ <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
+ <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:pageupChooserBinding();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBinding"></i></a>
+
+ <div id="bindinglist">
<img src="img/bigrollergreen.gif" title="Loading"/>
</div>
- <script src="js/tmodelsearch.js"></script>
- <script src="js/tmodelChooser.js"></script>
+ <script src="js/bindingChooser.js"></script>
<script type="text/javascript">
$('.edit').editable(function(value, settings) {
console.log(this);
console.log(value);
console.log(settings);
- reloadTmodelModal();
+ reloadBindingModal();
// RenderTmodelListBySearch('%', offset, maxrecords);
return(value);
}, {
@@ -47,10 +46,12 @@ this page is meant to be included via js
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal">Cancel</a>
- <a href="javascript:$('#tmodelChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal">Select</a>
+ <a href="javascript:$('#bindingChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal">Select</a>
</div>
</div>
<%
//<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>
//<a href="javascript:tModelModal();" class="btn" >Pick a tModel</a>
-%>
\ No newline at end of file
+%>
+
+<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">Select</a>
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp Fri Apr 26 20:46:14 2013
@@ -21,9 +21,9 @@
<%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
<%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
<%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled icon-large" id="pageup"></i></a>
- <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-large" id="refresh"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled icon-large" id="pagedown"></i></a>
+ <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageup"></i></a>
+ <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+ <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedown"></i></a>
<div id="businesslist">
<img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp Fri Apr 26 20:46:14 2013
@@ -620,9 +620,7 @@
$.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business", function(data){
window.console && console.log('asXml success');
- $("#viewAsXmlContent").html(safe_tags_replace(data) + "<br>" +
- "<a href=\"ajax/toXML.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business\" class=\"btn btn-primary\">Popout</a> "
- );
+ $("#viewAsXmlContent").html(safe_tags_replace(data));
$( "#viewAsXml" ).modal('show');
});
@@ -667,10 +665,15 @@
</div>
<div class="modal-footer">
<a href="ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getBusinessKey(), "UTF-8")%>&type=business" class="btn btn-primary" target="_blank">Popout</a>
- <a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
-
+ <script type="text/javascript">
+ function closeXmlPop(modaldiv)
+ {
+ $('#' + modaldiv).modal('hide');
+ }
+ </script>
<div class="modal hide fade" id="addSubscriptionModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@@ -681,7 +684,7 @@
</div>
<div class="modal-footer">
- <a href="javascript:$('#addPublisherAssertion').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
<%
Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js (from r1471182, juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js&r1=1471182&r2=1476397&rev=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js Fri Apr 26 20:46:14 2013
@@ -5,30 +5,122 @@
* and open the template in the editor.
*/
-function reloadTmodelModal()
+function reloadBindingModal()
{
- RenderTmodelListBySearch('%', offset, maxrecords, true);
+ RenderBindingListBySearch('%', offset, maxrecords, true);
}
+
+var offsetBinding=0; //start at the begining
+var maxrecordsBinding=20; //record 20 at a time
+var langBinding="en"; //langauge english
+var totalrecordsBinding=0;
+
+RenderBindingListBySearch('%', offsetBinding, maxrecordsBinding, true);
+
+function pagedownChooserBinding()
+{
+ offsetBinding = $("#offsetBinding").text();
+ //alert(offset);
+ var newoffset = offsetBinding - maxrecordsBinding;
+ if (newoffset < 0)
+ return;
+ //alert(newoffset);
+ if (newoffset != offsetBinding)
+ RenderBindingListBySearch('%', newoffset, maxrecordsBinding, true);
+}
+function pageupChooserBinding()
+{
+ offsetBinding = $("#offsetBinding").text();
+ //alert(offset);
+ var fetch = maxrecordsBinding;
+ if ((parseInt(offsetBinding) + parseInt(maxrecordsBinding)) > totalrecordsBinding)
+ //fetch = maxrecords - offset;
+ return;
+ else
+ fetch = (parseInt(offsetBinding) + parseInt(maxrecordsBinding));
+ //alert(fetch);
+ offsetBinding = fetch;
+ RenderBindingListBySearch('%', fetch, maxrecordsBinding, true);
+}
+
+
+var selectedItemBinding=null;
+
+//offset, maxrecords, keyword
+function RenderBindingListBySearch(keyword1, offset1, maxrecords1, isForChooser)
+{
+ var lang = $("#langBinding").text();
+ $("#bindinglist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+ var request= $.ajax({
+ url: 'ajax/bindingsearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
+ type:"GET",
+ cache: false
+ });
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ');
+ $("#bindinglist").html(msg);
+ $('.modalable').click(function(){
+ selectedItem =$(this).attr("id");
+ });
+ //refresh();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ');
+ $("#bindinglist").html("An error occured! " + textStatus + jqXHR);
+ //refresh();
+ });
+/*
+ $.get('ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang, function(data) {
+ $("#businesslist").html(data);
+ refresh();
+ });*/
+}
+
+function refreshBinding()
+{
+ var displayrecords = $("#displayrecords").text();
+ if (displayrecords == totalrecordsBinding)
+ {
+ $("#pageupBinding").addClass("disabled");
+ $("#pagedownBinding").addClass("disabled");
+ }
+ else if (offsetBinding + maxrecordsBinding > totalrecordsBinding)
+ {
+ $("#pageupBinding").addClass("disabled");
+ }
+ else if (offsetBinding ==0)
+ {
+ $("#pagedownBinding").removeClass("disabled");
+ }
+ else
+ {
+ $("#pagedownBinding").removeClass("disabled");
+ $("#pageupBinding").removeClass("disabled");
+ }
+}
+
/**
*This launches the tModel model div, upon return (and if not abprted), the contents of the div parameter will be replaced with the
*first selected tModel
*/
-function tModelModal(div){
+function bindingModal(div){
//reset the form in case it was lanucheed more than once per page view
- reloadTmodelModal();
+ reloadBindingModal();
$.dialog.confirm({
callback: function(success, result) {
if (!success)
{
- //alert("aborted!");
+ alert("aborted!");
}
else{
- //alert('Result: ' + result.join());
+ alert('Result: ' + result.join());
$("#" + div).html(result[0]);
}
}
@@ -36,13 +128,13 @@ function tModelModal(div){
}
-function tModelCancel()
+function bindingCancel()
{
$(".modalable").each(function()
{
$(this).prop('checked', false);
});
- $('#tmodelChooser').modal('hide');
+ $('#bindingChooser').modal('hide');
}
@@ -51,7 +143,7 @@ function tModelCancel()
*/
$.dialog = {
confirm: function(options) {
- var $modal = $('#tmodelChooser');
+ var $modal = $('#bindingChooser');
//$modal.find('.modal-body').text(options.message);
$modal.off('click.dialog', '.btn, .close')
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js Fri Apr 26 20:46:14 2013
@@ -25,7 +25,7 @@ function refreshServiceList()
}
RenderServiceListBySearch('%', offset, maxrecords);
//offset += maxrecords;
-function pagedown()
+function pagedownService()
{
offset = $("#offset").text();
//alert(offset);
@@ -36,7 +36,7 @@ function pagedown()
if (newoffset != offset)
RenderServiceListBySearch('%', newoffset, maxrecords);
}
-function pageup()
+function pageupService()
{
offset = $("#offset").text();
//alert(offset);
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js Fri Apr 26 20:46:14 2013
@@ -6,7 +6,7 @@ var totalrecords=0;
RenderTmodelListBySearch('%', offset, maxrecords);
-function pagedownChooser()
+function pagedownChooserTmodel()
{
offset = $("#offset").text();
//alert(offset);
@@ -17,7 +17,7 @@ function pagedownChooser()
if (newoffset != offset)
RenderTmodelListBySearch('%', newoffset, maxrecords, true);
}
-function pageupChooser()
+function pageupChooserTmodel()
{
offset = $("#offset").text();
//alert(offset);
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp Fri Apr 26 20:46:14 2013
@@ -220,4 +220,5 @@
</script>
<%@include file="tmodelChooser.jsp" %>
+ <%@include file="bindingChooser.jsp" %>
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp Fri Apr 26 20:46:14 2013
@@ -24,9 +24,9 @@
<%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
<%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+ <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
<a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
+ <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
<div id="serviceBrowserListings">
<img src="img/bigrollergreen.gif" title="Loading"/>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp Fri Apr 26 20:46:14 2013
@@ -340,7 +340,7 @@
out.write(StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getBindingKey()));
}
out.write("</div>"); //end of binding template key section
-%>
+ %>
<br>
<a href="javascript:AddDescriptionSpecific('<%=PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.DESCRIPTION%>');">
<i class="icon-plus-sign icon-large"></i></a><%=ResourceLoader.GetResource(session, "items.bindingtemplate.description.add")%> <Br>
@@ -363,7 +363,7 @@
}
//1:1
-%>
+ %>
</div>
<b><%=ResourceLoader.GetResource(session, "items.accesspoint")%></b> - <%=ResourceLoader.GetResource(session, "items.accesspoint.description")%><br>
<%
@@ -403,7 +403,7 @@
+ "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey()) + "</div>");
// out.write("<div style=\"float:left\"><span title=\"Instance Params\">Value</span>: </div>"
// + "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.VALUE + "\">" + ((bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails() != null) ? StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getInstanceParms()) : "") + "</div>");
-%>
+ %>
<br>
<%
@@ -484,7 +484,7 @@
</div>
<% } //end of instance details
-%>
+ %>
<%
}
@@ -551,7 +551,7 @@
<%
} //end of binding templates loop
-%>
+ %>
</div> <!-- binding template container-->
@@ -685,13 +685,19 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3>As XML</h3>
</div>
+ <script type="text/javascript">
+ function closeXmlPop(modaldiv)
+ {
+ $('#' + modaldiv).modal('hide');
+ }
+ </script>
<div class="modal-body" id="viewAsXmlContent">
</div>
<div class="modal-footer">
<a href="ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getServiceKey(), "UTF-8")%>&type=service" class="btn btn-primary" target="_blank">Popout</a>
- <a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
<%
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp Fri Apr 26 20:46:14 2013
@@ -10,7 +10,7 @@ this page is meant to be included via js
<div class="modal hide fade" id="tmodelChooser">
<div class="modal-header">
<a href="javascript:$('#tmodelChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">×</a>
- <h3>tModel Chooser</h3>
+ <h3><%=ResourceLoader.GetResource(session, "items.tmodel.chooser")%></h3>
</div>
<div class="modal-body">
@@ -19,9 +19,9 @@ this page is meant to be included via js
<%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
<%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
- <a href="javascript:pagedownChooser();"><i class="icon-circle-arrow-left disabled icon-large" id="pageup"></i></a>
+ <a href="javascript:pagedownChooserTmodel();"><i class="icon-circle-arrow-left disabled icon-large" id="pageup"></i></a>
<a href="javascript:reload();"><i class="icon-refresh icon-large"></i></a>
- <a href="javascript:pageupChooser();"><i class="icon-circle-arrow-right disabled icon-large" id="pagedown"></i></a>
+ <a href="javascript:pageupChooserTmodel();"><i class="icon-circle-arrow-right disabled icon-large" id="pagedown"></i></a>
<div id="tmodellist">
<img src="img/bigrollergreen.gif" title="Loading"/>
@@ -46,8 +46,8 @@ this page is meant to be included via js
</div>
<div class="modal-footer">
- <a href="#" class="btn" data-dismiss="modal">Cancel</a>
- <a href="javascript:$('#tmodelChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal">Select</a>
+ <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+ <a href="javascript:$('#tmodelChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
</div>
</div>
<%
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp?rev=1476397&r1=1476396&r2=1476397&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp Fri Apr 26 20:46:14 2013
@@ -211,7 +211,7 @@
out.write("</div>");//end this block
}
out.write("</div>");//end of overview
- %>
+%>
</div>
@@ -230,12 +230,12 @@
out.write("<div id=\"" + PostBackConstants.CATBAG_KEY_REF + i + "\" style=\"border-width:2px; border-style:solid\">");
out.write("<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF + i + "');\"><i class=\"icon-remove-sign icon-large\"></i></a></div>");
out.write(//"<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + ": </div>"
- "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
- + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE +"\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getTModelKey()) + "</div>");
+ "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " (<a href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
+ + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getTModelKey()) + "</div>");
out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ": </div>"
- + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.KEYNAME+ "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getKeyName()) + "</div>");
+ + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.KEYNAME + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getKeyName()) + "</div>");
out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ": </div>"
- + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.KEYVALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getKeyValue()) + "</div>");
+ + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.KEYVALUE + "\">" + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getKeyValue()) + "</div>");
out.write("</div>");
}
%>
@@ -379,9 +379,15 @@
</div>
+ <script type="text/javascript">
+ function closeXmlPop(modaldiv)
+ {
+ $('#' + modaldiv).modal('hide');
+ }
+ </script>
<div class="modal-footer">
<a href="ajax/toXML.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>&type=tmodel" class="btn btn-primary" target="_blank">Popout</a>
- <a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
<%
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org