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 2013/11/23 18:43:30 UTC
svn commit: r1544843 [2/2] - 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/js/
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java?rev=1544843&r1=1544842&r2=1544843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java Sat Nov 23 17:43:30 2013
@@ -38,7 +38,9 @@ import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionFilter;
/**
- * This class provides functions for building UDDI entities from Http request parameters
+ * This class provides functions for building UDDI entities from Http request
+ * parameters
+ *
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class Builders {
@@ -107,10 +109,11 @@ public class Builders {
/**
* overview docs
+ *
* @param map
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static List<OverviewDoc> BuildOverviewDocs(Map map, String prefix, String cte, String locale) {
List<OverviewDoc> ret = new ArrayList<OverviewDoc>();
@@ -129,7 +132,7 @@ public class Builders {
pn.getOverviewURL().setValue(t[0]);
t = (String[]) map.get(prefix + index + PostBackConstants.TYPE);
pn.getOverviewURL().setUseType(t[0]);
- pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION, cte,locale));
+ pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION, cte, locale));
ret.add(pn);
processedIndexes.add(index);
}
@@ -142,9 +145,10 @@ public class Builders {
/**
* phone numbers
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static List<Phone> BuildPhone(Map map, String prefix, String locale) {
List<Phone> ret = new ArrayList();
@@ -174,10 +178,11 @@ public class Builders {
/**
* builds a contact
+ *
* @param m
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static Contact BuildSingleContact(Map m, String prefix, String cte, String locale) {
Contact c = new Contact();
@@ -193,10 +198,11 @@ public class Builders {
/**
* name elements
+ *
* @param map
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static List<Name> BuildNames(Map map, String prefix, String cte, String locale) {
List<Name> ret = new ArrayList();
@@ -230,9 +236,10 @@ public class Builders {
/**
* builds a compelte category bag
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static CategoryBag BuildCatBag(Map map, String prefix, String locale) {
CategoryBag ret = new CategoryBag();
@@ -261,13 +268,14 @@ public class Builders {
}
return ret;
}
-
-/**
- * identifier bag
- * @param map
- * @param prefix
- * @return
- */
+
+ /**
+ * identifier bag
+ *
+ * @param map
+ * @param prefix
+ * @return
+ */
public static IdentifierBag BuildIdentBag(Map map, String prefix, String locale) {
IdentifierBag ret = new IdentifierBag();
ret.getKeyedReference().addAll(BuildKeyedReference(map, prefix, locale));
@@ -276,12 +284,14 @@ public class Builders {
}
return ret;
}
-/**
- * discovery urls
- * @param map
- * @param prefix
- * @return
- */
+
+ /**
+ * discovery urls
+ *
+ * @param map
+ * @param prefix
+ * @return
+ */
public static DiscoveryURLs BuildDisco(Map map, String prefix, String locale) {
DiscoveryURLs list = new DiscoveryURLs();
Iterator it = map.keySet().iterator();
@@ -313,10 +323,11 @@ public class Builders {
/**
* addresses
+ *
* @param map
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static List<Address> BuildAddress(Map map, String prefix, String cte, String locale) {
List<Address> ret = new ArrayList();
@@ -367,9 +378,10 @@ public class Builders {
/**
* keyed reference group
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static List<KeyedReferenceGroup> BuildKeyedReferenceGroup(Map map, String prefix, String locale) {
List<KeyedReferenceGroup> ret = new ArrayList<KeyedReferenceGroup>();
@@ -433,9 +445,10 @@ public class Builders {
/**
* email
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static List<Email> BuildEmail(Map map, String prefix, String locale) {
List<Email> list = new ArrayList<Email>();
@@ -465,10 +478,11 @@ public class Builders {
/**
* description
+ *
* @param map
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static List<Description> BuildDescription(Map map, String prefix, String cte, String locale) {
List<Description> ret = new ArrayList();
@@ -502,9 +516,10 @@ public class Builders {
/**
* keyed references
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static List<KeyedReference> BuildKeyedReference(Map map, String prefix, String locale) {
List<KeyedReference> ret = new ArrayList<KeyedReference>();
@@ -538,9 +553,10 @@ public class Builders {
/**
* address lines
+ *
* @param map
* @param prefix
- * @return
+ * @return
*/
public static List<AddressLine> BuildAddressLine(Map map, String prefix, String locale) {
List<AddressLine> ret = new ArrayList();
@@ -572,10 +588,11 @@ public class Builders {
/**
* binding templates
+ *
* @param map
* @param prefix
* @param cte
- * @return
+ * @return
*/
public static List<BindingTemplate> BuildBindingTemplates(Map map, String prefix, String cte, String locale) {
List<BindingTemplate> ret = new ArrayList();
@@ -651,7 +668,7 @@ public class Builders {
tmi.setInstanceDetails(BuildInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.INSTANCE), prefix + index + PostBackConstants.INSTANCE, cte, locale));
- tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION, cte,locale));
+ tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION, cte, locale));
ret.getTModelInstanceInfo().add(tmi);
processedIndexes.add(index);
@@ -695,10 +712,11 @@ public class Builders {
/**
* client subscription api
+ *
* @param map
* @param outmsg
* @param session
- * @return
+ * @return
*/
public static Subscription BuildClientSubscription(Map map, AtomicReference<String> outmsg, HttpSession session) {
Subscription sub = new Subscription();
@@ -713,7 +731,7 @@ public class Builders {
return null;
}
if (alertType.equalsIgnoreCase("specificItem")) {
- sub = BuildClientSubscriptionSpecificItem(map, outmsg, (String)session.getAttribute("locale"));
+ sub = BuildClientSubscriptionSpecificItem(map, outmsg, (String) session.getAttribute("locale"));
} else if (alertType.equalsIgnoreCase("searchResults")) {
sub = BuildClientSubscriptionSearchResults(map, outmsg);
} else {
@@ -895,13 +913,15 @@ public class Builders {
try {
DatatypeFactory df = DatatypeFactory.newInstance();
DateFormat dformat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
- Date parsed = dformat.parse(((String[]) map.get("expires"))[0]);
-
- GregorianCalendar gcal = new GregorianCalendar();
- gcal.setTime(parsed);
- sub.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+ String ds = (String) map.get("expires");
+ if (ds != null && ds.trim().length() != 0 && !ds.equals("\"\"")) {
+ Date parsed = dformat.parse(((String[]) map.get("expires"))[0]);
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTime(parsed);
+ sub.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+ }
} catch (Exception ex) {
- UddiHub.log.warn("Unexpected parsing error ", ex);
+ UddiHub.log.debug("Unexpected parsing expires error "+ex.getMessage());
}
@@ -914,7 +934,7 @@ public class Builders {
gcal.setTime(parsed);
sub.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
} catch (Exception ex) {
- UddiHub.log.warn("Unexpected parsing error ", ex);
+ UddiHub.log.debug("Unexpected parsing expires error "+ ex.getMessage());
}
try {
@@ -930,7 +950,23 @@ public class Builders {
sub.setNotificationInterval(df.newDuration(durationInMilliSeconds));
} catch (Exception ex) {
- UddiHub.log.warn("Unexpected parsing error ", ex);
+ UddiHub.log.debug("Unexpected parsing interval error "+ ex.getMessage());
+ }
+
+ try {
+ long durationInMilliSeconds = 0;
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ String interval = (String) map.get("interval");
+ String[] tokens = interval.split(":");
+ durationInMilliSeconds += Integer.parseInt(tokens[0]) * 60 * 60 * 1000;
+ durationInMilliSeconds += Integer.parseInt(tokens[1]) * 60 * 1000;
+ durationInMilliSeconds += Integer.parseInt(tokens[2]) * 1000;
+
+
+ sub.setNotificationInterval(df.newDuration(durationInMilliSeconds));
+
+ } catch (Exception ex) {
+ UddiHub.log.debug("Unexpected parsing interval error "+ ex.getMessage());
}
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=1544843&r1=1544842&r2=1544843&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 Nov 23 17:43:30 2013
@@ -7,6 +7,7 @@ package org.apache.juddi.webconsole.hub.
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.juddi.webconsole.resources.ResourceLoader;
+import org.uddi.api_v3.FindQualifiers;
import org.uddi.sub_v3.Subscription;
/**
@@ -16,6 +17,85 @@ import org.uddi.sub_v3.Subscription;
*/
public class SubscriptionHelper {
+ /**
+ * returns
+ *
+ * @param sub
+ * @param key
+ * @return
+ */
+ public static String containsFindQualifier(Subscription sub, String key) {
+ if (sub == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter().getFindBinding() != null) {
+ return contains(sub.getSubscriptionFilter().getFindBinding().getFindQualifiers(), key);
+ }
+ if (sub.getSubscriptionFilter().getFindBusiness() != null) {
+ return contains(sub.getSubscriptionFilter().getFindBusiness().getFindQualifiers(), key);
+ }
+ if (sub.getSubscriptionFilter().getFindRelatedBusinesses() != null) {
+ return contains(sub.getSubscriptionFilter().getFindRelatedBusinesses().getFindQualifiers(), key);
+ }
+ if (sub.getSubscriptionFilter().getFindService() != null) {
+ return contains(sub.getSubscriptionFilter().getFindService().getFindQualifiers(), key);
+ }
+ if (sub.getSubscriptionFilter().getFindTModel() != null) {
+ return contains(sub.getSubscriptionFilter().getFindTModel().getFindQualifiers(), key);
+ }
+ return "";
+ }
+
+ public static String getSearchName(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter().getFindBinding() != null) {
+ return sub.getSubscriptionFilter().getFindBinding().getServiceKey();
+ }
+ if (sub.getSubscriptionFilter().getFindBusiness() != null) {
+ return Printers.ListNamesToString(sub.getSubscriptionFilter().getFindBusiness().getName());
+ }
+ if (sub.getSubscriptionFilter().getFindService() != null) {
+ return Printers.ListNamesToString(sub.getSubscriptionFilter().getFindService().getName());
+ }
+ if (sub.getSubscriptionFilter().getFindTModel() != null) {
+ return (sub.getSubscriptionFilter().getFindTModel().getName().getValue());
+ }
+ return "";
+ }
+
+ public static String getSearchLang(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter() == null) {
+ return "";
+ }
+ if (sub.getSubscriptionFilter().getFindBusiness() != null) {
+ if (!sub.getSubscriptionFilter().getFindBusiness().getName().isEmpty()) {
+ return sub.getSubscriptionFilter().getFindBusiness().getName().get(0).getLang();
+ }
+ }
+ if (sub.getSubscriptionFilter().getFindService() != null) {
+ if (!sub.getSubscriptionFilter().getFindService().getName().isEmpty()) {
+ return sub.getSubscriptionFilter().getFindService().getName().get(0).getLang();
+ }
+ }
+ if (sub.getSubscriptionFilter().getFindTModel() != null) {
+ if (sub.getSubscriptionFilter().getFindTModel().getName()!=null) {
+ return (sub.getSubscriptionFilter().getFindTModel().getName().getLang());
+ }
+ }
+ return "";
+ }
+
public static String getItemKeySpecific(Subscription sub) {
if (sub == null) {
return "";
@@ -94,7 +174,7 @@ public class SubscriptionHelper {
if (sub == null) {
return "";
}
-
+
if (sub.getSubscriptionFilter().getGetBusinessDetail() != null && !sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().isEmpty()) {
return " active ";
}
@@ -134,4 +214,71 @@ public class SubscriptionHelper {
}
return "";
}
+
+ public static String isFindBusiness(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+
+ if (sub.getSubscriptionFilter().getFindBusiness() != null) {
+ return " active ";
+ }
+ return "";
+ }
+
+ public static String isFindBinding(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+
+ if (sub.getSubscriptionFilter().getFindBinding() != null) {
+ return " active ";
+ }
+ return "";
+ }
+
+ public static String isFindRelatedBusinesses(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+
+ if (sub.getSubscriptionFilter().getFindRelatedBusinesses() != null) {
+ return " active ";
+ }
+ return "";
+ }
+
+ public static String isFindService(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+
+ if (sub.getSubscriptionFilter().getFindService() != null) {
+ return " active ";
+ }
+ return "";
+ }
+
+ public static String isFindTModel(Subscription sub) {
+ if (sub == null) {
+ return "";
+ }
+
+ if (sub.getSubscriptionFilter().getFindTModel() != null) {
+ return " active ";
+ }
+ return "";
+ }
+
+ private static String contains(FindQualifiers findQualifiers, String key) {
+ if (findQualifiers == null) {
+ return "";
+ }
+ for (int i = 0; i < findQualifiers.getFindQualifier().size(); i++) {
+ if (findQualifiers.getFindQualifier().get(i).equalsIgnoreCase(key)) {
+ return " checked ";
+ }
+ }
+ return "";
+ }
}
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=1544843&r1=1544842&r2=1544843&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 Nov 23 17:43:30 2013
@@ -37,7 +37,7 @@ navbar.create.tmodelkeygen=tModel Partit
navbar.subscriptions=Subscriptions
navbar.subscriptions.view=View Subscriptions
-navbar.subscriptions.create=Create Subscriptions
+navbar.subscriptions.create=Create Subscription
navbar.subscriptions.view.tooltip=View My Subscriptions
navbar.subscriptions.create.tooltip=Create a Subscription
@@ -174,7 +174,7 @@ pages.tmodelpart.content=TModel Key Gene
pages.tmodelpart.juddinote=For jUDDI implementations of UDDI, the "root" account cannot be used to create a keyGenerator.
pages.tmodelpart.key=The UDDI tModel key
pages.thmodepart.name=A name describing the key
-pages.viewsubscriptions.content=UDDI offers the ability for users to subscribe for notification to changes in most entities within a UDDI registry. However, the notification part is a bit strange. Users of strict UDDIv3 registries have only one option, periodically poll the UDDI registry for changes via the Subscription API. Although there's data types defined within the UDDI v3 specification, there's no API method for setting up a callback style of subscription, where the registry user hosts a web service that waits for notifications. In a callback subscription, those that need the information are notified immediately.<br><br>jUDDI based registries have an extension to the UDDIv3 specification that enables call back type of communication and is thus preferred mechanism.
+pages.viewsubscriptions.content=UDDI offers the ability for users to subscribe for notification to changes in most entities within a UDDI registry. However, the notification part is a bit strange. Users of strict UDDIv3 registries have only one option, periodically poll the UDDI registry for changes via the Subscription API. Although there's data types defined within the UDDI v3 specification, there's no API method for setting up a callback style of subscription, where the registry user hosts a web service that waits for notifications. In a callback subscription, those that need the information are notified immediately.
pages.serviceeditor.title=Service Editor
errors.generic=Error
pages.businesseditor.businesslist=Business Services
@@ -391,3 +391,7 @@ navbar.login.required=Login Required
pages.settings.debuginfo=Debugging Information
items.settings.add=Add a new setting
items.settings.note=Note: the key must start with either
+pages.subscription.aboutkeys=About Subscription Keys: You can optionally specify a subscription key. If you do, it must follow the rules for UDDI keys (uniqueness, prefixes, tModel Partitions, etc). If you do not define one, the UDDI server should generate one for you.
+errors.subscriptionfeed.nosubs=No subscriptions are defined.
+items.maxitems=Maximum Items
+items.deliverymech=Delivery Mechanism
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=1544843&r1=1544842&r2=1544843&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 Nov 23 17:43:30 2013
@@ -40,7 +40,7 @@ navbar.create.tmodelkeygen=tModel Partit
navbar.subscriptions=Suscripciones
navbar.subscriptions.view=Ver Suscripciones
-navbar.subscriptions.create=Crear Suscripciones
+navbar.subscriptions.create=Crear Suscripcion
navbar.subscriptions.view.tooltip=Ver Mis Suscripciones
navbar.subscriptions.create.tooltip=Crear una suscripci\u00f3n
@@ -176,7 +176,7 @@ pages.tmodelpart.content=Generadores TMo
pages.tmodelpart.juddinote=Para implementaciones jUDDI de UDDI, la cuenta "root" no se puede utilizar para crear un keygenerator.
pages.tmodelpart.key=El tModel UDDI clave
pages.thmodepart.name=Un nombre de describir la tecla
-pages.viewsubscriptions.content=UDDI ofrece la posibilidad a los usuarios a suscribirse para la notificaci\u00f3n de los cambios en la mayor\u00eda de las entidades en un registro UDDI. Sin embargo, la parte de notificaci\u00f3n es un poco extra\u00f1o. Los usuarios de los estrictos UDDIv3 registros tienen una sola opci\u00f3n, sondean peri\u00f3dicamente el registro UDDI para los cambios a trav\u00e9s de la API de Suscripci\u00f3n. Aunque hay tipos de datos definidos en la especificaci\u00f3n UDDI v3, no hay m\u00e9todo de la API para la creaci\u00f3n de un estilo de devoluci\u00f3n de llamada de suscripci\u00f3n, donde el usuario recibe un registro de servicios web que espera para las notificaciones. En una suscripci\u00f3n de devoluci\u00f3n de llamada, los que necesitan la informaci\u00f3n se notificar\u00e1 de inmediato. <br> <br> Registros basados \u200b\u200bjUDDI tener una extensi\u00f3n de la especificaci\u00f3n UDDIv3 que permite llamar de nuevo tipo de comunicaci\u00f3n y
por lo tanto mecanismo preferido.
+pages.viewsubscriptions.content=UDDI ofrece la posibilidad a los usuarios a suscribirse para la notificaci\u00f3n de los cambios en la mayor\u00eda de las entidades en un registro UDDI. Sin embargo, la parte de notificaci\u00f3n es un poco extra\u00f1o. Los usuarios de los estrictos UDDIv3 registros tienen una sola opci\u00f3n, sondean peri\u00f3dicamente el registro UDDI para los cambios a trav\u00e9s de la API de Suscripci\u00f3n. Aunque hay tipos de datos definidos en la especificaci\u00f3n UDDI v3, no hay m\u00e9todo de la API para la creaci\u00f3n de un estilo de devoluci\u00f3n de llamada de suscripci\u00f3n, donde el usuario recibe un registro de servicios web que espera para las notificaciones. En una suscripci\u00f3n de devoluci\u00f3n de llamada, los que necesitan la informaci\u00f3n se notificar\u00e1 de inmediato.
pages.serviceeditor.title=Servicio Editor
errors.generic=Error
pages.businesseditor.businesslist=Servicios Empresariales
@@ -393,3 +393,7 @@ navbar.login.required=Inicio de sesi\u00
pages.settings.debuginfo=Depuraci\u00f3n de Informaci\u00f3n
items.settings.add=A\u00f1adir un nuevo ajuste
items.settings.note=Nota: la clave debe empezar con
+pages.subscription.aboutkeys=Acerca de suscripci\u00f3n Claves: Opcionalmente, puede especificar una clave de suscripci\u00f3n. Si lo hace, debe seguir las reglas de teclas UDDI (singularidad, prefijos tModel particiones, etc.) Si no se define uno, el servidor UDDI debe generar una para ti.
+errors.subscriptionfeed.nosubs=No hay suscripciones se definen.
+items.maxitems=n\u00famero m\u00e1ximo de elementos
+items.deliverymech=Mecanismo de entrega
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=1544843&r1=1544842&r2=1544843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp Sat Nov 23 17:43:30 2013
@@ -45,7 +45,6 @@
<h1><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%></h1>
</div>
<%
- //TODO i18n
//TODO use this page as a subscription editor
Subscription sub = null;
boolean newitem = false;
@@ -115,31 +114,6 @@
</div>
</div>
<script type="text/javascript">
- function toggleType1(firstLoad)
- {
- //window.console && console.log('hi ' + $("#btn-specificitem").hasClass("active"));
- setTimeout(function() {
- if ($("#btn-specificitem").hasClass("active"))
- {
- $("#basedonresults").hide();
- $("#specific").show();
- }
- else
- {
- $("#basedonresults").show();
- $("#specific").hide();
- }
- if (firstLoad != true) {
- $('#collapseOne').collapse('hide');
- $('#collapseTwo').collapse('show');
- }
- }, 100);
-
- return false;
- }
- $(document).ready(function() {
- toggleType1(true);
- });
</script>
</div>
@@ -154,7 +128,7 @@
</div>
<div id="collapseTwo" class="accordion-body collapse">
<div class="accordion-inner">
- <div id="specific">
+ <div id="specific" class="<%=SubscriptionHelper.isSpecificItem(sub) ? "" : "hide"%>">
<%=ResourceLoader.GetResource(session, "pages.subscription.specificitem")%>:<Br>
<div class="btn-group" id="alertCriteraSingleItem" data-toggle="buttons-radio">
<button onclick="javascript:clearbox();
@@ -171,96 +145,11 @@
<div id="keylistcontainer">
<a href="javascript:additem();" class="btn" ><%=ResourceLoader.GetResource(session, "actions.add")%></a>
<a href="javascript:removeitem();" class="btn" ><%=ResourceLoader.GetResource(session, "actions.remove")%></a>
- <select id="keylist" size="5" style="width:100%">
+ <select id="keylist" size="5" style="width:300px; height: 70px">
<%=SubscriptionHelper.getItemKeySpecific(sub)%>
</select>
</div>
- <script type="text/javascript">
- $("#pubassertcontainer").hide();
- $("#keylist").resizable();
- <%
- if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).equals("")) {
- out.write("publisherAssertionPicker();");
- }
- %>
- function publisherAssertionPicker()
- {
- $("#keylistcontainer").hide();
- $("#pubassertcontainer").show();
- selectPublisherAssertionStatus();
- }
- function clearbox()
- {
- $("#keylist option").remove();
- $("#keylistcontainer").show();
- $("#pubassertcontainer").hide();
- return false;
- }
- function additem()
- {
- var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
- if (alertCriteraSingleItem === "binding")
- {
- reloadBindingModal();
- $.dialogBinding.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++)
- if ($("#keylist option[value='" + result[i] + "']").length == 0)
- $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
- }
- });
- }
- if (alertCriteraSingleItem === "business") {
- reloadBusinessModal();
- $.dialogBusiness.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++)
- if ($("#keylist option[value='" + result[i] + "']").length == 0)
- $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
- }
- });
- }
- if (alertCriteraSingleItem === "service") {
- reloadServiceModal();
-
- $.dialogService.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++)
- if ($("#keylist option[value='" + result[i] + "']").length == 0)
- $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
- }
- });
-
- }
- if (alertCriteraSingleItem === "tmodel") {
- reloadTmodelModal();
- $.dialogTmodel.confirm({
- callback: function(success, result) {
- if (success)
- {
- for (var i = 0; i < result.length; i++)
- if ($("#keylist option[value='" + result[i] + "']").length === 0)
- $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
- }
- }
- });
- }
- }
- function removeitem()
- {
- $("#keylist option:selected").remove();
- }
- </script>
<div id="pubassertcontainer" class="">
<div style="float:left"><%=ResourceLoader.GetResource(session, "items.key")%>: </div>
<div class="" id="itemKey"><%
@@ -270,59 +159,56 @@
%></div>
</div>
</div>
- <div id="basedonresults">
+ <div id="basedonresults" class="<%=SubscriptionHelper.isSpecificItem(sub) ? "hide" : ""%>">
<%=ResourceLoader.GetResource(session, "search.results")%>:<br>
<div class="btn-group" id="alertCriteraMultipleItem" data-toggle="buttons-radio">
- <button onclick="return false;" class="btn" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
- <button onclick="return false;" class="btn" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
- <button onclick="return false;" class="btn" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
- <button onclick="return false;" class="btn" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
- <button onclick="return false;" class="btn" value="relatedBusiness"><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.relatedbusinesses")%></button>
+ <button onclick="return false;" class="btn <%=SubscriptionHelper.isFindBinding(sub)%>" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
+ <button onclick="return false;" class="btn <%=SubscriptionHelper.isFindBusiness(sub)%>" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
+ <button onclick="return false;" class="btn <%=SubscriptionHelper.isFindService(sub)%>" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
+ <button onclick="return false;" class="btn <%=SubscriptionHelper.isFindTModel(sub)%>" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
+ <button onclick="return false;" class="btn <%=SubscriptionHelper.isFindRelatedBusinesses(sub)%>" value="relatedBusiness"><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.relatedbusinesses")%></button>
</div>
<br><br>
<%=ResourceLoader.GetResource(session, "items.findqualifiers")%><br>
<table class="table">
<tr>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.AND_ALL_KEYS%>" value="<%=UDDIConstants.AND_ALL_KEYS%>"> <%=UDDIConstants.AND_ALL_KEYS%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.APPROXIMATE_MATCH%>" value="<%=UDDIConstants.APPROXIMATE_MATCH%>"> <%=UDDIConstants.APPROXIMATE_MATCH%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.BINARY_SORT%>" value="<%=UDDIConstants.BINARY_SORT%>"> <%=UDDIConstants.BINARY_SORT%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.BINDING_SUBSET%>" value="<%=UDDIConstants.BINDING_SUBSET%>"> <%=UDDIConstants.BINDING_SUBSET%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_INSENSITIVE_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.AND_ALL_KEYS)%> name="<%=UDDIConstants.AND_ALL_KEYS%>" value="<%=UDDIConstants.AND_ALL_KEYS%>"> <%=UDDIConstants.AND_ALL_KEYS%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.APPROXIMATE_MATCH)%> name="<%=UDDIConstants.APPROXIMATE_MATCH%>" value="<%=UDDIConstants.APPROXIMATE_MATCH%>"> <%=UDDIConstants.APPROXIMATE_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.BINARY_SORT)%> name="<%=UDDIConstants.BINARY_SORT%>" value="<%=UDDIConstants.BINARY_SORT%>"> <%=UDDIConstants.BINARY_SORT%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.BINDING_SUBSET)%> name="<%=UDDIConstants.BINDING_SUBSET%>" value="<%=UDDIConstants.BINDING_SUBSET%>"> <%=UDDIConstants.BINDING_SUBSET%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.CASE_INSENSITIVE_MATCH)%> name="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_INSENSITIVE_MATCH%></td>
</tr>
<tr>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>"> <%=UDDIConstants.CASE_INSENSITIVE_SORT%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_SENSITIVE_MATCH%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_SENSITIVE_SORT%>"> <%=UDDIConstants.CASE_SENSITIVE_SORT%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>" value="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>"> <%=UDDIConstants.COMBINE_CATEGORY_BAGS%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.CASE_INSENSITIVE_SORT)%> name="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>"> <%=UDDIConstants.CASE_INSENSITIVE_SORT%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.CASE_SENSITIVE_MATCH)%> name="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_SENSITIVE_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.CASE_SENSITIVE_SORT)%> name="<%=UDDIConstants.CASE_SENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_SENSITIVE_SORT%>"> <%=UDDIConstants.CASE_SENSITIVE_SORT%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.COMBINE_CATEGORY_BAGS)%> name="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>" value="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>"> <%=UDDIConstants.COMBINE_CATEGORY_BAGS%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.DIACRITIC_INSENSITIVE_MATCH)%> name="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%></td>
</tr>
<tr>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.EXACT_MATCH%>" value="<%=UDDIConstants.EXACT_MATCH%>"> <%=UDDIConstants.EXACT_MATCH%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.OR_ALL_KEYS%>" value="<%=UDDIConstants.OR_ALL_KEYS%>"> <%=UDDIConstants.OR_ALL_KEYS%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.OR_LIKE_KEYS%>" value="<%=UDDIConstants.OR_LIKE_KEYS%>"> <%=UDDIConstants.OR_LIKE_KEYS%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SERVICE_SUBSET%>" value="<%=UDDIConstants.SERVICE_SUBSET%>"> <%=UDDIConstants.SERVICE_SUBSET%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.DIACRITIC_SENSITIVE_MATCH)%> name="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.EXACT_MATCH)%> name="<%=UDDIConstants.EXACT_MATCH%>" value="<%=UDDIConstants.EXACT_MATCH%>"> <%=UDDIConstants.EXACT_MATCH%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.OR_ALL_KEYS)%> name="<%=UDDIConstants.OR_ALL_KEYS%>" value="<%=UDDIConstants.OR_ALL_KEYS%>"> <%=UDDIConstants.OR_ALL_KEYS%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.OR_LIKE_KEYS)%> name="<%=UDDIConstants.OR_LIKE_KEYS%>" value="<%=UDDIConstants.OR_LIKE_KEYS%>"> <%=UDDIConstants.OR_LIKE_KEYS%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SERVICE_SUBSET)%> name="<%=UDDIConstants.SERVICE_SUBSET%>" value="<%=UDDIConstants.SERVICE_SUBSET%>"> <%=UDDIConstants.SERVICE_SUBSET%></td>
</tr>
<tr>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SIGNATURE_PRESENT%>" value="<%=UDDIConstants.SIGNATURE_PRESENT%>"> <%=UDDIConstants.SIGNATURE_PRESENT%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_ASC%>" value="<%=UDDIConstants.SORT_BY_DATE_ASC%>"> <%=UDDIConstants.SORT_BY_DATE_ASC%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_DESC%>" value="<%=UDDIConstants.SORT_BY_DATE_DESC%>"> <%=UDDIConstants.SORT_BY_DATE_DESC%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_ASC%>" value="<%=UDDIConstants.SORT_BY_NAME_ASC%>"> <%=UDDIConstants.SORT_BY_NAME_ASC%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_DESC%>" value="<%=UDDIConstants.SORT_BY_NAME_DESC%>"> <%=UDDIConstants.SORT_BY_NAME_DESC%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SIGNATURE_PRESENT)%> name="<%=UDDIConstants.SIGNATURE_PRESENT%>" value="<%=UDDIConstants.SIGNATURE_PRESENT%>"> <%=UDDIConstants.SIGNATURE_PRESENT%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SORT_BY_DATE_ASC)%> name="<%=UDDIConstants.SORT_BY_DATE_ASC%>" value="<%=UDDIConstants.SORT_BY_DATE_ASC%>"> <%=UDDIConstants.SORT_BY_DATE_ASC%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SORT_BY_DATE_DESC)%> name="<%=UDDIConstants.SORT_BY_DATE_DESC%>" value="<%=UDDIConstants.SORT_BY_DATE_DESC%>"> <%=UDDIConstants.SORT_BY_DATE_DESC%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SORT_BY_NAME_ASC)%> name="<%=UDDIConstants.SORT_BY_NAME_ASC%>" value="<%=UDDIConstants.SORT_BY_NAME_ASC%>"> <%=UDDIConstants.SORT_BY_NAME_ASC%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SORT_BY_NAME_DESC)%> name="<%=UDDIConstants.SORT_BY_NAME_DESC%>" value="<%=UDDIConstants.SORT_BY_NAME_DESC%>"> <%=UDDIConstants.SORT_BY_NAME_DESC%></td>
</tr>
<tr>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>" value="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>"> <%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%></td>
- <td><input class="fq" type="checkbox" name="<%=UDDIConstants.UTS_10%>" value="<%=UDDIConstants.UTS_10%>"> <%=UDDIConstants.UTS_10%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.SUPPRESS_PROJECTED_SERVICES)%> name="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>" value="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>"> <%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%></td>
+ <td><input class="fq" type="checkbox" <%=SubscriptionHelper.containsFindQualifier(sub,UDDIConstants.UTS_10)%> name="<%=UDDIConstants.UTS_10%>" value="<%=UDDIConstants.UTS_10%>"> <%=UDDIConstants.UTS_10%></td>
</tr>
</table>
-
-
-
<div>
- <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.name")%>..." id="searchcontent">
- <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.lang")%>..." id="searchlang"><br></div>
+ <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.name")%>..." id="searchcontent" value="<%=StringEscapeUtils.escapeHtml(SubscriptionHelper.getSearchName(sub))%>">
+ <input type="text" placeholder="<%=ResourceLoader.GetResource(session, "items.lang")%>..." id="searchlang" value="<%=StringEscapeUtils.escapeHtml(SubscriptionHelper.getSearchLang(sub))%>"><br></div>
</div>
@@ -340,12 +226,12 @@
<div id="collapseThree" class="accordion-body collapse">
<div class="accordion-inner">
<div class="btn-group" id="alertTransport" data-toggle="buttons-radio">
- <button id="btn-bindingTemplate" onclick="return toggleTransport1();" value="bindingTemplate" class="btn <%=(sub.getBindingKey() == null ? "" : " active")%>"
+ <button id="btn-bindingTemplate" onclick="return toggleTransport1();" value="bindingTemplate" class="btn <%=((sub.getBindingKey() != null && sub.getBindingKey().trim().length()>0)? " active " : "")%>"
title="<%=ResourceLoader.GetResource(session, "pages.subscription.step3.direct.tooltip")%>"><%=ResourceLoader.GetResource(session, "pages.subscription.step3.direct")%></button>
- <button id="btn-manual" onclick="return toggleTransport1();" value="manual" class="btn <%=(sub.getBindingKey() == null ? " active " : "")%>"
+ <button id="btn-manual" onclick="return toggleTransport1();" value="manual" class="btn <%=((sub.getBindingKey() == null || sub.getBindingKey().trim().length()==0) ? " active " : "")%>"
title="<%=ResourceLoader.GetResource(session, "pages.subscription.step3.pickup.tooltip")%>"><%=ResourceLoader.GetResource(session, "pages.subscription.step3.pickup")%></button>
</div><br>
- <div class="" id="bindingKeyDiv">
+ <div class="<%=((sub.getBindingKey() != null && sub.getBindingKey().trim().length()>0) ? "" : " hide ")%>" id="bindingKeyDiv">
<%=ResourceLoader.GetResource(session, "pages.subscription.step3.content")%>
<b><%=UDDIConstants.TRANSPORT_HTTP%></b>.
<input type="text" id="bindingKey" placeholder="<%=ResourceLoader.GetResource(session, "items.bindingtemplate.key")%>" style="width:360px">
@@ -353,33 +239,7 @@
return false;" class="btn "><%=ResourceLoader.GetResource(session, "actions.select")%></button>
</div>
<script type="text/javascript">
- function selectPublisherAssertionStatus()
- {
- $("#assertionStatusChooser").modal('show');
- }
-
- function toggleTransport1()
- {
- //window.console && console.log('hi ' + $("#btn-specificitem").hasClass("active"));
- setTimeout(function() {
- if ($("#btn-manual").hasClass("active"))
- {
- $("#bindingKeyDiv").hide();
- //$("#specific").show();
- }
- else
- {
- $("#bindingKeyDiv").show();
- // $("#specific").hide();
- }
-
- }, 100);
-
- // $("#bindingKeyDiv").show();
- return false;
- }
- toggleTransport1();
</script>
</div>
</div>
@@ -412,7 +272,7 @@
</div><br>
<%=ResourceLoader.GetResource(session, "items.expiration")%>:
<div id="datetimepicker2" class="input-append date">
- <input data-format="MM/dd/yyyy HH:mm:ss PP" type="text" value="<%
+ <input data-format="MM/dd/yyyy HH:mm:ss PP" type="text" value="<%
if (sub.getExpiresAfter() != null && !newitem) {
Date d = sub.getExpiresAfter().toGregorianCalendar().getTime();
DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
@@ -431,9 +291,9 @@
<script type="text/javascript">
$(document).ready(function() {
$('.uddi_tooltips').tooltip();
-
+
$('#datetimepicker2').datetimepicker({
- language: '<%=StringEscapeUtils.escapeJavaScript((String)session.getAttribute("locale"))%>',
+ language: '<%=StringEscapeUtils.escapeJavaScript((String) session.getAttribute("locale"))%>',
pick12HourFormat: true
});
});
@@ -443,7 +303,7 @@
<div style=""><%=ResourceLoader.GetResource(session, "items.notificationinterval")%>: </div>
<div class="input-append bootstrap-timepicker">
- <input id="timepicker2" type="text" class="input-small" placeholder="Duration of time (hh:mm:ss)" value="<%
+ <input id="timepicker2" type="text" class="input-small" placeholder="(hh:mm:ss)" value="<%
if (sub.getNotificationInterval() != null) {
out.write(sub.getNotificationInterval().getHours() + ":"
+ sub.getNotificationInterval().getMinutes() + ":"
@@ -472,162 +332,13 @@
out.write(StringEscapeUtils.escapeHtml(sub.getSubscriptionKey()));
}
%> </div>
- About Subscription Keys: You can optionally specify a subscription key. If you do, it must follow the rules for UDDI keys (uniqueness, prefixes, tModel Partitions, etc).
- If you do not define one, the UDDI server should generate one for you.
+ <%=ResourceLoader.GetResource(session, "pages.subscription.aboutkeys")%>
</div>
</div>
</div>
-
-
- <script type="text/javascript">
- Reedit();
- $("#bindingKey").resizable();
- function saveSubscription()
- {
-
- var interval = $("#interval").val();
- var maxRecords = $("#maxRecords").val();
- var brief = $("#brief").val();
- var datetimepicker2 = $("#datetimepicker2").val();
-
- var subkey = $("#subkey").html();
-
- var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
- var alertTransport = $("#alertTransport > button.btn.active").val();
- var itemKey = $("#keylist option");
- var keys = "";
- var first = true;
- $.each(itemKey, function(idx, value) {
- if (first)
- keys = value.value;
- else
- keys = keys + "," + value.value;
- first = false;
- });
- var bindingKey = $("#bindingKey").val();
- var alertType = $("#alertType > button.btn.active").val();
-
- var alertCriteraMultipleItem = $("#alertCriteraMultipleItem > button.btn.active").val();
- var searchcontent = $("#searchcontent").val();
- var searchlang = $("#searchlang").val();
-
- var postbackdata = new Array();
- var url = 'ajax/subscription.jsp';
- itemKey = $("#itemKey").html();
-
- // var tqs = new Array();
- $.each($('.fq input:checkbox'), function(index, item) {
- var itemname = item.id;
- if (item.checked)
- {
- postbackdata.push({
- name: "findqualifier",
- value: itemname
- });
- }
- });
-
- postbackdata.push({
- name: "alertCriteraMultipleItem",
- value: alertCriteraMultipleItem
- });
- postbackdata.push({
- name: "searchcontent",
- value: searchcontent
- });
-
- postbackdata.push({
- name: "searchlang",
- value: searchlang
- });
-
-
- postbackdata.push({
- name: "subkey",
- value: subkey
- });
-
- postbackdata.push({
- name: "expires",
- value: datetimepicker2
- });
-
- postbackdata.push({
- name: "interval",
- value: interval
- });
-
- postbackdata.push({
- name: "brief",
- value: brief
- });
-
- postbackdata.push({
- name: "maxRecords",
- value: maxRecords
- });
-
-
- postbackdata.push({
- name: "alertType",
- value: alertType
- });
- postbackdata.push({
- name: "itemKey",
- value: keys
- });
-
- postbackdata.push({
- name: "assertionStatus",
- value: itemKey
- });
- postbackdata.push({
- name: "alertCriteraSingleItem",
- value: alertCriteraSingleItem
- });
- postbackdata.push({
- name: "bindingKey",
- value: bindingKey
- });
- postbackdata.push({
- name: "alertTransport",
- value: alertTransport
- });
- postbackdata.push({
- name: "nonce",
- value: $("#nonce").val()
- });
-
-
- var request = $.ajax({
- url: url,
- type: "POST",
- // dataType: "html",
- cache: false,
- // processData: false,f
- data: postbackdata
- });
-
-
- 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);
- $("#resultBar").show();
-
- });
- }
- </script>
</div>
<a class="btn btn-primary" href="javascript:saveSubscription();"><i class="icon-save icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.save")%></a>
@@ -675,6 +386,18 @@
</div>
+ <script type="text/javascript" src="js/editSubscription.js"></script>
+ <script type="text/javascript">
+
+ <%
+ if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).equals("")) {
+ out.write("publisherAssertionPicker();");
+ }
+ %>
+
+ </script>
+
+
<%@include file="tmodelChooser.jsp" %>
<%@include file="bindingChooser.jsp" %>
<%@include file="businessChooser.jsp" %>
Added: 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=1544843&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js (added)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/editSubscription.js Sat Nov 23 17:43:30 2013
@@ -0,0 +1,331 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+$(document).ready(function() {
+ toggleType1(true);
+ toggleTransport1();
+
+ Reedit();
+ $("#pubassertcontainer").hide();
+ $("#keylist").resizable();
+ $("#bindingKey").resizable();
+
+});
+
+function selectPublisherAssertionStatus()
+{
+ $("#assertionStatusChooser").modal('show');
+}
+
+function toggleTransport1()
+{
+ //window.console && console.log('hi ' + $("#btn-specificitem").hasClass("active"));
+ setTimeout(function() {
+ if ($("#btn-manual").hasClass("active"))
+ {
+ $("#bindingKeyDiv").hide();
+ //$("#specific").show();
+ }
+ else
+ {
+ $("#bindingKeyDiv").show();
+ // $("#specific").hide();
+ }
+
+ }, 100);
+
+
+ // $("#bindingKeyDiv").show();
+ return false;
+}
+
+
+function publisherAssertionPicker()
+{
+ $("#keylistcontainer").hide();
+ $("#pubassertcontainer").show();
+ selectPublisherAssertionStatus();
+}
+function clearbox()
+{
+ $("#keylist option").remove();
+ $("#keylistcontainer").show();
+ $("#pubassertcontainer").hide();
+ return false;
+}
+function additem()
+{
+ var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
+ if (alertCriteraSingleItem === "binding")
+ {
+ reloadBindingModal();
+ $.dialogBinding.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++)
+ if ($("#keylist option[value='" + result[i] + "']").length == 0)
+ $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+ }
+ });
+ }
+ if (alertCriteraSingleItem === "business") {
+ reloadBusinessModal();
+ $.dialogBusiness.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++)
+ if ($("#keylist option[value='" + result[i] + "']").length == 0)
+ $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+ }
+ });
+ }
+ if (alertCriteraSingleItem === "service") {
+ reloadServiceModal();
+
+ $.dialogService.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++)
+ if ($("#keylist option[value='" + result[i] + "']").length == 0)
+ $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+ }
+ });
+
+ }
+ if (alertCriteraSingleItem === "tmodel") {
+ reloadTmodelModal();
+ $.dialogTmodel.confirm({
+ callback: function(success, result) {
+ if (success)
+ {
+ for (var i = 0; i < result.length; i++)
+ if ($("#keylist option[value='" + result[i] + "']").length === 0)
+ $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+ }
+ }
+ });
+ }
+}
+function removeitem()
+{
+ $("#keylist option:selected").remove();
+}
+
+
+function toggleType1(firstLoad)
+{
+ //window.console && console.log('hi ' + $("#btn-specificitem").hasClass("active"));
+ setTimeout(function() {
+ if ($("#btn-specificitem").hasClass("active"))
+ {
+ $("#basedonresults").hide();
+ $("#specific").show();
+ }
+ else
+ {
+ $("#basedonresults").show();
+ $("#specific").hide();
+ }
+ if (firstLoad != true) {
+ $('#collapseOne').collapse('hide');
+ $('#collapseTwo').collapse('show');
+ }
+ }, 100);
+
+ return false;
+}
+
+
+
+
+function selectPublisherAssertionStatus()
+{
+ $("#assertionStatusChooser").modal('show');
+}
+
+function toggleTransport1()
+{
+ //window.console && console.log('hi ' + $("#btn-specificitem").hasClass("active"));
+ setTimeout(function() {
+ if ($("#btn-manual").hasClass("active"))
+ {
+ $("#bindingKeyDiv").hide();
+ //$("#specific").show();
+ }
+ else
+ {
+ $("#bindingKeyDiv").show();
+ // $("#specific").hide();
+ }
+
+ }, 100);
+
+
+ // $("#bindingKeyDiv").show();
+ return false;
+}
+
+
+function saveSubscription()
+{
+
+ var interval = $("#timepicker2").val();
+ var maxRecords = $("#maxRecords").val();
+ var brief = $("#brief").val();
+ var expires = $("#datetimepicker2").val();
+
+ // alert(interval + expires);
+ var subkey = $("#subkey").html();
+
+ var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
+ var alertTransport = $("#alertTransport > button.btn.active").val();
+ var itemKey = $("#keylist option");
+ var keys = "";
+ var first = true;
+ $.each(itemKey, function(idx, value) {
+ if (first)
+ keys = value.value;
+ else
+ keys = keys + "," + value.value;
+ first = false;
+ });
+ var bindingKey = $("#bindingKey").val();
+ var alertType = $("#alertType > button.btn.active").val();
+
+ var alertCriteraMultipleItem = $("#alertCriteraMultipleItem > button.btn.active").val();
+ var searchcontent = $("#searchcontent").val();
+ var searchlang = $("#searchlang").val();
+
+ var postbackdata = new Array();
+ var url = 'ajax/subscription.jsp';
+ itemKey = $("#itemKey").html();
+
+ // var tqs = new Array();
+ //$("div.edit").each(function()
+ $('.fq').each(function(index, item) {
+ var itemname = item.name;
+ if (item.checked)
+ {
+ postbackdata.push({
+ name: "findqualifier",
+ value: itemname
+ });
+ }
+ });
+
+ postbackdata.push({
+ name: "alertCriteraMultipleItem",
+ value: alertCriteraMultipleItem
+ });
+ postbackdata.push({
+ name: "searchcontent",
+ value: searchcontent
+ });
+
+ postbackdata.push({
+ name: "searchlang",
+ value: searchlang
+ });
+
+
+ postbackdata.push({
+ name: "subkey",
+ value: subkey
+ });
+
+ postbackdata.push({
+ name: "expires",
+ value: expires
+ });
+
+ postbackdata.push({
+ name: "interval",
+ value: interval
+ });
+
+ postbackdata.push({
+ name: "brief",
+ value: brief
+ });
+
+ postbackdata.push({
+ name: "maxRecords",
+ value: maxRecords
+ });
+
+
+ postbackdata.push({
+ name: "alertType",
+ value: alertType
+ });
+ postbackdata.push({
+ name: "itemKey",
+ value: keys
+ });
+
+ postbackdata.push({
+ name: "assertionStatus",
+ value: itemKey
+ });
+ postbackdata.push({
+ name: "alertCriteraSingleItem",
+ value: alertCriteraSingleItem
+ });
+ postbackdata.push({
+ name: "bindingKey",
+ value: bindingKey
+ });
+ postbackdata.push({
+ name: "alertTransport",
+ value: alertTransport
+ });
+ postbackdata.push({
+ name: "nonce",
+ value: $("#nonce").val()
+ });
+
+
+ var request = $.ajax({
+ url: url,
+ type: "POST",
+ // dataType: "html",
+ cache: false,
+ // processData: false,f
+ data: postbackdata
+ });
+
+
+ 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);
+ $("#resultBar").show();
+
+ });
+}
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=1544843&r1=1544842&r2=1544843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/viewSubscriptions.jsp Sat Nov 23 17:43:30 2013
@@ -22,6 +22,8 @@
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="org.apache.commons.lang.time.DurationFormatUtils"%>
<%@page import="java.util.List"%>
<%@page import="org.uddi.sub_v3.Subscription"%>
<%@page import="java.net.URLEncoder"%>
@@ -43,7 +45,9 @@
<p>
<%=ResourceLoader.GetResource(session, "pages.viewsubscriptions.content")%>
+
</p>
+ <a href="editSubscription.jsp"><i class="icon-large icon-plus-sign"></i> <%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a><br><br>
<%
UddiHub x = UddiHub.getInstance(application, session);
@@ -54,11 +58,14 @@
if (list != null) {
if (!list.isEmpty()) {
%>
+
<table class="table table-hover">
<tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th>
<th><%=ResourceLoader.GetResource(session, "items.expires")%></th>
- <th><%=ResourceLoader.GetResource(session, "items.bindingtemplate.key")%></th>
- <th><%=ResourceLoader.GetResource(session, "items.actions")%></th></tr>
+ <th><%=ResourceLoader.GetResource(session, "items.deliverymech")%></th>
+ <th><%=ResourceLoader.GetResource(session, "items.actions")%></th>
+ <th><%=ResourceLoader.GetResource(session, "items.maxitems")%></th>
+ <th><%=ResourceLoader.GetResource(session, "items.notificationinterval")%></th></tr>
<%
for (int i = 0; i < list.size(); i++) {
@@ -67,24 +74,32 @@
out.write("</td><td>");
out.write(StringEscapeUtils.escapeHtml(list.get(i).getExpiresAfter().toString()));
out.write("</td><td>");
- out.write(StringEscapeUtils.escapeHtml(list.get(i).getBindingKey()));
+ if (list.get(i).getBindingKey() == null || list.get(i).getBindingKey().trim().length() == 0) {
+ out.write(StringEscapeUtils.escapeHtml(ResourceLoader.GetResource(session, "pages.subscription.step3.pickup")));
+ } else {
+ out.write(StringEscapeUtils.escapeHtml(ResourceLoader.GetResource(session, "pages.subscription.step3.direct")));
+ }
out.write("</td><td>");
out.write("<a href=\"editSubscription.jsp?id=" + URLEncoder.encode(list.get(i).getSubscriptionKey(), "UTF8") + "\"><i class=\"icon-edit icon-2x\"></i></a> ");
out.write("<a href=\"javascript:deleteSub('" + StringEscapeUtils.escapeJavaScript(list.get(i).getSubscriptionKey()) + "');\"><i class=\"icon-trash icon-2x\"></i></a> ");
out.write("<a href=\"javascript:ViewAsXML('" + StringEscapeUtils.escapeJavaScript(list.get(i).getSubscriptionKey()) + "');\"><i class=\"icon-zoom-in icon-2x\"></i></a> ");
-
- out.write(list.get(i).getBindingKey());
+ out.write("</td><td>");
if (list.get(i).getMaxEntities() != null) {
out.write(list.get(i).getMaxEntities().toString());
}
+ out.write("</td><td>");
if (list.get(i).getNotificationInterval() != null) {
- out.write(list.get(i).getNotificationInterval().toString());
+ if (list.get(i).getNotificationInterval().getDays() > 0) {
+ out.write("> 24hr");
+ } else {
+ out.write(list.get(i).getNotificationInterval().getHours() + ":"
+ + list.get(i).getNotificationInterval().getMinutes() + ":"
+ + list.get(i).getNotificationInterval().getSeconds());
+ }
}
-//out.write(list.get(i).getSubscriptionFilter());
out.write("</td></tr>");
- // out.write("<tr><td colspan=\"3\"><div id=\"" + StringEscapeUtils.escapeHtml(list.get(i).getSubscriptionKey()) + "\"></div></td></tr>");
}
%>
</table>
@@ -99,44 +114,44 @@
function deleteSub(key)
{
var postbackdata = new Array();
- var url='ajax/subscription.jsp';
-
-
+ var url = 'ajax/subscription.jsp';
+
+
postbackdata.push({
- name:"nonce",
+ name: "nonce",
value: $("#nonce").val()
});
-
-
+
+
postbackdata.push({
- name:"DELETE",
+ name: "DELETE",
value: key
});
-
- var request= $.ajax({
+
+ var request = $.ajax({
url: url,
- type:"POST",
+ type: "POST",
// dataType: "html",
- cache: false,
+ cache: false,
// processData: false,f
data: postbackdata
});
-
-
+
+
request.done(function(msg) {
- window.console && console.log('postback done ' + url);
-
- $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + 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);
+ window.console && console.log('postback failed ' + url);
+ $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">×' + '</a>' + jqXHR.responseText + textStatus);
$("#resultBar").show();
-
+
});
}
</script>
@@ -159,17 +174,17 @@
</div>
</div>
<script type="text/javascript">
-
+
function ViewAsXML(id)
{
- $.get("ajax/toXML.jsp?id=" + id + "&type=subscription", function(data){
- window.console && console.log('asXml success');
-
+ $.get("ajax/toXML.jsp?id=" + id + "&type=subscription", function(data) {
+ window.console && console.log('asXml success');
+
$("#viewAsXmlContent").html(safe_tags_replace(data));
- $( "#viewAsXml" ).modal('show');
+ $("#viewAsXml").modal('show');
});
-
+
}
-
+
</script>
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org