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/04/24 00:19:36 UTC
svn commit: r1471182 [2/8] - in /juddi/branches/juddi-3.2.x: ./
juddi-core-openjpa/ juddi-core-openjpa/src/test/resources/ juddi-core/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/keygen/ juddi-core/src/ma...
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java Tue Apr 23 22:19:34 2013
@@ -21,12 +21,15 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.juddi.webconsole.PostBackConstants;
import org.apache.juddi.webconsole.hub.UddiHub;
import org.uddi.api_v3.*;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.SubscriptionFilter;
/**
*
@@ -150,7 +153,7 @@ public class Builders {
return ret;
}
- public static Contact BuildSingleContact(Map m, String prefix,String cte) {
+ public static Contact BuildSingleContact(Map m, String prefix, String cte) {
Contact c = new Contact();
String[] t = (String[]) m.get(prefix + PostBackConstants.TYPE);
c.setUseType(t[0]);
@@ -158,7 +161,7 @@ public class Builders {
c.getDescription().addAll(BuildDescription(MapFilter(m, prefix + PostBackConstants.DESCRIPTION), prefix + PostBackConstants.DESCRIPTION, cte));
c.getEmail().addAll(BuildEmail(MapFilter(m, prefix + PostBackConstants.EMAIL), prefix + PostBackConstants.EMAIL));
c.getPhone().addAll(BuildPhone(MapFilter(m, prefix + PostBackConstants.PHONE), prefix + PostBackConstants.PHONE));
- c.getAddress().addAll(BuildAddress(MapFilter(m, prefix + PostBackConstants.ADDRESS), prefix + PostBackConstants.ADDRESS,cte));
+ c.getAddress().addAll(BuildAddress(MapFilter(m, prefix + PostBackConstants.ADDRESS), prefix + PostBackConstants.ADDRESS, cte));
return c;
}
@@ -318,9 +321,13 @@ public class Builders {
if (!processedIndexes.contains(index)) {
KeyedReferenceGroup pn = new KeyedReferenceGroup();
String[] t = (String[]) map.get(prefix + index + PostBackConstants.VALUE);
- pn.setTModelKey(t[0]);
- pn.getKeyedReference().addAll(BuildKeyedReference(MapFilter(map, prefix + index + PostBackConstants.KEY_REF), prefix + index + PostBackConstants.KEY_REF));
- ret.add(pn);
+ if (t != null) {
+ pn.setTModelKey(t[0]);
+ pn.getKeyedReference().addAll(BuildKeyedReference(MapFilter(map, prefix + index + PostBackConstants.KEY_REF), prefix + index + PostBackConstants.KEY_REF));
+ ret.add(pn);
+ } else {
+ UddiHub.log.warn("Unexpected null from BuildKeyedReferenceGroup " + filteredkey + " " + prefix + " " + key);
+ }
processedIndexes.add(index);
}
} else {
@@ -430,12 +437,14 @@ public class Builders {
if (!processedIndexes.contains(index)) {
KeyedReference pn = new KeyedReference();
String[] t = (String[]) map.get(prefix + index + PostBackConstants.VALUE);
- pn.setTModelKey(t[0]);
- t = (String[]) map.get(prefix + index + PostBackConstants.KEYNAME);
- pn.setKeyName(t[0]);
- t = (String[]) map.get(prefix + index + PostBackConstants.KEYVALUE);
- pn.setKeyValue(t[0]);
- ret.add(pn);
+ if (t != null) {
+ pn.setTModelKey(t[0]);
+ t = (String[]) map.get(prefix + index + PostBackConstants.KEYNAME);
+ pn.setKeyName(t[0]);
+ t = (String[]) map.get(prefix + index + PostBackConstants.KEYVALUE);
+ pn.setKeyValue(t[0]);
+ ret.add(pn);
+ }
processedIndexes.add(index);
}
} else {
@@ -547,7 +556,7 @@ public class Builders {
tmi.setInstanceDetails(BuildInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.INSTANCE), prefix + index + PostBackConstants.INSTANCE, cte));
- tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION, cte));
+ tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION, cte));
ret.getTModelInstanceInfo().add(tmi);
processedIndexes.add(index);
@@ -588,4 +597,93 @@ public class Builders {
}
return ret;
}
+
+ public static Subscription BuildClientSubscription(Map map, AtomicReference<String> outmsg) {
+ Subscription sub = new Subscription();
+ if (outmsg == null) {
+ outmsg = new AtomicReference<String>();
+ }
+
+ String alertType = ((String[]) map.get("alertType"))[0];
+ if (alertType == null) {
+ outmsg.set("alertType not defined");
+ return null;
+ }
+ if (alertType.equalsIgnoreCase("specificItem")) {
+ sub = BuildClientSubscriptionSpecificItem(map, outmsg);
+ } else if (alertType.equalsIgnoreCase("searchResults")) {
+ sub = BuildClientSubscriptionSearchResults(map);
+ } else {
+ outmsg.set("alertType invalid");
+ return null;
+ }
+ if (sub == null) {
+ return null;
+ }
+
+ String alertTransport = ((String[]) map.get("alertTransport"))[0];
+ if (alertTransport == null) {
+
+ } else {
+ if (alertTransport.equalsIgnoreCase("bindingTemplate")) {
+ sub.setBindingKey(((String[]) map.get("bindingKey"))[0]);
+ } else {
+ sub.setBindingKey(null);
+ }
+ }
+ //options
+
+
+ return sub;
+ }
+
+ private static Subscription BuildClientSubscriptionSpecificItem(Map map, AtomicReference<String> outmsg) {
+ Subscription sub = new Subscription();
+ boolean ok = true;
+
+ String alertCritera = ((String[]) map.get("alertCriteraSingleItem"))[0];
+
+
+ String ItemKey = ((String[]) map.get("itemKey"))[0];
+ if (ItemKey == null) {
+ outmsg.set("no item defined");
+ return null;
+ }
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+
+ if (alertCritera != null) {
+ if (alertCritera.equalsIgnoreCase("service")) {
+ } else if (alertCritera.equalsIgnoreCase("binding")) {
+ sub.getSubscriptionFilter().setGetBindingDetail(new GetBindingDetail());
+ sub.getSubscriptionFilter().getGetBindingDetail().getBindingKey().add(ItemKey);
+ } else if (alertCritera.equalsIgnoreCase("service")) {
+ sub.getSubscriptionFilter().setGetServiceDetail(new GetServiceDetail());
+ sub.getSubscriptionFilter().getGetServiceDetail().getServiceKey().add(ItemKey);
+ } else if (alertCritera.equalsIgnoreCase("business")) {
+ sub.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(ItemKey);
+ } else if (alertCritera.equalsIgnoreCase("publisherAssertion")) {
+ //unknow if this will work
+ sub.getSubscriptionFilter().setGetAssertionStatusReport(new GetAssertionStatusReport());
+ sub.getSubscriptionFilter().getGetAssertionStatusReport();
+ } else if (alertCritera.equalsIgnoreCase("relatedBusiness")) {
+ outmsg.set("relatedBusiness is not supported for single item subscriptions");
+ return null;
+ } else if (alertCritera.equalsIgnoreCase("tmodel")) {
+ sub.getSubscriptionFilter().setGetTModelDetail(new GetTModelDetail());
+ sub.getSubscriptionFilter().getGetTModelDetail().getTModelKey().add(ItemKey);
+ } else {
+ outmsg.set("alert critera invalid");
+ return null;
+ }
+ } else {
+ outmsg.set("alert critera not defined");
+ return null;
+ }
+ return sub;
+ }
+
+ private static Subscription BuildClientSubscriptionSearchResults(Map map) {
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
}
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java Tue Apr 23 22:19:34 2013
@@ -17,11 +17,14 @@
package org.apache.juddi.webconsole.hub.builders;
import java.util.List;
+import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.juddi.webconsole.resources.ResourceLoader;
import org.uddi.api_v3.*;
/**
* Provides very basic UDDI spec to String formats, mostly used for debugging
+ *
* @author Alex O'Ree
*/
public class Printers {
@@ -46,12 +49,12 @@ public class Printers {
return "no data";
}
for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
- sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i),locale));
+ sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i), locale));
}
for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
sb.append("Key Ref Grp: TModelKey=");
for (int k = 0; k < categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
- sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k),locale));
+ sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k), locale));
}
}
return sb.toString();
@@ -77,7 +80,7 @@ public class Printers {
for (int i = 0; i < bindingTemplates.getBindingTemplate().size(); i++) {
sb.append("Binding Key: ").append(bindingTemplates.getBindingTemplate().get(i).getBindingKey()).append("<Br>");
sb.append("Description: ").append(ListToDescString(bindingTemplates.getBindingTemplate().get(i).getDescription())).append("<Br>");
- sb.append("CatBag: ").append(CatBagToString(bindingTemplates.getBindingTemplate().get(i).getCategoryBag(),locale)).append("<Br>");
+ sb.append("CatBag: ").append(CatBagToString(bindingTemplates.getBindingTemplate().get(i).getCategoryBag(), locale)).append("<Br>");
sb.append("tModels: ").append(Printers.TModelInfoToString(bindingTemplates.getBindingTemplate().get(i).getTModelInstanceDetails())).append("<Br>");
if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint() != null) {
sb.append("Access Point: ").append(bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue()).append(" type ").append(bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType()).append("<Br>");
@@ -119,7 +122,7 @@ public class Printers {
/**
* converts contacts to a simple string output
*/
- public static String PrintContacts(Contacts contacts,String locale) {
+ public static String PrintContacts(Contacts contacts, String locale) {
if (contacts == null) {
return "";
}
@@ -152,13 +155,13 @@ public class Printers {
return sb.toString();
}
- public static String ListIdentBagToString(IdentifierBag info,String locale) {
+ public static String ListIdentBagToString(IdentifierBag info, String locale) {
StringBuilder sb = new StringBuilder();
if (info == null) {
return "";
}
for (int i = 0; i < info.getKeyedReference().size(); i++) {
- sb.append(KeyedReferenceToString(info.getKeyedReference().get(i),locale));
+ sb.append(KeyedReferenceToString(info.getKeyedReference().get(i), locale));
}
return sb.toString();
}
@@ -177,12 +180,90 @@ public class Printers {
sb.append("</td><td>");
sb.append(list.get(i).getSignature().isEmpty());
sb.append("</td><td>");
- sb.append(StringEscapeUtils.escapeHtml(Printers.KeyedReferenceToString(list.get(i).getKeyedReference(),locale)));
+ sb.append(StringEscapeUtils.escapeHtml(Printers.KeyedReferenceToString(list.get(i).getKeyedReference(), locale)));
sb.append("</td></tr>");
}
sb.append("</table>");
return sb.toString();
}
-
+ public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession session) {
+ boolean isChooser = false;
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<table class=\"table table-hover\"><tr><th>");
+ if (isChooser) {
+ sb.append("</th><th>");
+ }
+ sb.append(ResourceLoader.GetResource(session, "items.key"))
+ .append("</th><th>")
+ .append(ResourceLoader.GetResource(session, "items.name"))
+ .append("</th><th>")
+ .append(ResourceLoader.GetResource(session, "items.description"))
+ .append("</th></tr>");
+ for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+ sb.append("<tr><td>");
+ if (isChooser) {
+ sb.append("<input class=\"modalable\" type=checkbox id=\"")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
+ .append("\"></td><td>");
+ }
+ if (!isChooser) {
+ sb.append("<a href=\"tmodelEditor.jsp?id=")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
+ .append("\" >");
+ }
+ sb.append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()));
+ if (!isChooser) {
+ sb.append("</a>");
+ }
+ sb.append("</td><td>")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()));
+ if (findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() != null) {
+ sb.append(", ")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang()));
+ }
+ sb.append("</td><td>")
+ .append(StringEscapeUtils.escapeHtml(Printers.ListToDescString(findTModel.getTModelInfos().getTModelInfo().get(i).getDescription())))
+ .append("</td></tr>");
+ }
+ sb.append("</table>");
+ return sb.toString();
+ }
+
+ public static String PrintTModelListAsHtmlModel(TModelList findTModel, HttpSession session) {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<table class=\"table table-hover\"><tr><th>");
+
+ sb.append("</th><th>");
+
+ sb.append(ResourceLoader.GetResource(session, "items.key"))
+ .append("</th><th>")
+ .append(ResourceLoader.GetResource(session, "items.name"))
+ .append("</th><th>")
+ .append(ResourceLoader.GetResource(session, "items.description"))
+ .append("</th></tr>");
+ for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
+ sb.append("<tr><td>");
+
+ sb.append("<input class=\"modalable\" type=checkbox id=\"")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
+ .append("\"></td><td>");
+
+ sb.append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()));
+ sb.append("</td><td>")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()));
+ if (findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang() != null) {
+ sb.append(", ")
+ .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang()));
+ }
+ sb.append("</td><td>")
+ .append(StringEscapeUtils.escapeHtml(Printers.ListToDescString(findTModel.getTModelInfos().getTModelInfo().get(i).getDescription())))
+ .append("</td></tr>");
+ }
+ sb.append("</table>");
+ return sb.toString();
+ }
}
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Tue Apr 23 22:19:34 2013
@@ -182,7 +182,7 @@ pages.businesseditor.businesslist=Busine
pages.businesseditor.businesslist2=are defined for this business.
items.service=Service
errors.notsignedin=Either an error occured, or you're not signed in.
-pages.viewsubscriptions.listingheader=UDDI Subscriptions (Subscription API by polling)
+pages.viewsubscriptions.listingheader=UDDI Subscriptions
pages.viewsubscriptions.nosubs=No subscriptions are currently defined.
errors.juddiapi.without.juddi=You're not connected to a jUDDI registry. Contact the administrator or check the configuration file.
items.services.name.descriptions=Services are identified by one or more name. Multiple names are useful for different languages, legal names, or abbreviations.
@@ -256,3 +256,4 @@ items.publisherassertions.relationship=R
items.status=Status
actions.deleted=Deleted
navbar.subscriptions.feed=News Feed
+items.picker=Picker
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Tue Apr 23 22:19:34 2013
@@ -183,7 +183,7 @@ pages.businesseditor.businesslist=Servic
pages.businesseditor.businesslist2=se definen para este negocio.
items.service=Servicio
errors.notsignedin=O ha ocurrido un error, o no te has conectado pulg
-pages.viewsubscriptions.listingheader=UDDI Suscripciones (API Suscripci\u00f3n por sondeo)
+pages.viewsubscriptions.listingheader=UDDI Suscripciones
pages.viewsubscriptions.nosubs=No hay suscripciones se definen actualmente.
errors.juddiapi.without.juddi=Usted no est\u00e1 conectado a un registro jUDDI. P\u00f3ngase en contacto con el administrador o consulte el archivo de configuraci\u00f3n.
items.services.name.descriptions=Los servicios son identificadas por una o m\u00e1s nombre. Varios nombres son \u00fatiles para diferentes idiomas, nombres legales o abreviaturas.
@@ -257,3 +257,4 @@ items.publisherassertions.relationship=R
items.status=Estado
actions.deleted=Suprimido
navbar.subscriptions.feed=Noticias Corriente
+items.picker=Selector
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/WEB-INF/web.xml?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/WEB-INF/web.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/WEB-INF/web.xml Tue Apr 23 22:19:34 2013
@@ -11,4 +11,8 @@
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+ <mime-mapping>
+ <extension>woff</extension>
+ <mime-type>application/x-font-woff</mime-type>
+ </mime-mapping>
</web-app>
Added: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscription.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscription.jsp?rev=1471182&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscription.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscription.jsp Tue Apr 23 22:19:34 2013
@@ -0,0 +1,27 @@
+<%--
+ Document : subscription
+ Created on : Apr 21, 2013, 12:00:30 PM
+ Author : Alex O'Ree
+--%>
+
+<%@page import="java.util.concurrent.atomic.AtomicReference"%>
+<%@page import="org.apache.juddi.webconsole.hub.builders.Builders"%>
+<%@page import="org.uddi.sub_v3.Subscription"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%
+ if (request.getMethod().equalsIgnoreCase("POST")) {
+ UddiHub x = UddiHub.getInstance(application, session);
+ AtomicReference<String> outmsg = new AtomicReference<String>();
+ Subscription sub = Builders.BuildClientSubscription(request.getParameterMap(), outmsg);
+ if (sub == null) {
+ out.write(outmsg.get());
+ } else {
+ out.write(x.AddSubscription(sub));
+ }
+ } else {
+ response.setStatus(500);
+ }
+
+
+%>
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp Tue Apr 23 22:19:34 2013
@@ -15,10 +15,10 @@
int maxrecords = 50;
int offset = 0;
String lang = request.getParameter("lang");
- if (lang == null || lang.length() == 0) {
+ if (lang == null || lang.length() == 0) {
lang = null;
}
- if (lang!=null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
+ if (lang != null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
lang = null;
}
@@ -40,8 +40,12 @@
if (maxrecords > 50) {
maxrecords = 50;
}
-
- PagableContainer ret = (x.tModelListAsHtml(keyword, lang, offset, maxrecords));
+ boolean isChooser = false;
+ try {
+ isChooser = Boolean.parseBoolean(request.getParameter("chooser"));
+ } catch (Exception ex) {
+ }
+ PagableContainer ret = (x.tModelListAsHtml(keyword, lang, offset, maxrecords, isChooser));
out.write(ret.renderedHtml);
%>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp Tue Apr 23 22:19:34 2013
@@ -18,7 +18,7 @@
<div class="row">
<div class="span12" >
- <a href="javascript:ShowAssertionDialog();" ><i class="icon-plus-sign"></i><%=ResourceLoader.GetResource(session, "items.publisherassertion.add")%> </a><br><br>
+ <a href="javascript:ShowAssertionDialog();" ><i class="icon-plus-sign icon-large"></i><%=ResourceLoader.GetResource(session, "items.publisherassertion.add")%> </a><br><br>
<div id="businesslist">
<img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
</div>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp?rev=1471182&r1=1471181&r2=1471182&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp Tue Apr 23 22:19:34 2013
@@ -21,9 +21,9 @@
<%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
<%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
<%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
- <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled " id="pageup"></i></a>
- <a href="javascript:refreshBusinessList();"><i class="icon-refresh " id="refresh"></i></a>
- <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled" id="pagedown"></i></a>
+ <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled icon-large" id="pageup"></i></a>
+ <a href="javascript:refreshBusinessList();"><i class="icon-refresh icon-large" id="refresh"></i></a>
+ <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled icon-large" id="pagedown"></i></a>
<div id="businesslist">
<img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org