Skip to content
Permalink
Browse files
Merge branch 'master' into bug/JUDDI-1015
  • Loading branch information
spyhunter99 committed Jul 22, 2020
2 parents 28dd720 + 1c7db5d commit 7a26bedd92cff633d641118d19b5237ac8474105
Showing 39 changed files with 291 additions and 218 deletions.
@@ -51,6 +51,7 @@ public interface PostBackConstants {
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";
@@ -1037,11 +1037,13 @@ public String SaveServiceDetails(BusinessService be) {
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 @@ public String SaveTModel(TModel be) {
}
}
//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 @@ public String deleteBinding(String id) {
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 "";
}
}
@@ -173,6 +173,7 @@ public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession se

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 @@ public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession se
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=")
@@ -451,3 +451,5 @@ items.categorizations=Categorizations
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
@@ -453,3 +453,5 @@ items.categorizations=Categorizaciones
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
@@ -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")%>
@@ -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")%>
@@ -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>
@@ -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>
@@ -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 {
@@ -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" >

@@ -82,9 +82,6 @@ this page is meant to be included via jsp:include
</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>
%>

@@ -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>&nbsp;</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>"
+ ": &nbsp;</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>:&nbsp;</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>");
%>
@@ -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>
@@ -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>
@@ -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")%>
@@ -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")%> &raquo;</a></p>
</div>

<!-- Example row of columns -->

<div class="row">
<div class="span4">
<h2><%=ResourceLoader.GetResource(session, "index.browse.title")%></h2>
@@ -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")%>
@@ -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")%>
@@ -56,7 +56,6 @@ function AddTmodelInstanceParam(key)
+"<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 +

0 comments on commit 7a26bed

Please sign in to comment.