Merge branch 'master' into bug/JUDDI-1015
diff --git a/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java b/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
index ee5afd7..5438f71 100644
--- a/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
+++ b/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
@@ -51,6 +51,7 @@
public static final String EMAIL = "Email";
public static final String SORTCODE = "Sortcode";
public static final String KEYNAME = "KeyName";
+ public static final String DISPLAYNAME = "DisplayName";
public static final String KEYVALUE = "KeyValue";
public static final String CATBAG_KEY_REF = "catbagkeyref";
public static final String IDENT_KEY_REF = "identbagkeyref";
diff --git a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
index d7ec2ec..36451dd 100644
--- a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
+++ b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
@@ -1037,11 +1037,13 @@
throw ex;
}
}
- return ResourceLoader.GetResource(session, "actions.saved") + " "
- + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
- + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
+ return ResourceLoader.GetResource(session, "actions.saved") + " "
+ + " <script type=\"text/javascript\">window.location.href='"
+ + StringEscapeUtils.escapeJavaScript("serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")) + "';</script>"
+ + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+ + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
} catch (Exception ex) {
- return HandleException(ex);
+ return HandleException(ex);
}
}
@@ -2241,7 +2243,9 @@
}
}
//return ResourceLoader.GetResource(session, "actions.saved");
- return ResourceLoader.GetResource(session, "actions.saved") + " "
+ return ResourceLoader.GetResource(session, "actions.saved") +
+ " <script type=\"text/javascript\">window.location.href='"+
+ StringEscapeUtils.escapeJavaScript("tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")) + "';</script>"
+ "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
+ "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
} catch (Exception ex) {
@@ -3953,4 +3957,14 @@
x.add(id.trim());
return deleteBinding(x);
}
+
+ public String getTmodelDisplayName(String id) {
+ TModel tmodel = GettModelDetailsAsObject(id);
+ if (tmodel!=null &&
+ tmodel.getName()!=null &&
+ tmodel.getName().getValue()!=null) {
+ return tmodel.getName().getValue();
+ }
+ return "";
+ }
}
diff --git a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
index 0700351..317b932 100644
--- a/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
+++ b/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
@@ -173,6 +173,7 @@
sb.append("<table class=\"table table-hover\"><tr><th>");
if (isChooser) {
+ //for the input checkbox
sb.append("</th><th>");
}
sb.append(ResourceLoader.GetResource(session, "items.key"))
@@ -186,7 +187,10 @@
if (isChooser) {
sb.append("<input class=\"modalableTmodel\" type=checkbox id=\"")
.append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
- .append("\"></td><td>");
+ .append("\" value=\"" +
+ StringEscapeUtils.escapeHtml(trunc(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()))
+ +
+ "\"></td><td>");
}
if (!isChooser) {
sb.append("<a href=\"tmodelEditor.jsp?id=")
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
index c834934..c1aae9c 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
@@ -451,3 +451,5 @@
items.categorizations.uddi=UDDI Categorizations
actions.return=Return
items.settings.edit=Edit
+totals.offset.v2disclaimer=Offset does not work with UDDIv2 based endpoints.
+totals.fetch=Fetch
\ No newline at end of file
diff --git a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
index d316427..fb567ed 100644
--- a/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
+++ b/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
@@ -453,3 +453,5 @@
items.categorizations.uddi=UDDI Categorizaciones
actions.return=Volver
items.settings.edit=Editar
+totals.offset.v2disclaimer=La compensaci\u00f3n no funciona con puntos finales basados \u200b\u200ben UDDIv2.
+totals.fetch=Recuperar Tama\u00f1o
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/about.jsp b/juddi-gui/src/main/webapp/about.jsp
index 641dcf2..5b68337 100644
--- a/juddi-gui/src/main/webapp/about.jsp
+++ b/juddi-gui/src/main/webapp/about.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.help.about")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.about.content")%>
diff --git a/juddi-gui/src/main/webapp/advanced.jsp b/juddi-gui/src/main/webapp/advanced.jsp
index 3deed79..385e841 100644
--- a/juddi-gui/src/main/webapp/advanced.jsp
+++ b/juddi-gui/src/main/webapp/advanced.jsp
@@ -35,12 +35,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.advanced")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%= ResourceLoader.GetResource(session, "pages.advanced.content")%>
diff --git a/juddi-gui/src/main/webapp/ajax/businesssearch.jsp b/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
index c64903a..2cfd511 100644
--- a/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
@@ -29,7 +29,7 @@
UddiHub x = UddiHub.getInstance(application, request.getSession());
int offset = 0;
- int maxrecords = 20;
+ int maxrecords = 1000;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
lang = null;
@@ -54,8 +54,8 @@
}
try {
maxrecords = Integer.parseInt(request.getParameter("maxrecords"));
- if (maxrecords <= 0 || maxrecords > 50) {
- maxrecords = 50;
+ if (maxrecords <= 0 || maxrecords > 1000) {
+ maxrecords = 1000;
}
} catch (Exception ex) {
}
@@ -74,7 +74,7 @@
<script type="text/javascript">
totalrecordsBusiness=<%=ret.totalrecords%>;
$("#totalrecordsBusiness").text(totalrecordsBusiness);
- $("#offsetBusiness").text(<%=offset%>);
+ $("#offsetBusiness").val(<%=offset%>);
$("#displayrecordsBusiness").text (<%=ret.displaycount%>);
refresh();
</script>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/ajax/servicesearch.jsp b/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
index 2c69381..1d5a5b5 100644
--- a/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
@@ -73,7 +73,7 @@
<script type="text/javascript">
totalrecordsService=<%=ret.totalrecords%>;
$("#totalrecordsService").text(totalrecordsService);
- $("#offsetService").text(<%=offset%>);
+ $("#offsetService").val(<%=offset%>);
$("#displayrecordsService").text (<%=ret.displaycount%>);
refresh();
</script>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp b/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
index 70886da..ed27237 100644
--- a/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
+++ b/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
@@ -28,7 +28,7 @@
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
- int maxrecords = 50;
+ int maxrecords = 1000;
int offset = 0;
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
@@ -53,8 +53,8 @@
if (offset < 0) {
offset = 0;
}
- if (maxrecords > 50) {
- maxrecords = 50;
+ if (maxrecords > 1000) {
+ maxrecords = 1000;
}
boolean isChooser = false;
try {
diff --git a/juddi-gui/src/main/webapp/assertions.jsp b/juddi-gui/src/main/webapp/assertions.jsp
index ce1b43c..dc71484 100644
--- a/juddi-gui/src/main/webapp/assertions.jsp
+++ b/juddi-gui/src/main/webapp/assertions.jsp
@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/bindingChooser.jsp b/juddi-gui/src/main/webapp/bindingChooser.jsp
index f448675..2532175 100644
--- a/juddi-gui/src/main/webapp/bindingChooser.jsp
+++ b/juddi-gui/src/main/webapp/bindingChooser.jsp
@@ -82,9 +82,6 @@
</div>
</div>
<%
-//<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>
-//<a href="javascript:tModelModal();" class="btn" >Pick a tModel</a>
-//<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">< %=ResourceLoader.GetResource(session, "actions.select")% ></a>
%>
diff --git a/juddi-gui/src/main/webapp/bindingEditor.jsp b/juddi-gui/src/main/webapp/bindingEditor.jsp
index 9a1a1f1..c678493 100644
--- a/juddi-gui/src/main/webapp/bindingEditor.jsp
+++ b/juddi-gui/src/main/webapp/bindingEditor.jsp
@@ -73,12 +73,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
<script type="text/javascript" src="js/bindingeditor.js"></script>
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.bindingeditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
@@ -254,7 +254,7 @@
if (bd.getCategoryBag() == null) {
bd.setCategoryBag(new CategoryBag());
}
- // out.write("Keyed Reference Categories:");
+
for (int i = 0; i < bd.getCategoryBag().getKeyedReference().size(); i++) {
out.write("<div id=\"" + PostBackConstants.CATBAG_KEY_REF + i + "\" style=\"border-width:2px; border-style:solid\">");
@@ -366,10 +366,16 @@
out.write("<div style=\"float:left;height:100%\">"
+ "<a href=\"javascript:Remove('" + PostBackConstants.TMODELINSTANCE + k + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
- out.write("<div style=\"float:left\"><b>" + ResourceLoader.GetResource(session, "items.tmodel.key") + " </b> (<a href=\"javascript:tModelModal('" + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "')\" ><i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>) "
+ out.write("<div style=\"float:left\"><b>" + ResourceLoader.GetResource(session, "items.tmodel.key") + " </b> "
+ + "(<a href=\"javascript:tModelModal('" + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "','"
+ +PostBackConstants.TMODELINSTANCE + k + PostBackConstants.DISPLAYNAME + "')\" ><i class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") + "</a>) "
+ "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(bd.getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey(), "UTF8") + "\"><i class=\"icon-zoom-in icon-large\"></i></a>"
+ ": </div>"
+ "<div class=\"edit\" id=\"" + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "\">" + StringEscapeUtils.escapeHtml(bd.getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey()) + "</div>");
+ out.write("<div id=\"" + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.DISPLAYNAME +"\">" +
+
+ StringEscapeUtils.escapeHtml(x.getTmodelDisplayName(bd.getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey()))
+ +"</div>");
// out.write("<div style=\"float:left\"><span title=\"Instance Params\">Value</span>: </div>"
// + "<div class=\"edit\" id=\"" + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.VALUE + "\">" + ((bd.getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails() != null) ? StringEscapeUtils.escapeHtml(bd.getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getInstanceParms()) : "") + "</div>");
%>
diff --git a/juddi-gui/src/main/webapp/businessBrowse.jsp b/juddi-gui/src/main/webapp/businessBrowse.jsp
index c59957b..40d67b8 100644
--- a/juddi-gui/src/main/webapp/businessBrowse.jsp
+++ b/juddi-gui/src/main/webapp/businessBrowse.jsp
@@ -24,12 +24,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<table class="table-bordered table-striped">
@@ -38,13 +38,16 @@
<table>
<tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsBusiness"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsBusiness"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetBusiness">0</span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input id="offsetBusiness" value="0"></td></tr>
</table>
</td>
<td>
<table>
<tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_business" value="%" tabindex="1"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_business" tabindex="2"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+
</table>
</td>
</tr>
diff --git a/juddi-gui/src/main/webapp/businessEditor2.jsp b/juddi-gui/src/main/webapp/businessEditor2.jsp
index 7dddaee..e6693c0 100644
--- a/juddi-gui/src/main/webapp/businessEditor2.jsp
+++ b/juddi-gui/src/main/webapp/businessEditor2.jsp
@@ -32,12 +32,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.businesseditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<script type="text/javascript" src="js/businessEditor.js"></script>
diff --git a/juddi-gui/src/main/webapp/editSubscription.jsp b/juddi-gui/src/main/webapp/editSubscription.jsp
index cf85d4f..9741888 100644
--- a/juddi-gui/src/main/webapp/editSubscription.jsp
+++ b/juddi-gui/src/main/webapp/editSubscription.jsp
@@ -40,7 +40,7 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
@@ -85,7 +85,7 @@
%>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "pages.subscription.content")%>
diff --git a/juddi-gui/src/main/webapp/home.jsp b/juddi-gui/src/main/webapp/home.jsp
index 33bc934..f40b863 100644
--- a/juddi-gui/src/main/webapp/home.jsp
+++ b/juddi-gui/src/main/webapp/home.jsp
@@ -25,14 +25,14 @@
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="hero-unit">
<h1>jUDDI</h1>
<p><%=ResourceLoader.GetResource(session, "index.juddi")%></p>
<p><a href="http://juddi.apache.org" class="btn btn-primary btn-large"><%=ResourceLoader.GetResource(session, "learnmore")%> »</a></p>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span4">
<h2><%=ResourceLoader.GetResource(session, "index.browse.title")%></h2>
diff --git a/juddi-gui/src/main/webapp/importFromWadl.jsp b/juddi-gui/src/main/webapp/importFromWadl.jsp
index 52d6546..e39c6dd 100644
--- a/juddi-gui/src/main/webapp/importFromWadl.jsp
+++ b/juddi-gui/src/main/webapp/importFromWadl.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.wadl")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content.wadl")%>
diff --git a/juddi-gui/src/main/webapp/importFromWsdl.jsp b/juddi-gui/src/main/webapp/importFromWsdl.jsp
index 8bbe8b9..ff6419b 100644
--- a/juddi-gui/src/main/webapp/importFromWsdl.jsp
+++ b/juddi-gui/src/main/webapp/importFromWsdl.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.serviceimport.content")%>
diff --git a/juddi-gui/src/main/webapp/js/bindingeditor.js b/juddi-gui/src/main/webapp/js/bindingeditor.js
index 7ddc822..329a8e0 100644
--- a/juddi-gui/src/main/webapp/js/bindingeditor.js
+++ b/juddi-gui/src/main/webapp/js/bindingeditor.js
@@ -56,7 +56,6 @@
+"<a href=\"javascript:AddDescriptionSpecific('" + div + i + "instanceDescription');\"><i class=\"icon-plus-sign icon-large\"></i></a> "
+i18n_tmodelInstanceDescriptionAdd+"<br>"
+"<div id=\"" + div + i + "instanceDescription\" style=\"border-width: 1px; border-style: groove;\">"
- //issue
+"<div><br><b>" + i18n_overviewdoc + "</b> - " + i18n_overviewdocDescription + "<br>"
+"<a href=\"javascript:AddOverviewDocumentSpecific('" + div + i +
diff --git a/juddi-gui/src/main/webapp/js/businesssearch.js b/juddi-gui/src/main/webapp/js/businesssearch.js
index 51e20a6..859b5bb 100644
--- a/juddi-gui/src/main/webapp/js/businesssearch.js
+++ b/juddi-gui/src/main/webapp/js/businesssearch.js
@@ -24,11 +24,11 @@
function pagedownBusiness()
{
- offset = $("#offsetBusiness").text();
+ offset = $("#offsetBusiness").val();
//alert(offset);
var newoffset = offsetBusiness - maxrecordsBusiness;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offsetBusiness)
{
@@ -42,7 +42,7 @@
}
function pageupBusiness()
{
- offsetBusiness = $("#offsetBusiness").text();
+ offsetBusiness = $("#offsetBusiness").val();
//alert(offset);
var fetch = maxrecordsBusiness;
if ((parseInt(offsetBusiness) + parseInt(maxrecordsBusiness)) > totalrecordsBusiness)
@@ -58,6 +58,13 @@
//offset, maxrecords, keyword
function RenderBusinessListBySearch(keyword1, offset1, maxrecords1)
{
+ var maxrecords1 = $("#fetch").val();
+ try{
+ maxrecords1 = parseInt(maxrecords1);
+ }catch (e){
+ maxrecords1=40;
+ }
+ maxrecordsBusiness=maxrecords1;
var keyword =$("#name_business").val();
var lang = $("#lang_business").text();
if (lang==undefined)
diff --git a/juddi-gui/src/main/webapp/js/serviceBrowse.js b/juddi-gui/src/main/webapp/js/serviceBrowse.js
index 7d532e0..ec61ade 100644
--- a/juddi-gui/src/main/webapp/js/serviceBrowse.js
+++ b/juddi-gui/src/main/webapp/js/serviceBrowse.js
@@ -27,18 +27,18 @@
//offset += maxrecords;
function pagedownService()
{
- offsetService = $("#offsetService").text();
+ offsetService = $("#offsetService").val();
//alert(offset);
var newoffset = offsetService - maxrecordsService;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offsetService)
RenderServiceListBySearch('%', newoffset, maxrecordsService);
}
function pageupService()
{
- offsetService = $("#offsetService").text();
+ offsetService = $("#offsetService").val();
//alert(offset);
var fetch = maxrecordsService;
if ((parseInt(offsetService) + parseInt(maxrecordsService)) > totalrecordsService)
@@ -53,6 +53,12 @@
function RenderServiceListBySearch(keyword, offset, maxrecords)
{
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+ maxrecordsService=maxr;
var keyword2 = $("#name_service_search").val();
var lang = $("#lang_service_search").val();
@@ -62,7 +68,7 @@
keyword2="";
lang = encodeURIComponent(lang);
offset = encodeURIComponent(offset);
- maxrecords = encodeURIComponent(maxrecords);
+ maxrecords = encodeURIComponent(maxrecordsService);
keyword2 = encodeURIComponent(keyword2);
$("#serviceBrowserListing").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
var request= $.ajax({
diff --git a/juddi-gui/src/main/webapp/js/serviceEditor.js b/juddi-gui/src/main/webapp/js/serviceEditor.js
index 8b61b88..ec5cf84 100644
--- a/juddi-gui/src/main/webapp/js/serviceEditor.js
+++ b/juddi-gui/src/main/webapp/js/serviceEditor.js
@@ -132,7 +132,9 @@
var k = currentOverviewDocs;
$("<div id=\"" + div + i + "\" style=\"border-width: 2px; border-style: dashed; border-color: red\">"
+"<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + div + i + "');\"><i class=\"icon-trash icon-large\"></i></a></div><div style=\"float:left\">"
- +"<b>" + i18n_tmodelkey + "</b> (<a href=\"javascript:tModelModal('"+div + i + "KeyName\')\" ><i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div><div class=\"edit\" id=\"" + div + i + "KeyName\"></div>"
+ +"<b>" + i18n_tmodelkey + "</b> (<a href=\"javascript:tModelModal('"+div + i + "KeyName\','"+div + i + "DisplayName\')\" >\n\
+ <i class=\"icon-list-alt icon-large\"></i>" + il8n_picker + "</a>): </div><div class=\"edit\" id=\"" + div + i + "KeyName\"></div>"
+ +"<div id=\"" + div + i + "DisplayName\"></div>"
+"<br><div style=\"float:left\"><b>" + i18n_tmodelInstanceParams + ":</b> </div><div class=\"edit\" id=\"" + div + i + "instanceValue\"></div>"
+"<br><b>" + i18n_tmodelInstanceDescription + "</b> - " + i18n_tmodelInstanceDescription2 + "<br>"
+"<a href=\"javascript:AddDescriptionSpecific('" + div + i + "instanceDescription');\"><i class=\"icon-plus-sign icon-large\"></i></a> "
@@ -190,6 +192,10 @@
$("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
$("#alert").modal();
+
+
+
+
});
request.fail(function(jqXHR, textStatus) {
diff --git a/juddi-gui/src/main/webapp/js/tmodelChooser.js b/juddi-gui/src/main/webapp/js/tmodelChooser.js
index 055a3b3..6f8c107 100644
--- a/juddi-gui/src/main/webapp/js/tmodelChooser.js
+++ b/juddi-gui/src/main/webapp/js/tmodelChooser.js
@@ -29,9 +29,11 @@
/**
*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
+ *first selected tModel key
+ *divDisplayName if defined, is the display name for the tModel
+ *
*/
-function tModelModal(div){
+function tModelModal(div, divDisplayName){
$(div).focus();
//reset the form in case it was lanucheed more than once per page view
reloadTmodelModal();
@@ -45,7 +47,10 @@
else{
//alert('Result: ' + result.join());
- $("#" + div).html(result[0]);
+ $("#" + div).text(result[0]);
+ if (divDisplayName) {
+ $("#" + divDisplayName).text(result[1]);
+ }
}
// return false;
}
@@ -86,10 +91,15 @@
$(".modalableTmodel").each(function()
{
var id=$(this).attr("id");
+ var displayName=$(this).attr("value");
if ($(this).is(':checked')) {
selectedtmodels.push(
id
);
+ selectedtmodels.push(
+ displayName
+ );
+
}
});
diff --git a/juddi-gui/src/main/webapp/js/tmodelsearch.js b/juddi-gui/src/main/webapp/js/tmodelsearch.js
index cd37327..d4d3f29 100644
--- a/juddi-gui/src/main/webapp/js/tmodelsearch.js
+++ b/juddi-gui/src/main/webapp/js/tmodelsearch.js
@@ -13,34 +13,36 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-var offset=0; //start at the begining
-var maxrecords=10; //record 20 at a time
-var lang="en"; //langauge english
-var totalrecords=0;
+var offset = 0; //start at the begining
+var maxrecords = 10; //record 20 at a time
+var lang = "en"; //langauge english
+var totalrecords = 0;
RenderTmodelListBySearch('%', offset, maxrecords);
function pagedownChooserTmodel()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var newoffset = offset - maxrecords;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offset)
RenderTmodelListBySearch('%', newoffset, maxrecords, true);
}
function pageupChooserTmodel()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var fetch = maxrecords;
- if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
+ if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
//fetch = maxrecords - offset;
return;
- else
- fetch = (parseInt(offset) + parseInt(maxrecords));
+ else
+ fetch = (parseInt(offset) + parseInt(maxrecords));
//alert(fetch);
offset = fetch;
RenderTmodelListBySearch('%', fetch, maxrecords, true);
@@ -49,72 +51,74 @@
function pagedown()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var newoffset = offset - maxrecords;
if (newoffset < 0)
- return;
+ newoffset=0;
//alert(newoffset);
if (newoffset != offset)
RenderTmodelListBySearch('%', newoffset, maxrecords, false);
}
function pageup()
{
- offset = $("#offset").text();
+ offset = $("#offset").val();
+ maxrecords = $("#fetch").val();
//alert(offset);
var fetch = maxrecords;
- if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
+ if ((parseInt(offset) + parseInt(maxrecords)) > totalrecords)
//fetch = maxrecords - offset;
return;
- else
- fetch = (parseInt(offset) + parseInt(maxrecords));
+ else
+ fetch = (parseInt(offset) + parseInt(maxrecords));
//alert(fetch);
offset = fetch;
RenderTmodelListBySearch('%', fetch, maxrecords, false);
}
-var selectedItem=null;
+var selectedItem = null;
//offset, maxrecords, keyword
function RenderTmodelListBySearch(keyword1, offset1, maxrecords1, isForChooser)
{
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+ maxrecords = maxr;
- var keyword =$("#name_tmodel").val();
+ var keyword = $("#name_tmodel").val();
var lang = $("#lang_tmodel").val();
- if (lang==undefined)
- lang = "";
- if (keyword==undefined)
- keyword = "";
+ if (lang == undefined)
+ lang = "";
+ if (keyword == undefined)
+ keyword = "";
lang = encodeURIComponent(lang);
keyword = encodeURIComponent(keyword);
offset1 = encodeURIComponent(offset1);
- maxrecords1 = encodeURIComponent(maxrecords1);
+ maxrecords1 = encodeURIComponent(maxrecords);
isForChooser = encodeURIComponent(isForChooser);
$("#tmodellist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
- var request= $.ajax({
+ var request = $.ajax({
url: 'ajax/tmodelsearch.jsp?keyword=' + keyword + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang + "&chooser=" + isForChooser,
- type:"GET",
+ type: "GET",
cache: false
});
-
- request.done(function(msg) {
- window.console && console.log('postback done ');
+
+ request.done(function (msg) {
+ window.console && console.log('postback done ');
$("#tmodellist").html(msg);
- $('.modalable').click(function(){
- selectedItem =$(this).attr("id");
+ $('.modalable').click(function () {
+ selectedItem = $(this).attr("id");
});
- //refresh();
+ $("#offset").val(offset1);
});
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ');
+ request.fail(function (jqXHR, textStatus) {
+ window.console && console.log('postback failed ');
$("#tmodellist").html("An error occured! " + jqXHR.responseText + textStatus);
- //refresh();
});
-/*
- $.get('ajax/businesssearch.jsp?keyword=' + keyword1 + "&offset=" + offset1 + "&maxrecords=" + maxrecords1 + "&lang=" + lang, function(data) {
- $("#businesslist").html(data);
- refresh();
- });*/
}
function refresh()
@@ -124,18 +128,15 @@
{
$("#pageup").addClass("disabled");
$("#pagedown").addClass("disabled");
- }
- else if (offset + maxrecords > totalrecords)
+ } else if (offset + maxrecords > totalrecords)
{
- $("#pageup").addClass("disabled");
- }
- else if (offset ==0)
+ $("#pageup").addClass("disabled");
+ } else if (offset == 0)
{
- $("#pagedown").removeClass("disabled");
- }
- else
+ $("#pagedown").removeClass("disabled");
+ } else
{
- $("#pagedown").removeClass("disabled");
- $("#pageup").removeClass("disabled");
+ $("#pagedown").removeClass("disabled");
+ $("#pageup").removeClass("disabled");
}
}
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/reginfo.jsp b/juddi-gui/src/main/webapp/reginfo.jsp
index cece1c9..a9060c6 100644
--- a/juddi-gui/src/main/webapp/reginfo.jsp
+++ b/juddi-gui/src/main/webapp/reginfo.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.content")%>
diff --git a/juddi-gui/src/main/webapp/search.jsp b/juddi-gui/src/main/webapp/search.jsp
index fe7175f..d6ef417 100644
--- a/juddi-gui/src/main/webapp/search.jsp
+++ b/juddi-gui/src/main/webapp/search.jsp
@@ -26,12 +26,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%= ResourceLoader.GetResource(session, "navbar.search")%> </h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/serviceBrowse.jsp b/juddi-gui/src/main/webapp/serviceBrowse.jsp
index 7da8bb6..922c53e 100644
--- a/juddi-gui/src/main/webapp/serviceBrowse.jsp
+++ b/juddi-gui/src/main/webapp/serviceBrowse.jsp
@@ -25,53 +25,57 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="well" >
- <h1><%=ResourceLoader.GetResource(session, "navbar.services")%></h1>
- </div>
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <div id="businesslist">
- <table class="table-striped table-bordered">
- <tr><td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offsetService">0</span></td></tr>
- </table>
- </td>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_service_search" value="%"></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_service_search" value=""></td></tr>
- </table>
- </td>
- </tr>
- </table>
+ <div class="well" >
+ <h1><%=ResourceLoader.GetResource(session, "navbar.services")%></h1>
+ </div>
- <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
- <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
- <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
- <div id="serviceBrowserListings">
- <img src="img/bigrollergreen.gif" title="Loading"/>
+ <div class="row">
+ <div class="span12" >
+ <div id="businesslist">
+ <table class="table-striped table-bordered">
+ <tr><td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecordsService"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecordsService"></span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offsetService" value="0"></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_service_search" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_service_search" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <a href="javascript:pagedownService();"><i class="icon-circle-arrow-left icon-2x" id="pageupService"></i></a>
+ <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+ <a href="javascript:pageupService();"><i class="icon-circle-arrow-right icon-2x" id="pagedownService"></i></a>
+
+ <div id="serviceBrowserListings">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
+ </div>
+ <script src="js/serviceBrowse.js"></script>
+ <script type="text/javascript">
+
+ $('.edit').editable(function (value, settings) {
+ window.console && console.log(value + this + settings);
+ RenderServiceListBySearch('%', offset, maxrecords);
+
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ </script>
</div>
- <script src="js/serviceBrowse.js"></script>
- <script type="text/javascript">
- $('.edit').editable(function(value, settings) {
- window.console && console.log(value + this + settings);
- RenderServiceListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type: 'text',
- submit: i18n_ok
- });
- </script>
- </div>
-
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/serviceEditor.jsp b/juddi-gui/src/main/webapp/serviceEditor.jsp
index 9c1c37f..353cbc4 100644
--- a/juddi-gui/src/main/webapp/serviceEditor.jsp
+++ b/juddi-gui/src/main/webapp/serviceEditor.jsp
@@ -74,12 +74,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.serviceeditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/settings.jsp b/juddi-gui/src/main/webapp/settings.jsp
index 111abfb..114bcdc 100644
--- a/juddi-gui/src/main/webapp/settings.jsp
+++ b/juddi-gui/src/main/webapp/settings.jsp
@@ -29,12 +29,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.settings")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<h2><%=ResourceLoader.GetResource(session, "navbar.settings")%></h2>
diff --git a/juddi-gui/src/main/webapp/signer.jsp b/juddi-gui/src/main/webapp/signer.jsp
index 84acf46..8d72968 100644
--- a/juddi-gui/src/main/webapp/signer.jsp
+++ b/juddi-gui/src/main/webapp/signer.jsp
@@ -23,14 +23,14 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1>
<%=ResourceLoader.GetResource(session, "items.dsigs")%>
</h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<%=ResourceLoader.GetResource(session, "items.dsigs.description")%><br>
diff --git a/juddi-gui/src/main/webapp/subscriptionFeed.jsp b/juddi-gui/src/main/webapp/subscriptionFeed.jsp
index 550a3de..e22c076 100644
--- a/juddi-gui/src/main/webapp/subscriptionFeed.jsp
+++ b/juddi-gui/src/main/webapp/subscriptionFeed.jsp
@@ -26,13 +26,13 @@
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p><%=ResourceLoader.GetResource(session, "navbar.subscriptions.feed.content")%>.</p>
diff --git a/juddi-gui/src/main/webapp/tmodelBrowse.jsp b/juddi-gui/src/main/webapp/tmodelBrowse.jsp
index fc86cf1..16b40f9 100644
--- a/juddi-gui/src/main/webapp/tmodelBrowse.jsp
+++ b/juddi-gui/src/main/webapp/tmodelBrowse.jsp
@@ -25,57 +25,66 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="well" >
- <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
- </div>
- <!-- Example row of columns -->
- <div class="row">
- <div class="span12" >
- <table class="table-striped table-bordered">
- <tr>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
- </table>
- </td>
- <td>
- <table>
- <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
- </table>
- </td>
- </tr>
+ <div class="well" >
+ <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
+ </div>
- </table>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
- <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
- <div id="tmodellist">
- <img src="img/bigrollergreen.gif" title="Loading"/>
- </div>
- <script src="js/tmodelsearch.js"></script>
- <script type="text/javascript">
+ <div class="row">
+ <div class="span12" >
+ <table class="table-striped table-bordered">
+ <tr>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offset" value="0"></td></tr>
+ </table>
+ </td>
+ <td>
+ <table>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
+ </table>
+ </td>
+ </tr>
- function reload()
- {
- RenderTmodelListBySearch('%', offset, maxrecords, false);
- }
- $('.edit').editable(function(value, settings) {
- window.console && console.log(value + this + settings);
- reload();
- // RenderTmodelListBySearch('%', offset, maxrecords);
- return(value);
- }, {
- type: 'text',
- submit: i18n_ok
- });
- reload();
- </script>
- </div>
- </div>
- <%@include file="header-bottom.jsp" %>
\ No newline at end of file
+ </table>
+ <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+ <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+ <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
+
+ <div id="tmodellist">
+ <img src="img/bigrollergreen.gif" title="Loading"/>
+ </div>
+ <script src="js/tmodelsearch.js"></script>
+ <script type="text/javascript">
+
+ function reload()
+ {
+ var maxr = 10;
+ try {
+ maxr = parseInt($("#fetch").val());
+ } catch (e) {
+ }
+
+ maxrecords = maxr;
+ RenderTmodelListBySearch($('#name_tmodel').val(), offset, maxrecords, false);
+ }
+ $('.edit').editable(function (value, settings) {
+ window.console && console.log(value + this + settings);
+ reload();
+ // RenderTmodelListBySearch('%', offset, maxrecords);
+ return(value);
+ }, {
+ type: 'text',
+ submit: i18n_ok
+ });
+ reload();
+ </script>
+ </div>
+ </div>
+ <%@include file="header-bottom.jsp" %>
\ No newline at end of file
diff --git a/juddi-gui/src/main/webapp/tmodelChooser.jsp b/juddi-gui/src/main/webapp/tmodelChooser.jsp
index 0e5bb88..744a75f 100644
--- a/juddi-gui/src/main/webapp/tmodelChooser.jsp
+++ b/juddi-gui/src/main/webapp/tmodelChooser.jsp
@@ -35,13 +35,15 @@
<table>
<tr><td><%=ResourceLoader.GetResource(session, "totals.records")%></td><td><span id="totalrecords"></span></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "totals.recordsreturned")%></td><td><span id="displayrecords"></span></td></tr>
- <tr><td><%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><span id="offset">0</span></td></tr>
+ <tr><td title="<%=ResourceLoader.GetResource(session, "totals.offset.v2disclaimer")%>">
+ <%=ResourceLoader.GetResource(session, "totals.offset")%></td><td><input type="number" id="offset" value="0"></td></tr>
</table>
</td>
<td>
<table>
<tr><td><%=ResourceLoader.GetResource(session, "items.name")%></td><td><input type="text" id="name_tmodel" value="%"></td></tr>
<tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" id="lang_tmodel" value=""></td></tr>
+ <tr><td><%=ResourceLoader.GetResource(session, "totals.fetch")%></td><td><input type="number" id="fetch" value="40"></td></tr>
</table>
</td>
diff --git a/juddi-gui/src/main/webapp/tmodelEditor.jsp b/juddi-gui/src/main/webapp/tmodelEditor.jsp
index 137f12b..6de546b 100644
--- a/juddi-gui/src/main/webapp/tmodelEditor.jsp
+++ b/juddi-gui/src/main/webapp/tmodelEditor.jsp
@@ -30,12 +30,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "pages.tmodeleditor.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p>
diff --git a/juddi-gui/src/main/webapp/tmodelPartitions.jsp b/juddi-gui/src/main/webapp/tmodelPartitions.jsp
index 89a3d45..49a2119 100644
--- a/juddi-gui/src/main/webapp/tmodelPartitions.jsp
+++ b/juddi-gui/src/main/webapp/tmodelPartitions.jsp
@@ -25,12 +25,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "pages.tmodelpart.title")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
diff --git a/juddi-gui/src/main/webapp/transfer.jsp b/juddi-gui/src/main/webapp/transfer.jsp
index f6522e3..1838c6b 100644
--- a/juddi-gui/src/main/webapp/transfer.jsp
+++ b/juddi-gui/src/main/webapp/transfer.jsp
@@ -29,13 +29,13 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well" >
<h1><%=ResourceLoader.GetResource(session, "actions.transfer")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12" >
<%=ResourceLoader.GetResource(session, "pages.transfer.content")%>
diff --git a/juddi-gui/src/main/webapp/viewSubscriptions.jsp b/juddi-gui/src/main/webapp/viewSubscriptions.jsp
index 6150595..09a5b02 100644
--- a/juddi-gui/src/main/webapp/viewSubscriptions.jsp
+++ b/juddi-gui/src/main/webapp/viewSubscriptions.jsp
@@ -34,12 +34,12 @@
<%@include file="header-top.jsp" %>
<div class="container">
- <!-- Main hero unit for a primary marketing message or call to action -->
+
<div class="well">
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
- <!-- Example row of columns -->
+
<div class="row">
<div class="span12">
<p>
diff --git a/pom.xml b/pom.xml
index aefccfd..ac3c3c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cxf.version>3.3.4</cxf.version>
<springframework.version>5.2.4.RELEASE</springframework.version>
- <apache.tomcat.version>9.0.31</apache.tomcat.version>
+ <apache.tomcat.version>9.0.37</apache.tomcat.version>
<jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
<jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
