Author: alexoree
Date: Sat Feb 8 17:38:57 2014
New Revision: 1566063
URL: http://svn.apache.org/r1566063
Log:
JUDDI-846 fixed (again)
Modified:
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.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
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=1566063&r1=1566062&r2=1566063&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 Feb 8 17:38:57 2014
@@ -740,12 +740,12 @@ public class Builders {
if (alertType.equalsIgnoreCase("specificItem")) {
sub = BuildClientSubscriptionSpecificItem(map,
outmsg, (String) session.getAttribute("locale"));
} else if
(alertType.equalsIgnoreCase("searchResults")) {
- sub =
BuildClientSubscriptionSearchResults(map, outmsg);
+ sub =
BuildClientSubscriptionSearchResults(map, outmsg, session);
} else {
outmsg.set(ResourceLoader.GetResource(session,
"errors.subscription.alerttypeinvalid"));
return null;
}
- if (sub == null) {
+ if (sub == null) {
return null;
}
@@ -819,17 +819,17 @@ public class Builders {
sub.getSubscriptionFilter().setGetAssertionStatusReport(new
GetAssertionStatusReport());
sub.getSubscriptionFilter().getGetAssertionStatusReport().setCompletionStatus(CompletionStatus.valueOf(((String[])
map.get("assertionStatus"))[0]));
} else if
(alertCritera.equalsIgnoreCase("relatedBusiness")) {
- outmsg.set("relatedBusiness is not
supported for single item subscriptions");
+
outmsg.set(ResourceLoader.GetResource(locale,
"errors.subscription.relatedbiz"));
return null;
} else if
(alertCritera.equalsIgnoreCase("tmodel")) {
sub.getSubscriptionFilter().setGetTModelDetail(new GetTModelDetail());
sub.getSubscriptionFilter().getGetTModelDetail().getTModelKey().addAll(keys);
} else {
- outmsg.set("alert critera invalid");
+
outmsg.set(ResourceLoader.GetResource(locale,
"errors.subscription.alertcriteriainvalid"));
return null;
}
} else {
- outmsg.set("alert critera not defined");
+ outmsg.set(ResourceLoader.GetResource(locale,
"errors.subscription.alertcriteriainvalid"));
return null;
}
return sub;
@@ -840,7 +840,7 @@ public class Builders {
}
}
- private static Subscription BuildClientSubscriptionSearchResults(Map
map, AtomicReference<String> outmsg) {
+ private static Subscription BuildClientSubscriptionSearchResults(Map
map, AtomicReference<String> outmsg, HttpSession session) {
try {
Subscription sub = new Subscription();
String alertCritera = ((String[])
map.get("alertCriteraMultipleItem"))[0];
@@ -885,11 +885,11 @@ public class Builders {
sub.getSubscriptionFilter().getFindTModel().setFindQualifiers(fq);
sub.getSubscriptionFilter().getFindTModel().setName(name);
} else {
- outmsg.set("alert critera invalid");
+
outmsg.set(ResourceLoader.GetResource(session,
"errors.subscription.alertcriteriainvalid"));
return null;
}
} else {
- outmsg.set("alert critera not defined");
+ outmsg.set(ResourceLoader.GetResource(session,
"errors.subscription.alertcriteriainvalid"));
return null;
}
return sub;
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=1566063&r1=1566062&r2=1566063&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 17:38:57 2014
@@ -404,4 +404,6 @@ error.nopassword=Please enter a password
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.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.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=1566063&r1=1566062&r2=1566063&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 17:38:57 2014
@@ -407,4 +407,6 @@ error.nopassword=Por favor, ingrese una
error.nousername=Por favor, introduzca un nombre de usuario
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.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.relatedbiz=Empresas relacionadas no se admite para las
suscripciones de un solo art\u00edculo.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
