Author: alexoree
Date: Fri Nov 8 00:02:03 2013
New Revision: 1539868
URL: http://svn.apache.org/r1539868
Log:
JUDDI-697 fixed, except for the date picker
Modified:
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/csrf.jsp
juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
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=1539868&r1=1539867&r2=1539868&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
Fri Nov 8 00:02:03 2013
@@ -83,9 +83,7 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
- if (sub.getSubscriptionKey() == null) {
- return "";
- }
+
if (sub.getSubscriptionFilter().getGetBindingDetail() != null &&
!sub.getSubscriptionFilter().getGetBindingDetail().getBindingKey().isEmpty()) {
return " active ";
}
@@ -96,9 +94,7 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
- if (sub.getSubscriptionKey() == null) {
- return "";
- }
+
if (sub.getSubscriptionFilter().getGetBusinessDetail() != null &&
!sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().isEmpty())
{
return " active ";
}
@@ -109,9 +105,6 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
- if (sub.getSubscriptionKey() == null) {
- return "";
- }
if (sub.getSubscriptionFilter().getGetServiceDetail() != null &&
!sub.getSubscriptionFilter().getGetServiceDetail().getServiceKey().isEmpty()) {
return " active ";
}
@@ -135,9 +128,7 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
- if (sub.getSubscriptionKey() == null) {
- return "";
- }
+
if (sub.getSubscriptionFilter().getGetAssertionStatusReport() != null
&&
sub.getSubscriptionFilter().getGetAssertionStatusReport().getCompletionStatus()
!= 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=1539868&r1=1539867&r2=1539868&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
Fri Nov 8 00:02:03 2013
@@ -306,7 +306,7 @@ pages.subscription.step3.direct.tooltip=
pages.subscription.step3.pickup=I'll pick them up
pages.subscription.step3.pickup.tooltip=Either via this website or from your
own software that periodically checks for updates
pages.subscription.step3.content=In order for a UDDI server to notify you of
updates asynchronously, you first have to define a business, with a service,
with a binding template that tells UDDI where to send the notification (Access
Point value). Some UDDI servers (such as Apache jUDDI) require you to also add
a tModel Instance defining the transport parameter, such as
-pages.subscription.step4=Step 4 - Options
+pages.subscription.step4=Step 4) Options
items.notificationinterval=Notification Interval (hh:mm:ss)
items.expiration=Expiration
items.subscriptionbrief=Brief Subscription
@@ -384,3 +384,7 @@ actions.add.subscription=Add a subscript
actions.add.subscription.desc=You can setup a subscription for this business
to automatically alert you when there is a change
actions.copy=Copy
pages.subscription.specificitem=A specific item
+words.explanation=Explanation
+items.maxrecords.callback.tooltip=This value must be a whole number greater
than 0. If left blank, the UDDI server should decide it for you.
+items.subscriptionbrief.tooltip=If checked, the UDDI server should only notify
you that something has changed, but not the contents of the change.
+navbar.login.required=Login Required
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=1539868&r1=1539867&r2=1539868&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
Fri Nov 8 00:02:03 2013
@@ -308,7 +308,7 @@ pages.subscription.step3.direct.tooltip=
pages.subscription.step3.pickup=Yo recoger\u00e9
pages.subscription.step3.pickup.tooltip=O a trav\u00e9s de este sitio web o de
su propio software que comprueba peri\u00f3dicamente si hay actualizaciones
pages.subscription.step3.content=Para que un servidor UDDI para notificarle de
cambios de forma as\u00edncrona, primero hay que definir un negocio con una
empresa, con una plantilla de enlace que dice UDDI donde enviar la
notificaci\u00f3n (valor del punto de acceso). Algunos servidores UDDI (como
Apache jUDDI) requieren que usted agregue tambi\u00e9n una instancia tModel
definir el par\u00e1metro de transporte, tales como
-pages.subscription.step4=Paso 4 - Opciones
+pages.subscription.step4=Paso 4) Opciones
items.notificationinterval=Notificaci\u00f3n Intervalo (hh: mm: ss)
items.expiration=Vencimiento
items.subscriptionbrief=Breve Suscripci\u00f3n
@@ -386,3 +386,7 @@ actions.add.subscription=Add a subscript
actions.add.subscription.desc=You can setup a subscription for this business
to automatically alert you when there is a change
actions.copy=Copie
pages.subscription.specificitem=Un elemento espec\u00edfico
+words.explanation=Explicaci\u00f3n
+items.maxrecords.callback.tooltip=Este valor debe ser un n\u00famero entero
mayor que 0. Si se deja en blanco, el servidor UDDI debe decidir por usted.
+items.subscriptionbrief.tooltip=Si se selecciona, el servidor UDDI s\u00f3lo
debe avisarle de que algo ha cambiado, pero no el contenido del cambio.
+navbar.login.required=Inicio de sesi\u00f3n necesario
Modified: juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp?rev=1539868&r1=1539867&r2=1539868&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/csrf.jsp Fri Nov 8 00:02:03 2013
@@ -53,7 +53,7 @@
// current = UUID.randomUUID();
//session.removeAttribute("nonce");
// session.setAttribute("nonce", current.toString());
- UddiHub.log.info( "CSRF Test passed.");
+ UddiHub.log.debug("CSRF Test passed.");
} else {
//mismatch, reject it
UddiHub.log.warn( "CSRF Test failed, session did not match
nonce guid." + request.getRemoteAddr() + request.getRemoteUser());
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=1539868&r1=1539867&r2=1539868&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp Fri Nov 8
00:02:03 2013
@@ -395,31 +395,32 @@
</div>
<div id="collapse4" class="accordion-body collapse">
<div class="accordion-inner">
- <div
style="float:left"><%=ResourceLoader.GetResource(session,
"items.maxrecords.callback")%>: </div>
+ <div
style="float:left"><%=ResourceLoader.GetResource(session,
"items.maxrecords.callback")%>
+ <a href="#" 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();
}
%></div>
- <div
style="float:left"><%=ResourceLoader.GetResource(session,
"items.subscriptionbrief")%>: </div>
+ <div
style="float:left"><%=ResourceLoader.GetResource(session,
"items.subscriptionbrief")%>
+ <a href="#" class="uddi_tooltips"
data-toggle="tooltip" data-container="body"
title="<%=ResourceLoader.GetResource(session,
"items.subscriptionbrief.tooltip")%>"><i class="icon-question-sign"></i></a>:
</div>
<div> <input type="checkbox" id="brief"
<%
out.write(sub.isBrief() ?
"checked" : "");
%> >
</div><br>
<%=ResourceLoader.GetResource(session,
"items.expiration")%>:
- <div id="datetimepicker2" class="input-append">
- <input data-format="MM/dd/yyyy HH:mm:ss PP"
type="text" value="<%
+ <div id="datetimepicker2" class="input-append
date">
+ <input data-format="MM/dd/yyyy
HH:mm:ss PP" type="text" value="<%
if (sub.getExpiresAfter() != null) {
Date d =
sub.getExpiresAfter().toGregorianCalendar().getTime();
DateFormat dateFormat = new
SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
String dateStr = dateFormat.format(d);
- //TODO DOES NOT WORK
if (dateStr != null) {
out.write(StringEscapeUtils.escapeHtml(dateStr));
}
}
- %>">
+ %>"></input>
<span class="add-on">
<i data-time-icon="icon-time"
data-date-icon="icon-calendar">
@@ -428,8 +429,10 @@
</div>
<script type="text/javascript">
$(document).ready(function() {
+ $('.uddi_tooltips').tooltip();
+
$('#datetimepicker2').datetimepicker({
- language: '<%=(String)
session.getAttribute("locale")%>',
+ language:
'<%=StringEscapeUtils.escapeJavaScript((String)session.getAttribute("locale"))%>',
pick12HourFormat: true
});
});
@@ -527,7 +530,6 @@
}
});
- alertCriteraMultipleItem
postbackdata.push({
name: "alertCriteraMultipleItem",
value: alertCriteraMultipleItem
@@ -649,7 +651,7 @@
%>
</select><br>
- Explanation:<br>
+ <%=ResourceLoader.GetResource(session, "words.explanation")%><br>
<ul>
<%
for (int i = 0; i < CompletionStatus.values().length; i++)
{
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=1539868&r1=1539867&r2=1539868&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Fri Nov 8 00:02:03
2013
@@ -114,11 +114,11 @@
<ul class="nav">
<li class="dropdown"><a href="home.jsp"
data-toggle="dropdown" class="dropdowb-town"><i class="icon-home
icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.home")%><b
class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="reginfo.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.mybiz")%></a></li>
- <li><a href="assertions.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.publisherassertions")%></a></li>
- <li><a href="transfer.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.transfer")%></a></li>
+ <li><i class="icon-signin"
title="<%=ResourceLoader.GetResource(session,
"navbar.login.required")%>"></i><a href="reginfo.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.mybiz")%></a></li>
+ <li><i class="icon-signin"
title="<%=ResourceLoader.GetResource(session,
"navbar.login.required")%>"></i><a href="assertions.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.publisherassertions")%></a></li>
+ <li><i class="icon-signin"
title="<%=ResourceLoader.GetResource(session,
"navbar.login.required")%>"></i><a href="transfer.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.transfer.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.transfer")%></a></li>
<li class="divider"></li>
- <li><a href="viewSubscriptions.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.subscriptions.view")%></a></li>
+ <li><i class="icon-signin"
title="<%=ResourceLoader.GetResource(session,
"navbar.login.required")%>"></i><a href="viewSubscriptions.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.subscriptions.view")%></a></li>
<li><a href="editSubscription.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.subscriptions.create")%></a></li>
<li><a href="subscriptionFeed.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.subscriptions.feed.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.subscriptions.feed")%></a></li>
</ul>
@@ -147,6 +147,7 @@
<li><a href="importFromWadl.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.serviceimport.tooltip.wadl")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.serviceimport.wadl")%></a></li>
<li><a href="tmodelEditor.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.tmodel")%></a></li>
<li><a href="tmodelPartitions.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session,
"navbar.create.tmodelkeygen")%></a></li>
+ <li><a href="editSubscription.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session,
"nnavbar.subscriptions")%></a></li>
<li><a href="advanced.jsp"
title="<%=ResourceLoader.GetResource(session,
"navbar.advanced")%>"><%=ResourceLoader.GetResource(session,
"navbar.advanced")%></a></li>
</ul>
</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
