Author: alexoree
Date: Sat Jan 25 23:07:03 2014
New Revision: 1561422
URL: http://svn.apache.org/r1561422
Log:
JUDDI-816 fixed
Modified:
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js
juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
Modified:
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
(original)
+++
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
Sat Jan 25 23:07:03 2014
@@ -798,7 +798,9 @@ public class UddiHub implements Serializ
}
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f =
(DispositionReportFaultMessage) ex;
- if
(f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED) ||
ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED) ||
ex.getMessage().toLowerCase().contains("expired")) {
+ if
(f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)
+ ||
ex.getMessage().contains(DispositionReport.E_AUTH_TOKEN_EXPIRED)
+ ||
ex.getMessage().toLowerCase().contains("expire")) {
return true;
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp Sat Jan 25 23:07:03
2014
@@ -4,8 +4,8 @@
Author : Alex O'Ree
--%><%@page import="javax.xml.bind.JAXB"%><%@page
import="org.apache.juddi.webconsole.resources.ResourceLoader"%><%@page
import="org.apache.juddi.jaxb.JAXBMarshaller"%><%@page
import="org.apache.juddi.jaxb.EntityCreator"%><%@page
import="org.apache.juddi.webconsole.hub.UddiHub"%><%@page
import="org.apache.juddi.jaxb.PrintUDDI"%><%@page contentType="text/html"
pageEncoding="UTF-8"%><%
//<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- //org.apache.juddi.jaxb.PrintUDDI p = new PrintUDDI();
- response.setContentType("text/xml");
+//NO NOT UNCOMMENT
+// response.setContentType("text/xml");
UddiHub x = UddiHub.getInstance(application, session);
String type = request.getParameter("type");
Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Sat Jan 25
23:07:03 2014
@@ -410,7 +410,7 @@
out.write("<div id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + "\" style=\"border-width:2px;
border-style:solid\">"
+ "<div style=\"float:left;height:100%\"><a
href=\"javascript:Remove('" + PostBackConstants.CATBAG_KEY_REF_GRP + i +
"');\"><i class=\"icon-trash icon-large\"></i></a></div>"
- + "<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i +
PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt
icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") +
"</a>)"
+ + "<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i +
PostBackConstants.VALUE + "')\" >" + "<i class=\"icon-list-alt
icon-large\"></i>" + ResourceLoader.GetResource(session, "items.picker") +
"</a>) "
+ "<a href=\"tmodelEditor.jsp?id=" +
URLEncoder.encode(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey(),
"UTF8") + "\"><i class=\"icon-zoom-in icon-large\"></i></a>"
+ ": </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "\">"
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js Sat Jan 25
23:07:03 2014
@@ -277,7 +277,7 @@ function AddCategoryKeyReferenceGroup()
+ "<div class=\"edit\" id=\"catbaggrpkeyref" + i + "Value\"></div>"
+ "<div id=\"catbaggrpkeyref" + i + "keyref\"
style=\"border-width:1px; border-style:solid\">"
- + "<div style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('catbaggrpkeyref" + i +
"keyref');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+ + "<div style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('catbaggrpkeyref" + i +
"');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+i18n_addrefcat
+ "</div>"
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js Sat Jan 25
23:07:03 2014
@@ -49,7 +49,7 @@ function AddCategoryKeyReferenceGroupSpe
+ "<div id=\""+div + i + "keyref\" style=\"border-width:1px;
border-style:solid\">"
+ "<div style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('"+div + i
- + "keyref');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+ + "');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+i18n_addrefcat
+ "</div>"
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Sat Jan 25 23:07:03
2014
@@ -66,7 +66,7 @@
if (bd == null) {
//we can't make a new service without a business to reference
- response.sendRedirect("error.jsp");
+ response.sendRedirect("index.jsp");
}
%>
<%@include file="header-top.jsp" %>
@@ -312,7 +312,7 @@
+
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
+ "</div>"
+ "<div id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + "\"
style=\"border-width:1px; border-style:solid\">"
- + "<div style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF +
"');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
+ + "<div style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + "');\"><i class=\"icon-plus-sign
icon-large\"></i></a></div>"
+ ResourceLoader.GetResource(session,
"items.keyrefcat.add")
+ "</div>");
@@ -514,11 +514,11 @@
<%
}
%>
- </div> <!-- tmodel instance info -->
+ </div> <!-- end of tmodel instance info -->
<Br>
<b><%=ResourceLoader.GetResource(session,
"items.bindingtemplate.keyrefcat")%></b><Br>
- <a
href="javascript:AddCategoryKeyReferenceSpecific('<%=PostBackConstants.BINDINGTEMPLATE
+ i + PostBackConstants.CATBAG_KEY_REF%>');"><i class="icon-plus-sign
icon-large"></i></a> <%=ResourceLoader.GetResource(session,
"items.keyrefcat.add")%> <Br>
+ <a
href="javascript:AddCategoryKeyReferenceGroupKeyRef('<%=PostBackConstants.BINDINGTEMPLATE
+ i + PostBackConstants.CATBAG_KEY_REF%>');"><i class="icon-plus-sign
icon-large"></i></a> <%=ResourceLoader.GetResource(session,
"items.keyrefcat.add")%> <Br>
<div id="<%=PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF%>" style="border-width: 1px; border-style:
dotted;" >
<%
if
(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag() == null)
{
@@ -551,10 +551,10 @@
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "\" style=\"border-width:2px; border-style:solid\">"
+ "<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+ "<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF_GRP + z + PostBackConstants.VALUE + "')\" ><i
class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session,
"items.picker") + "</a>) "
- + "<a href=\"tmodelEditor.jsp?id=" +
URLEncoder.encode(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey(),
"UTF8") + "\"><i class=\"icon-zoom-in icon-large\"></i></a>"
+ + "<a href=\"tmodelEditor.jsp?id=" +
URLEncoder.encode(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().get(z).getTModelKey(),
"UTF8") + "\"><i class=\"icon-zoom-in icon-large\"></i></a>"
+ ": </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + PostBackConstants.VALUE + "\">"
- +
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
+ +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().get(z).getTModelKey())
+ "</div>"
+ "<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + PostBackConstants.KEY_REF + "\" style=\"border-width:1px;
border-style:solid\">"
+ "<div
style=\"float:left;height:100%\"><a
href=\"javascript:AddCategoryKeyReferenceSpecificBT('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "keyref');\"><i class=\"icon-plus-sign icon-large\"></i></a></div>"
Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1561422&r1=1561421&r2=1561422&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Sat Jan 25 23:07:03
2014
@@ -113,9 +113,12 @@
}
int currentcatkeyref = 0;
+ int currentcatkeyrefgrp=0;
if (bd.getCategoryBag() != null) {
currentcatkeyref =
bd.getCategoryBag().getKeyedReference().size();
+ currentcatkeyrefgrp
=bd.getCategoryBag().getKeyedReferenceGroup().size();
}
+
int currentident = 0;
if (bd.getIdentifierBag() != null) {
currentident =
bd.getIdentifierBag().getKeyedReference().size();
@@ -124,7 +127,7 @@
var currentcatkeyref =<%=currentcatkeyref%>;
var currentDescriptionSpecific =<%=currentDescriptionSpecific%>;
var currentident =<%=currentident%>;
- var currentcatkeyrefgrp
=<%=bd.getCategoryBag().getKeyedReferenceGroup().size()%>;
+ var currentcatkeyrefgrp =<%=currentcatkeyrefgrp%>;
</script>
<div class="tab-content">
<div class="tab-pane active" id="general">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
