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 2014/02/08 19:42:46 UTC
svn commit: r1566091 - in /juddi/trunk/juddi-gui/src/main:
java/org/apache/juddi/webconsole/hub/
java/org/apache/juddi/webconsole/hub/builders/
resources/org/apache/juddi/webconsole/resources/ webapp/ webapp/WEB-INF/
webapp/ajax/ webapp/js/
Author: alexoree
Date: Sat Feb 8 18:42:45 2014
New Revision: 1566091
URL: http://svn.apache.org/r1566091
Log:
JUDDI-845 fixed, also max entities was not rendered correctly
JUDDI-833 fixed
JUDDI-844 fixed
Modified:
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js
juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js
juddi/trunk/juddi-gui/src/main/webapp/js/main.js
juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js
juddi/trunk/juddi-gui/src/main/webapp/js/tmodeledit.js
juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
juddi/trunk/juddi-gui/src/main/webapp/signer.jsp
juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp
juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.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=1566091&r1=1566090&r2=1566091&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 Feb 8 18:42:45 2014
@@ -701,7 +701,7 @@ public class UddiHub implements Serializ
}
} catch (Exception ex) {
- return ToErrorAlert(HandleException(ex));
+ return (HandleException(ex));
}
if (findBusiness == null || findBusiness.getBusinessInfos() == null) {
@@ -1297,12 +1297,12 @@ public class UddiHub implements Serializ
* @param ex
* @return string
*/
- private String HandleException(Exception ex) {
+ public String HandleException(Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
log.error(ex.getMessage() + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : ""));
log.debug(ex.getMessage(), ex);
- return ResourceLoader.GetResource(session, "errors.uddi") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "") + " " + ex.getClass().getCanonicalName();
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "") + " " + ex.getClass().getCanonicalName();
} else if (ex instanceof RemoteException) {
RemoteException f = (RemoteException) ex;
log.error("RemoteException " + ex.getMessage());
@@ -2414,7 +2414,7 @@ public class UddiHub implements Serializ
* Removes/deletes a subscription
*
* @param key
- * @return sucess or failure message
+ * @return success or failure message
*/
public String RemoveSubscription(String key) {
DeleteSubscription ds = new DeleteSubscription();
@@ -2706,7 +2706,7 @@ public class UddiHub implements Serializ
* @param fromkey
* @param keyname
* @param keyvalue
- * @return status msg
+ * @return status msg, expected value is actions.saved
*/
public String AddPublisherAssertion(String tokey, String fromkey, String tmodelkey, String keyname, String keyvalue) {
// List<PublisherAssertion> x = GetPublisherAssertions();
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java Sat Feb 8 18:42:45 2014
@@ -163,6 +163,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getGetBindingDetail() != null && !sub.getSubscriptionFilter().getGetBindingDetail().getBindingKey().isEmpty()) {
return " active ";
@@ -174,7 +177,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
-
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getGetBusinessDetail() != null && !sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().isEmpty()) {
return " active ";
}
@@ -185,6 +190,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getGetServiceDetail() != null && !sub.getSubscriptionFilter().getGetServiceDetail().getServiceKey().isEmpty()) {
return " active ";
}
@@ -195,7 +203,7 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
- if (sub.getSubscriptionKey() == null) {
+ if (sub.getSubscriptionFilter() == null) {
return "";
}
if (sub.getSubscriptionFilter().getGetTModelDetail() != null && !sub.getSubscriptionFilter().getGetTModelDetail().getTModelKey().isEmpty()) {
@@ -208,6 +216,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getGetAssertionStatusReport() != null && sub.getSubscriptionFilter().getGetAssertionStatusReport().getCompletionStatus() != null) {
return " active ";
@@ -230,6 +241,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getFindBinding() != null) {
return " active ";
@@ -241,6 +255,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getFindRelatedBusinesses() != null) {
return " active ";
@@ -252,6 +269,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getFindService() != null) {
return " active ";
@@ -263,6 +283,9 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
if (sub.getSubscriptionFilter().getFindTModel() != null) {
return " active ";
Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Sat Feb 8 18:42:45 2014
@@ -405,5 +405,5 @@ error.nousername=Please enter a username
actions.result=Results
errors.nooperationalinfo=No operational information is available. This could be because you're using an UDDI v2 endpoint or perhaps there's a problem at an UDDI v3 endpoint (or it's not supported).
errors.subscription.alerttypeinvalid=The Alert Type is invalid.
-errors.subscription.alertcriteriainvalid=The alert type criteria is invalid. Make sure at least one of the search item buttos is highlighted in Step 2.
+errors.subscription.alertcriteriainvalid=The alert type criteria is invalid. Make sure at least one of the search item buttons is highlighted in Step 2.
errors.subscription.relatedbiz=Related Business is not supported for single item subscriptions.
Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties Sat Feb 8 18:42:45 2014
@@ -408,5 +408,5 @@ error.nousername=Por favor, introduzca u
actions.result=Resultados
errors.nooperationalinfo=No hay informaci\u00f3n operativa disponible. Esto podr\u00eda deberse a que est\u00e1 utilizando un punto final v2 UDDI o tal vez hay un problema en un punto final v3 UDDI (o no es compatible).
errors.subscription.alerttypeinvalid=El tipo de alerta es v\u00e1lida.
-errors.subscription.alertcriteriainvalid=El criterio del tipo de alerta es v\u00e1lida. Aseg\u00farese de que al menos uno de los buttos elemento buscado es resaltado en el paso 2.
+errors.subscription.alertcriteriainvalid=El criterio del tipo de alerta es v\u00e1lida. Aseg\u00farese de que al menos uno de los botones de elemento de b\u00fasqueda se resalta en el Paso 2.
errors.subscription.relatedbiz=Empresas relacionadas no se admite para las suscripciones de un solo art\u00edculo.
Modified: juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/WEB-INF/web.xml Sat Feb 8 18:42:45 2014
@@ -60,13 +60,11 @@
<error-code>403</error-code>
<location>/error.jsp</location>
</error-page>
- <error-page>
- <!-- <description>Uncaught exception</description> -->
+<!-- <error-page>
<error-code>500</error-code>
<location>/error.jsp</location>
- </error-page>
+ </error-page>-->
<error-page>
- <!-- <description>Unsupported servlet method</description> -->
<error-code>503</error-code>
<location>/error.jsp</location>
</error-page>
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp Sat Feb 8 18:42:45 2014
@@ -26,6 +26,8 @@
String msg = x.DiscardToken(tokenxml);
if (msg != null) {
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(msg);
} else {
out.write(ResourceLoader.GetResource(session, "actions.canceled"));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp Sat Feb 8 18:42:45 2014
@@ -34,6 +34,8 @@
String msg = x.AcceptCustodyTranferToken(tokenXML, keyBagXML);
if (msg != null) {
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(msg);
} else {
out.write(ResourceLoader.GetResource(session, "actions.success"));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp Sat Feb 8 18:42:45 2014
@@ -34,7 +34,10 @@
}
} else if (action.equalsIgnoreCase("senddata")) {
Object j=UDDIRequestsAsXML.getObject(service, method, request.getParameter("content"));
- out.write(x.SendAdvancedQuery(j, service, method));
+ String msg=(x.SendAdvancedQuery(j, service, method));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp Sat Feb 8 18:42:45 2014
@@ -25,14 +25,14 @@
if (action.equalsIgnoreCase("delete")) {
String msg = x.DeletePublisherAssertion(request.getParameter("tokey"), request.getParameter("fromkey"), request.getParameter("tmodelkey"), request.getParameter("keyname"), request.getParameter("keyvalue"));
if (!msg.equals(ResourceLoader.GetResource(session, "actions.saved"))) {
- response.setStatus(500);
+ response.setStatus(406);
}
out.write(msg);
}
} else {
String msg = x.AddPublisherAssertion(request.getParameter("tokey"), request.getParameter("fromkey"), request.getParameter("tmodelkey"), request.getParameter("keyname"), request.getParameter("keyvalue"));
if (!msg.equals(ResourceLoader.GetResource(session, "actions.saved"))) {
- response.setStatus(500);
+ response.setStatus(406);
}
out.write(msg);
}
@@ -44,6 +44,7 @@
if (msg != null && msg.get() != null) {
out.write(UddiHub.ToErrorAlert(msg.get()));
} else if (data == null || data.isEmpty())
+ //TODO revise this
out.write(UddiHub.ToErrorAlert(ResourceLoader.GetResource(session, "errors.nodatareturned")));
else {
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp Sat Feb 8 18:42:45 2014
@@ -47,7 +47,8 @@
} catch (Exception ex) {
}
PagableContainer ret = (x.SearchForBinding(keyword, lang, offset, maxrecords, isChooser));
-
+ if (ret.renderedHtml.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(ret.renderedHtml);
%>
<script type="text/javascript">
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp Sat Feb 8 18:42:45 2014
@@ -10,7 +10,9 @@
<jsp:include page="../csrf.jsp" />
<%
UddiHub x = UddiHub.getInstance(application, session);
-
- out.write(x.GetMyTransferableKeys(true, true));
+ String msg2 = x.GetMyTransferableKeys(true, true);
+ if (msg2.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg2);
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp Sat Feb 8 18:42:45 2014
@@ -52,6 +52,8 @@
PagableContainer ret= (x.GetBusinessListAsHtml(offset, maxrecords, keyword, lang, isChooser));
+ if (ret.renderedHtml.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(ret.renderedHtml);
%>
<script type="text/javascript">
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp Sat Feb 8 18:42:45 2014
@@ -4,13 +4,17 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x =UddiHub.getInstance(application, session);
- out.write(x.deleteBusiness(request.getParameter("id")));
+ String msg=(x.deleteBusiness(request.getParameter("id")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp Sat Feb 8 18:42:45 2014
@@ -4,13 +4,18 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, session);
- out.write(x.deleteService(request.getParameter("id")));
+
+ String msg=(x.deleteService(request.getParameter("id")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp Sat Feb 8 18:42:45 2014
@@ -4,13 +4,17 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x =UddiHub.getInstance(application, session);
- out.write(x.deleteTmodel(request.getParameter("id")));
+ String msg=(x.deleteTmodel(request.getParameter("id")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp Sat Feb 8 18:42:45 2014
@@ -73,7 +73,7 @@
} catch (Exception ex) {
- response.setStatus(400);
+ response.setStatus(406);
out.write(ex.getMessage());
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp Sat Feb 8 18:42:45 2014
@@ -3,6 +3,7 @@
Created on : July 11, 2013, 3:26:42 PM
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
<%@page import="org.uddi.api_v3.BusinessService"%>
<%@page import="org.apache.juddi.v3.client.mapping.wadl.Application"%>
@@ -163,16 +164,23 @@
}
} catch (Exception ex) {
- out.write("<i class=\"icon-thumbs-down icon-large\"></i> Error! " + ex.getClass().getCanonicalName() + " " + ex.getMessage());
+ response.setStatus(406);
+ String msg = x.HandleException(ex);
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp Sat Feb 8 18:42:45 2014
@@ -3,6 +3,7 @@
Created on : May 11, 2013, 3:26:42 PM
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.v3.client.config.TokenResolver"%>
<%@page import="org.uddi.api_v3.Name"%>
<%@page import="org.uddi.api_v3.BusinessEntity"%>
@@ -149,16 +150,23 @@
}
} catch (Exception ex) {
- out.write("<i class=\"icon-thumbs-down icon-large\"></i> Error! " + ex.getClass().getCanonicalName() + " " + ex.getMessage());
+ response.setStatus(406);
+ String msg = x.HandleException(ex);
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
} else {
- out.write("bad request");
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "errors.generic"));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp Sat Feb 8 18:42:45 2014
@@ -73,9 +73,8 @@
if (msg != null) {
session.removeAttribute("username");
session.removeAttribute("password");
- response.setStatus(406);
-
out.write(msg);
+ response.setStatus(406);
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
@@ -12,7 +13,10 @@
id = request.getParameter("id");
if (id!=null){
UddiHub x = UddiHub.getInstance(application, session);
- out.write(x.GetOperationalInfo(x.GetOperationalInfo(id)));
+ String msg=(x.GetOperationalInfo(x.GetOperationalInfo(id)));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp Sat Feb 8 18:42:45 2014
@@ -58,10 +58,8 @@
} else {
msg = (ResourceLoader.GetResource(session, "errors.unknownentity"));
}
-
- if (!msg.equalsIgnoreCase(ResourceLoader.GetResource(session, "actions.saved"))) {
- //response.setStatus(500);
- }
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(msg);
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page import="java.util.Enumeration"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -17,8 +18,10 @@
}*/
//out.write("success");
UddiHub hub = UddiHub.getInstance(application, session);
-
- out.write(hub.SaveBusinessDetails(request));
+ String msg=hub.SaveBusinessDetails(request);
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@include file="../csrf.jsp" %>
@@ -11,7 +12,10 @@
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, request.getSession());
- out.write(x.SaveServiceDetails(request));
+ String msg=(x.SaveServiceDetails(request));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page import="java.util.Enumeration"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -18,7 +19,10 @@
//out.write("success");
UddiHub hub = UddiHub.getInstance(application, session);
- out.write(hub.SaveTModel(request));
+ String msg=(hub.SaveTModel(request));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub.FindType"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub.CriteriaType"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -73,7 +74,10 @@
}
UddiHub x = UddiHub.getInstance(application, session);
- out.write(x.Search(type, criteria, searchcontent, lang, findqualifier));
+ String msg=(x.Search(type, criteria, searchcontent, lang, findqualifier));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
} else {
response.sendRedirect("../index.jsp");
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
@@ -11,5 +12,8 @@
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
- out.write(x.GetServiceDetailAsHtml(request.getParameter("id")));
+ String msg=(x.GetServiceDetailAsHtml(request.getParameter("id")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp Sat Feb 8 18:42:45 2014
@@ -5,11 +5,15 @@
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
- out.write(x.GetServiceList(request.getParameter("id")));
+ String msg=(x.GetServiceList(request.getParameter("id")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp Sat Feb 8 18:42:45 2014
@@ -49,6 +49,9 @@
}
PagableContainer ret = (x.SearchForServices(keyword, lang, maxrecords, offset, isChooser));
+
+ if (ret.renderedHtml.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
out.write(ret.renderedHtml);
%>
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp Sat Feb 8 18:42:45 2014
@@ -23,6 +23,7 @@
request.getRemoteHost() + " " +
request.getRemoteUser());
response.setStatus(403);
+ return;
} else {
@@ -50,10 +51,11 @@
}
try {
x.GetJuddiClientConfig().saveConfig();
- out.write("Saved!");
+ out.write(ResourceLoader.GetResource(session, "actions.saved"));
} catch (Exception ex) {
- response.setStatus(500);
- out.write("Error saving Juddi Client Config" + ex.getMessage());
+ response.setStatus(406);
+
+ out.write(x.HandleException(ex));
}
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="java.util.concurrent.atomic.AtomicReference"%>
<%@page import="org.apache.juddi.webconsole.hub.builders.Builders"%>
<%@page import="org.uddi.sub_v3.Subscription"%>
@@ -14,11 +15,15 @@
if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, session);
if (request.getParameter("DELETE") != null) {
- out.write( x.RemoveSubscription(request.getParameter("DELETE")));
+ String msg=( x.RemoveSubscription(request.getParameter("DELETE")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
} else {
AtomicReference<String> outmsg = new AtomicReference<String>();
Subscription sub = Builders.BuildClientSubscription(request.getParameterMap(), outmsg, session);
if (sub == null) {
+ response.setStatus(406);
out.write(outmsg.get());
} else {
out.write(x.AddSubscription(sub));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp Sat Feb 8 18:42:45 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
@@ -12,9 +13,12 @@
if (request.getParameter("action") != null) {
String action = request.getParameter("action");
if (action.equalsIgnoreCase("createKeyGen")) {
- out.write(hub.AddTmodelKenGenerator(request.getParameter("keygen"),
+ String msg=(hub.AddTmodelKenGenerator(request.getParameter("keygen"),
request.getParameter("keyname"),
request.getParameter("keylang")));
+ if (msg.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(msg);
} else {
response.sendRedirect("/index.jsp");
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp Sat Feb 8 18:42:45 2014
@@ -47,7 +47,10 @@
}
PagableContainer ret = (x.tModelListAsHtml(keyword, lang, offset, maxrecords, isChooser));
- out.write(ret.renderedHtml);
+
+ if (ret.renderedHtml.contains(ResourceLoader.GetResource(session, "errors.generic")))
+ response.setStatus(406);
+ out.write(ret.renderedHtml);
%>
<script type="text/javascript">
totalrecords=<%=ret.totalrecords%>;
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=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp Sat Feb 8 18:42:45 2014
@@ -30,6 +30,7 @@
// out.write(EntityCreator.outputEntityToString(j, "org.apache.juddi.api_v3"));
} else {
out.write(ResourceLoader.GetResource(session, "items.unknown"));
+ response.setStatus(406);
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp Sat Feb 8 18:42:45 2014
@@ -45,7 +45,7 @@
out.write("<span class=\"label label-success\">" + ResourceLoader.GetResource(session, "items.signatures.valid") + "</span>");
}
} else {
- response.setStatus(500);
+ //response.setStatus(500);
out.write(ResourceLoader.GetResource(session, "items.unknown"));
}
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp Sat Feb 8 18:42:45 2014
@@ -260,7 +260,7 @@
<a href="#step4anchor" class="uddi_tooltips" data-toggle="tooltip" data-container="body" title="<%=ResourceLoader.GetResource(session, "items.maxrecords.callback.tooltip")%>"><i class="icon-question-sign"></i></a>: </div>
<div class="edit" id="maxRecords"><%
if (sub.getMaxEntities() != null) {
- sub.getMaxEntities().toString();
+ out.write(sub.getMaxEntities().toString());
}
%></div>
<div style="float:left"><%=ResourceLoader.GetResource(session, "items.subscriptionbrief")%>
@@ -342,6 +342,35 @@
</div>
<a class="btn btn-primary" href="javascript:saveSubscription();"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
+ <% if (!newitem){%>
+ <a class="btn " href="javascript:ViewAsXML();"><i class="icon-screenshot icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
+ <div class="modal hide fade container" id="viewAsXml">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h3><%=ResourceLoader.GetResource(session, "actions.asxml")%> </h3>
+ </div>
+
+ <div class="modal-body" id="viewAsXmlContent">
+
+
+ </div>
+ <div class="modal-footer">
+ <a href="ajax/toXML.jsp?id=<%=URLEncoder.encode(sub.getSubscriptionKey(), "UTF-8")%>&type=subscription" class="btn btn-primary" target="_blank">Popout</a>
+ <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+ </div>
+ </div>
+ <script type="text/javascript">
+ function ViewAsXML()
+ {
+ $.get("ajax/toXML.jsp?id=<%=URLEncoder.encode(sub.getSubscriptionKey(), "UTF-8")%>&type=subscription", function(data) {
+ window.console && console.log('asXml success');
+ $("#viewAsXmlContent").html(safe_tags_replace(data));
+ $("#viewAsXml").modal('show');
+ });
+
+ }
+ </script>
+ <% }%>
</div>
</div>
@@ -373,7 +402,7 @@
</div>
<div class="modal-footer">
- <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+ <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a> |
<a href="javascript:assertionSuccess();" class="btn btn-primary" ><%=ResourceLoader.GetResource(session, "actions.select")%></a>
<script type="text/javascript">
function assertionSuccess()
Modified: juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Sat Feb 8 18:42:45 2014
@@ -96,8 +96,22 @@
<form id="uddiform">
<%@include file="csrf.jsp" %>
<input type="hidden" name="nonce" id="nonce" value="<%=StringEscapeUtils.escapeHtml((String) session.getAttribute("nonce"))%>" />
- <div class="alert" style="display:none; position: fixed; top:45px; width:80%; left: 10%; z-index: 1000; opacity: 1.0; background-color: #FFD530; color:black " id="resultBar">
+
+
+ <div class="modal hide fade container" id="alert">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h3><%=ResourceLoader.GetResource(session, "actions.result")%></h3>
+ </div>
+ <div class="modal-body">
+ <div id="alert_results"><i class="icon-2x icon-thumbs-up"></i></div>
+ </div>
+ <div class="modal-footer">
+
+ <button type="button" class="close" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "modal.close")%></button>
+ </div>
</div>
+
<%
UddiHub hub = UddiHub.getInstance(application, session);
Cookie[] cs = request.getCookies();
@@ -228,9 +242,7 @@
<li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-question-sign icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
- <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.devguide")%></a></li>
- <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.api")%>"><%=ResourceLoader.GetResource(session, "navbar.help.api")%></a></li>
+ <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
<li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session, "navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session, "navbar.help.wiki")%></a></li>
<li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
<li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp Sat Feb 8 18:42:45 2014
@@ -13,7 +13,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@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>
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=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/businessEditor.js Sat Feb 8 18:42:45 2014
@@ -38,18 +38,16 @@ function deleteBusinessByID(id)
request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
$("#" + escapeJquerySelector(id)).remove();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
});
}
@@ -355,21 +353,21 @@ function deleteBusiness()
data: postbackdata
});
- request.done(function(msg) {
+request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ $("#" + escapeJquerySelector(id)).remove();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
});
+
}
@@ -411,20 +409,17 @@ function saveBusiness()
data: postbackdata
});
-
- request.done(function(msg) {
+ request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
+
}
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js Sat Feb 8 18:42:45 2014
@@ -314,18 +314,17 @@ function saveSubscription()
});
- request.done(function(msg) {
- window.console && console.log('postback done ' + url);
-
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+
});
request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus);
- $("#resultBar").show();
-
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
});
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/main.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/main.js?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/main.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/main.js Sat Feb 8 18:42:45 2014
@@ -157,7 +157,7 @@ function GetServiceDetails(svcid)
function hideAlert()
{
- $("#resultBar").hide();
+ $("#alert").modal('hide');
}
function closeXmlPop(modaldiv)
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=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/serviceEditor.js Sat Feb 8 18:42:45 2014
@@ -185,23 +185,19 @@ function saveService()
// processData: false,f
data: postbackdata
});
-
-
- request.done(function(msg) {
+ request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
+
}
function deleteService()
{
@@ -220,20 +216,16 @@ function deleteService()
// processData: false,f
data: postbackdata
});
-
- request.done(function(msg) {
+ request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/js/tmodeledit.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/tmodeledit.js?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/tmodeledit.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/tmodeledit.js Sat Feb 8 18:42:45 2014
@@ -102,22 +102,18 @@ function savetModel()
data: postbackdata
});
-
- request.done(function(msg) {
+ request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
function deletetModel()
@@ -139,19 +135,16 @@ function deletetModel()
data: postbackdata
});
- request.done(function(msg) {
+ request.done(function(msg) {
window.console && console.log('postback done ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
});
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus);
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/settings.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/settings.jsp Sat Feb 8 18:42:45 2014
@@ -188,21 +188,20 @@
});
- request.done(function(msg) {
- window.console && console.log('postback done ' + url);
+ request.done(function(msg) {
+ window.console && console.log('postback done ' + url);
+
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText);
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
}
</script>
Modified: juddi/trunk/juddi-gui/src/main/webapp/signer.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/signer.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/signer.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/signer.jsp Sat Feb 8 18:42:45 2014
@@ -58,8 +58,8 @@
request.done(function(msg) {
window.console && console.log('postback done ');
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
//TODO timer to auto redirect to the
window.setTimeout(function(){
<%
@@ -79,8 +79,8 @@
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ');
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus);
- $("#resultBar").show();
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' +jqXHR.responseText + textStatus);
+ $("#alert").modal();
});
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp Sat Feb 8 18:42:45 2014
@@ -131,9 +131,7 @@
request.done(function(msg) {
window.console && console.log('postback done ' + url);
- //$("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +
- // safe_tags_replace(msg));
- //$("#resultBar").show();
+
$("#transfercontent").html(UndoBreaks(safe_tags_replace(msg)));
$("#tranfermodal").modal("show");
@@ -141,9 +139,8 @@
request.fail(function(jqXHR, textStatus) {
window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + " " + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
});
}
@@ -182,20 +179,17 @@
request.done(function(msg) {
- window.console && console.log('postback done ' + url);
-
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
+ window.console && console.log('postback done ' + url);
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
-
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
@@ -235,20 +229,17 @@
request.done(function(msg) {
- window.console && console.log('postback done ' + url);
-
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
-
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' +jqXHR.responseText + " " + textStatus );
- //$(".alert").alert();
- $("#resultBar").show();
+ window.console && console.log('postback done ' + url);
- });
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
</script>
</div>
Modified: juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp?rev=1566091&r1=1566090&r2=1566091&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp Sat Feb 8 18:42:45 2014
@@ -139,20 +139,17 @@
request.done(function(msg) {
- window.console && console.log('postback done ' + url);
-
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + msg);
- $("#resultBar").show();
- $("#" + escapeJquerySelector(key)).remove();
-
- });
-
- request.fail(function(jqXHR, textStatus) {
- window.console && console.log('postback failed ' + url);
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus);
- $("#resultBar").show();
-
- });
+ window.console && console.log('postback done ' + url);
+
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-up"></i><br>' + msg);
+ $("#alert").modal();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ' + url);
+ $("#alert_results").html('<i class="icon-2x icon-thumbs-down"></i><br>' + jqXHR.responseText + textStatus);
+ $("#alert").modal();
+ });
}
</script>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org