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/15 15:07:03 UTC
svn commit: r1468025 [3/4] - in /juddi/branches/juddi-3.2.x: ./
juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-core-openjpa/
juddi-core-openjpa/src/test/resources/META-INF/ juddi-core/
juddi-core/src/main/java/org/apache/juddi/api/impl/ j...
Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java Mon Apr 15 13:07:00 2013
@@ -25,16 +25,23 @@ import java.security.cert.CertificateFac
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBElement;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Holder;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.UDDIConstants;
@@ -47,7 +54,7 @@ import org.apache.juddi.webconsole.hub.b
import org.apache.juddi.webconsole.resources.ResourceLoader;
import org.apache.log4j.Level;
import org.uddi.api_v3.*;
-import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.*;
import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDICustodyTransferPortType;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -72,12 +79,14 @@ public class UddiHub {
Properties properties = null;
AuthStyle style = null;
public static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LOGGER_NAME);
+ private DatatypeFactory df;
- private UddiHub() {
+ private UddiHub() throws DatatypeConfigurationException {
+ df = DatatypeFactory.newInstance();
}
/**
- * removes the Hub from the current http session and clears any tokens
+ * removes the Hub from the current http session
*
* @param _session
*/
@@ -1900,13 +1909,76 @@ public class UddiHub {
*/
public List<Subscription> GetSubscriptions() {
try {
- return subscription.getSubscriptions(GetToken());
+ try {
+ return subscription.getSubscriptions(GetToken());
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ return subscription.getSubscriptions(GetToken());
+ }
+ } else {
+ throw ex;
+ }
+ }
+ } catch (Exception ex) {
+ HandleException(ex);
+ }
+ return null;
+ }
+
+ public String AddSubscription(Subscription sub) {
+ Holder<List<Subscription>> data = new Holder<List<Subscription>>();
+ data.value = new ArrayList<Subscription>();
+ data.value.add(sub);
+ try {
+ try {
+ subscription.saveSubscription(GetToken(), data);
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ subscription.saveSubscription(GetToken(), data);
+ }
+ } else {
+ throw ex;
+ }
+ }
} catch (Exception ex) {
HandleException(ex);
}
return null;
}
+ public String RemoveSubscription(String key) {
+ DeleteSubscription ds = new DeleteSubscription();
+ ds.setAuthInfo(GetToken());
+ ds.getSubscriptionKey().add(key);
+ try {
+ try {
+ subscription.deleteSubscription(ds);
+ return ResourceLoader.GetResource(session, "actions.deleted");
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ ds.setAuthInfo(GetToken());
+ subscription.deleteSubscription(ds);
+ return ResourceLoader.GetResource(session, "actions.deleted");
+ }
+ } else {
+ throw ex;
+ }
+ }
+ } catch (Exception ex) {
+ return HandleException(ex);
+ }
+ return null;
+ }
+
/**
*
* @param ft
@@ -1914,8 +1986,11 @@ public class UddiHub {
* @return null if theres an error
*/
public List<OperationalInfo> GetOperationalInfo(String id) {
+ if (id == null) {
+ return null;
+ }
GetOperationalInfo goi = new GetOperationalInfo();
- goi.setAuthInfo(id);
+ goi.setAuthInfo(GetToken());
goi.getEntityKey().add(id);
OperationalInfos operationalInfo = null;
try {
@@ -2087,7 +2162,7 @@ public class UddiHub {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
- STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+ STATUS_FROM_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
}
} else {
@@ -2103,14 +2178,14 @@ public class UddiHub {
List<AssertionStatusItem> STATUS_TO_KEY_INCOMPLETE = null;
try {
try {
- STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+ STATUS_TO_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
} catch (Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
- STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+ STATUS_TO_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
}
} else {
@@ -2148,6 +2223,7 @@ public class UddiHub {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
+ dp.setAuthInfo(GetToken());
publish.deletePublisherAssertions(dp);
}
} else {
@@ -2190,6 +2266,7 @@ public class UddiHub {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
token = null;
+ r.setAuthInfo(GetToken());
publish.addPublisherAssertions(r);
}
} else {
@@ -2202,15 +2279,153 @@ public class UddiHub {
return ResourceLoader.GetResource(session, "actions.saved");
}
- public void GetMyBusinesses() {
- }
+ public String GetNewsFeed(XMLGregorianCalendar lastRefresh) throws DatatypeConfigurationException {
+ if (df == null) {
+ df = DatatypeFactory.newInstance();
+ }
+ List<Subscription> subscriptions = new ArrayList<Subscription>();
+ try {
+ try {
+ subscriptions = subscription.getSubscriptions(GetToken());
+
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+
+ subscriptions = subscription.getSubscriptions(GetToken());
+ }
+ } else {
+ throw ex;
+ }
+ }
+ } catch (Exception ex) {
+ return HandleException(ex);
+ }
- public String TransferCustody() {
- return null;
- }
- public String GetUDDISubscriptions() {
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+
+ GetSubscriptionResults r = new GetSubscriptionResults();
+ r.setAuthInfo(GetToken());
+ r.setCoveragePeriod(new CoveragePeriod());
+ r.getCoveragePeriod().setEndPoint(df.newXMLGregorianCalendar(gcal));
+
+ r.getCoveragePeriod().setStartPoint(lastRefresh);
+ StringBuilder sb = new StringBuilder();
+ for (int k = 0; k < subscriptions.size(); k++) {
+
+ r.setSubscriptionKey(subscriptions.get(k).getSubscriptionKey());
+ SubscriptionResultsList subscriptionResults = null;
+ try {
+ try {
+ subscriptionResults = subscription.getSubscriptionResults(r);
+
+ } catch (Exception ex) {
+ if (ex instanceof DispositionReportFaultMessage) {
+ DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+ if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+ token = null;
+ r.setAuthInfo(GetToken());
+ subscriptionResults = subscription.getSubscriptionResults(r);
+ }
+ } else {
+ throw ex;
+ }
+ }
+ } catch (Exception ex) {
+ return HandleException(ex);
+ }
+
+ if (subscriptionResults != null) {
+ // subscriptionResults.getAssertionStatusReport().
+ if (subscriptionResults.getAssertionStatusReport() != null) {
+ sb.append("Assertion Status Report Changed<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().get(i).getFromKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().get(i).getToKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().get(i).getCompletionStatus().toString()));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getBindingDetail() != null) {
+ sb.append("Bindings Changed<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getBindingDetail().getBindingTemplate().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBindingDetail().getBindingTemplate().get(i).getServiceKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBindingDetail().getBindingTemplate().get(i).getBindingKey()));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getBusinessDetail() != null) {
+ sb.append("Businesses Changed<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getBusinessDetail().getBusinessEntity().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBusinessDetail().getBusinessEntity().get(i).getBusinessKey()));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getRelatedBusinessesList() != null) {
+ sb.append("Business Relationships (Publisher Asssertions)<br><table class=\"table table-hover\">");
+ // for (int i = 0; i < subscriptionResults.getRelatedBusinessesList().getBusinessKey().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getRelatedBusinessesList().getBusinessKey()));
+ sb.append("</td></tr>");
+ //}
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getServiceDetail() != null) {
+ sb.append("Services Changed<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getServiceDetail().getBusinessService().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceDetail().getBusinessService().get(i).getServiceKey()));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getServiceList() != null) {
+ sb.append("Service Listing<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getServiceKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getName())));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getTModelDetail() != null) {
+ sb.append("tModels Changed<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getTModelDetail().getTModel().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getTModelDetail().getTModel().get(i).getTModelKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml((subscriptionResults.getTModelDetail().getTModel().get(i).getName().getValue())));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ } else if (subscriptionResults.getTModelList() != null) {
+ sb.append("tModel Listing<br><table class=\"table table-hover\">");
+ for (int i = 0; i < subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().size(); i++) {
+ sb.append("<tr><td>");
+ sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().get(i).getTModelKey()));
+ sb.append("</td><td>");
+ sb.append(StringEscapeUtils.escapeHtml((subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().get(i).getName().getValue())));
+ sb.append("</td></tr>");
+ }
+ sb.append("</table><br><br>");
+ }
+
+ }
+ }
+ return sb.toString();
+ }
+
+ public String TransferCustody() {
return null;
}
}
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=1468025&r1=1468024&r2=1468025&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 Mon Apr 15 13:07:00 2013
@@ -254,3 +254,5 @@ items.publisherassertions.from=My Busine
items.publisherassertions.to=Is related to business
items.publisherassertions.relationship=Relationship
items.status=Status
+actions.deleted=Deleted
+navbar.subscriptions.feed=News Feed
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=1468025&r1=1468024&r2=1468025&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 Mon Apr 15 13:07:00 2013
@@ -255,3 +255,5 @@ items.publisherassertions.from=Mi Negoci
items.publisherassertions.to=Est\u00e1 relacionado con los negocios
items.publisherassertions.relationship=Relaci\u00f3n
items.status=Estado
+actions.deleted=Suprimido
+navbar.subscriptions.feed=Noticias Corriente
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp Mon Apr 15 13:07:00 2013
@@ -15,6 +15,7 @@
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
+<jsp:include page="../csrf.jsp" />
<%
UddiHub x = UddiHub.getInstance(application, session);
if (request.getMethod().equalsIgnoreCase("post")) {
Added: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscriptionFeed.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscriptionFeed.jsp?rev=1468025&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscriptionFeed.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/subscriptionFeed.jsp Mon Apr 15 13:07:00 2013
@@ -0,0 +1,23 @@
+<%--
+ Document : subscriptionFeed
+ Created on : Apr 14, 2013, 7:56:16 PM
+ Author : Alex O'Ree
+--%>
+
+<%@page import="java.util.Calendar"%>
+<%@page import="javax.xml.datatype.XMLGregorianCalendar"%>
+<%@page import="java.util.GregorianCalendar"%>
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<%
+ UddiHub x = UddiHub.getInstance(application, session);
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.DATE, -1);
+ XMLGregorianCalendar xcal = df.newXMLGregorianCalendar(gcal);
+ out.write(x.GetNewsFeed(xcal));
+
+%>
\ No newline at end of file
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=1468025&r1=1468024&r2=1468025&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 Mon Apr 15 13:07:00 2013
@@ -23,8 +23,9 @@
<img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
</div>
-
+
<script type="text/javascript">
+
function ShowAssertionDialog()
{
$("#addPublisherAssertion").modal('show');
@@ -181,6 +182,9 @@
});
}
+ <%
+ String fromkey = request.getParameter("fromkey");
+ %>
</script>
</div>
</div>
@@ -191,7 +195,11 @@
<h3>Add a publisher assertion</h3>
</div>
<div class="modal-body" id="addPublisherAssertionContent">
- <div style="float:left;width:25%">From Key : </div><div id="fromkey" class="edit"></div>
+ <div style="float:left;width:25%">From Key : </div><div id="fromkey" class="edit"><%
+ if (fromkey != null) {
+ out.write(StringEscapeUtils.escapeHtml(fromkey));
+ }
+ %></div>
<div style="float:left;width:25%">To Key : </div><div id="tokey" class="edit"></div>
<div style="float:left;width:25%">tModel Key : </div><div id="tmodelkey" class="edit">uddi:uddi.org:relationships</div>
<div style="float:left;width:25%">Key Name : </div><div id="keyname" class="edit">Subsidiary</div>
@@ -206,5 +214,12 @@
<a href="javascript:$('#addPublisherAssertion').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
+ <script type="text/javascript">
+ <%if (fromkey != null) {
+ %>
+ $("#addPublisherAssertion").modal('show');
+ <% }
+ %>
+ </script>
<%@include file="header-bottom.jsp" %>
\ No newline at end of file
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=1468025&r1=1468024&r2=1468025&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 Mon Apr 15 13:07:00 2013
@@ -19,7 +19,7 @@
<div class="span12" >
<%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
<%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
- <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</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>
@@ -28,7 +28,7 @@
<div id="businesslist">
<img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
</div>
-
+
<script src="js/businesssearch.js"></script>
<script type="text/javascript">
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp Mon Apr 15 13:07:00 2013
@@ -572,11 +572,11 @@
}});
</script>
- <a href="#"> <i class="icon-plus-sign"></i>
+ <a href="assertions.jsp?fromkey=<%=URLEncoder.encode(bizid, "UTF-8")%>"> <i class="icon-plus-sign"></i>
<%=ResourceLoader.GetResource(session, "items.publisherassertion.add")%></a><br>
<div id="relationresults"></div>
-
+
</div>
</div>
</div>
@@ -661,20 +661,17 @@
<a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
-
- <div class="modal hide fade" id="addPublisherAssertion">
+
+ <div class="modal hide fade" id="addSubscriptionModal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>Add a publisher assertion</h3>
+ <h3>Add a subscription</h3>
</div>
- <div class="modal-body" id="viewAsXmlContent">
- <%
-
- %>
-
+ <div class="modal-body">
+ You can setup a subscription for this business to automatically alert you when there is a change
</div>
<div class="modal-footer">
-
+
<a href="javascript:$('#addPublisherAssertion').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
</div>
</div>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp Mon Apr 15 13:07:00 2013
@@ -40,49 +40,90 @@
<div class="row">
<div class="span12">
<p>
- <%=ResourceLoader.GetResource(session, "pages.viewsubscriptions.content")%>
+
</p>
- <h2><%=ResourceLoader.GetResource(session, "pages.viewsubscriptions.listingheader")%></h2>
+
<%
- UddiHub x = UddiHub.getInstance(application, session);
-//TODO more internationalization
- List<Subscription> list = x.GetSubscriptions();
- if (list == null) {
- out.write(ResourceLoader.GetResource(session, "errors.notsignedin"));
- }
+ Subscription sub = new Subscription();
%>
- <%
- 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.actions")%></th></tr>
- <%
- for (int i = 0; i < list.size(); i++) {
- out.write("<tr><td>");
- out.write(StringEscapeUtils.escapeHtml(list.get(i).getSubscriptionKey()));
- out.write("</td><td>");
- out.write(StringEscapeUtils.escapeHtml(list.get(i).getExpiresAfter().toString()));
- out.write("</td><td>");
- out.write("<i class=\"icon-edit\"></i> ");
- out.write("<i class=\"icon-remove\"></i> ");
- out.write("<i class=\"icon-zoom-in\"></i> ");
-
- out.write("</td></tr>");
- out.write("<tr><td colspan=\"3\"><div id=\"" + StringEscapeUtils.escapeHtml(list.get(i).getSubscriptionKey()) + "\"></div></td></tr>");
- }
- %>
- </table>
- <%
- } else
- out.write(ResourceLoader.GetResource(session, "pages.viewsubscriptions.nosubs"));
-
- }
- %>
+ <div class="accordion" id="accordion2">
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+ Step 1 - What do you type of information to you want alerts on?
+ </a>
+ </div>
+ <div id="collapseOne" class="accordion-body collapse in">
+ <div class="accordion-inner">
+ <div class="btn-group" id="alertType" data-toggle="buttons-radio">
+ <a href="#" class="btn">Changes to a specific item</a>
+ <a href="#" class="btn">Changes to search results, such as a new item</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+ Step 2 - Which items do you want alerts on?
+ </a>
+ </div>
+ <div id="collapseTwo" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <div class="btn-group" id="alertCritera" data-toggle="buttons-radio">
+ <a href="#" class="btn">Binding</a>
+ <a href="#" class="btn">Business</a>
+ <a href="#" class="btn">Publisher Assertion Status</a>
+ <a href="#" class="btn">Related Business</a>
+ <a href="#" class="btn">Service</a>
+ <a href="#" class="btn">tModel</a>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
+ Step 3 - How do want to receive the alerts?
+ </a>
+ </div>
+ <div id="collapseThree" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <div class="btn-group" id="alertTransport" data-toggle="buttons-radio">
+ <a href="#" class="btn">Send me alerts directly</a>
+ <a href="#" class="btn">I'll pick them up</a>
+ </div><br>
+ <input type="text" id="bindingKey" autocomplete="false" placeholder="Binding Template">
+ </div>
+ </div>
+ </div>
+
+
+ <div class="accordion-group">
+ <div class="accordion-heading">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapse4">
+ Step 3 - How do want to receive the alerts?
+ </a>
+ </div>
+ <div id="collapse4" class="accordion-body collapse">
+ <div class="accordion-inner">
+ <div class="btn-group" id="alertTransport" data-toggle="buttons-radio">
+ <a href="#" class="btn">Send me alerts directly</a>
+ <a href="#" class="btn">I'll pick them up</a>
+ </div><br>
+ <input type="text" id="bindingKey" autocomplete="false" placeholder="Binding Template">
+ </div>
+ </div>
+ </div>
+
+
+ </div>
</div>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp Mon Apr 15 13:07:00 2013
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="java.io.IOException"%>
<%@page import="java.util.jar.Attributes"%>
<%@page import="java.util.jar.Manifest"%>
@@ -26,37 +27,7 @@
padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px; width:100%; text-align: center; position: fixed;
background-color: white;
"><center><footer><span style="color: red"><b>BETA</b></span> - v<%
-//border-width: 4px; border-color: red; border-style: dashed
- Enumeration resEnum;
- try {
- resEnum = Thread.currentThread().getContextClassLoader().getResources(JarFile.MANIFEST_NAME);
- while (resEnum.hasMoreElements()) {
- try {
- URL url = (URL) resEnum.nextElement();
- if (url.toString().toLowerCase().contains("juddi-client")) {
- // out.write(url.toString() + "=");
- InputStream is = url.openStream();
- if (is != null) {
- Manifest manifest = new Manifest(is);
- Attributes mainAttribs = manifest.getMainAttributes();
- String version = mainAttribs.getValue("Bundle-Version");
- if (version != null) {
- out.write(version);
- // out.write("<br>");
- }
- }
- }
- } catch (Exception e) {
- // Silently ignore wrong manifests on classpath?
- }
- }
- } catch (IOException e1) {
- // Silently ignore wrong manifests on classpath?
- }
-
-
-
-
+ out.write(StringEscapeUtils.escapeHtml(org.apache.juddi.v3.client.Release.getRegistryVersion()));
%> - <a href="http://www.apache.org"><%=ResourceLoader.GetResource(session, "footer.apachecopyright")%></a</footer></center></div>
</body>
</html>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Mon Apr 15 13:07:00 2013
@@ -136,6 +136,7 @@
<ul class="dropdown-menu">
<li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
<li><a href="createSubscription.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>
</li>
Added: juddi/branches/juddi-3.2.x/juddi-gui/web/subscriptionFeed.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/subscriptionFeed.jsp?rev=1468025&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/subscriptionFeed.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/subscriptionFeed.jsp Mon Apr 15 13:07:00 2013
@@ -0,0 +1,48 @@
+<%--
+ Document : subscriptionFeed
+ Created on : Apr 14, 2013, 7:45:24 PM
+ Author : Alex O'Ree
+--%>
+
+
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@include file="header-top.jsp"%>
+
+<div class="container">
+
+ <!-- Main hero unit for a primary marketing message or call to action -->
+ <div class="well">
+ <h1>News Feed</h1>
+
+ </div>
+
+ <!-- Example row of columns -->
+ <div class="row">
+ <div class="span12">
+ <p>The news feed provides you a list of all updated content per your subscription settings.</p>
+ <div id="feedcontent"></div>
+ <script type="text/javascript">
+ $("#feedcontent").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+ var request= $.ajax({
+ url: 'ajax/subscriptionFeed.jsp',
+ type:"GET",
+ cache: false
+ });
+
+ request.done(function(msg) {
+ window.console && console.log('postback done ');
+ $("#feedcontent").html(msg);
+ //refresh();
+ });
+
+ request.fail(function(jqXHR, textStatus) {
+ window.console && console.log('postback failed ');
+ $("#feedcontent").html("An error occured! " + textStatus + jqXHR);
+ //refresh();
+ });
+ </script>
+ </div>
+
+ </div>
+ <%@include file="header-bottom.jsp"%>
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp Mon Apr 15 13:07:00 2013
@@ -72,7 +72,10 @@
out.write("<i class=\"icon-edit\"></i> ");
out.write("<i class=\"icon-remove\"></i> ");
out.write("<i class=\"icon-zoom-in\"></i> ");
-
+out.write(list.get(i).getBindingKey());
+out.write(list.get(i).getMaxEntities());
+out.write(list.get(i).getNotificationInterval().toString());
+//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>");
}
Modified: juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml Mon Apr 15 13:07:00 2013
@@ -18,6 +18,7 @@
-->
<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>
<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
+ <copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
<copy file="${dependency.commons-discovery.jar}" todir="${lib.dir}"/>
Modified: juddi/branches/juddi-3.2.x/juddi-tomcat/context.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-tomcat/context.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-tomcat/context.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-tomcat/context.xml Mon Apr 15 13:07:00 2013
@@ -17,6 +17,14 @@
url="jdbc:mysql://localhost:3306/juddiv3"
maxActive="8"
/>
- -->
+ -->
+ <!-- postgresql
+ <Resource name="jdbc/JuddiDS" auth="Container"
+ type="javax.sql.DataSource" username="juddi" password="juddi"
+ driverClassName="org.postgresql.Driver"
+ url="jdbc:postgresql://localhost:5432/juddi"
+ maxActive="8"
+ />
+ -->
</Context>
Modified: juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml Mon Apr 15 13:07:00 2013
@@ -54,6 +54,11 @@
<version>5.1.6</version>
</dependency>
<dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-504.jdbc3</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
@@ -84,6 +89,7 @@
<property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}" />
<property name="dependency.mysql.jar" value="${maven.dependency.mysql.mysql-connector-java.jar.path}" />
+ <property name="dependency.postgres.jar" value="${maven.dependency.postgresql.postgresql.jar.path}" />
<property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}" />
<property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" />
<property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
Modified: juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml Mon Apr 15 13:07:00 2013
@@ -57,7 +57,8 @@
<class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
- <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.2.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml Mon Apr 15 13:07:00 2013
@@ -57,7 +57,8 @@
<class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
- <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.2.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml Mon Apr 15 13:07:00 2013
@@ -58,6 +58,7 @@
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
@@ -73,7 +74,10 @@
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
<property name="openjpa.jdbc.UpdateManager" value="operation-order"/>
<property name="openjpa.jdbc.DBDictionary" value="derby"/>
+ <!-- dialects: derby, postgres, mysql, oracle, sybase, sqlserver
+ for a complete list check the OpenJPA documentation -->
<property name="openjpa.RuntimeUnenhancedClasses" value="warn"/>
+ <property name="openjpa.Compatibility" value="CheckDatabaseForCascadePersistToDetachedEntity=true"/>
</properties>
</persistence-unit>
</persistence>
Modified: juddi/branches/juddi-3.2.x/readme.txt
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/readme.txt?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/readme.txt (original)
+++ juddi/branches/juddi-3.2.x/readme.txt Mon Apr 15 13:07:00 2013
@@ -29,5 +29,5 @@ cd juddi-console
mvn clean install
To start Juddi's embedded Tomcat server:
-juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.bat -XX:MaxPermSize=128m
-juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh -XX:MaxPermSize=128m
\ No newline at end of file
+juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.bat
+juddi-tomcat\target\tomcat\apache-tomcat-6.0.26\bin\startup.sh
\ No newline at end of file
Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Mon Apr 15 13:07:00 2013
@@ -38,9 +38,12 @@ import org.apache.juddi.jaxb.EntityCreat
import org.junit.Assert;
import org.uddi.api_v3.BusinessDetail;
import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.Description;
import org.uddi.api_v3.GetBusinessDetail;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.KeyedReferenceGroup;
import org.uddi.api_v3.SaveBusiness;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
@@ -292,6 +295,7 @@ public class TckBusiness
BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
sb.getBusinessEntity().add(beIn);
+
publication.saveBusiness(sb);
// Now get the entity and check the values
Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java Mon Apr 15 13:07:00 2013
@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.jaxb.EntityCreator;
import org.junit.Assert;
+import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessService;
import org.uddi.api_v3.DeleteService;
import org.uddi.api_v3.FindQualifiers;
@@ -76,8 +77,8 @@ public class TckBusinessService
saveService2(authInfoJoe, JOE_SERVICE_KEY, JOE_SERVICE_XML_2, JOE_SERVICE_KEY_2);
}
- public void saveJoePublisherServices(String authInfoJoe, int numberOfCopies) {
- saveServices(authInfoJoe, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies);
+ public void saveJoePublisherServices(String authInfoJoe, int businessInt, int numberOfCopies) {
+ saveServices(authInfoJoe, businessInt, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies);
}
public void deleteJoePublisherService(String authInfoJoe) {
@@ -97,40 +98,48 @@ public class TckBusinessService
}
- public void deleteJoePublisherServices(String authInfoJoe, int numberOfCopies) {
- deleteServices(authInfoJoe, JOE_SERVICE_KEY, numberOfCopies);
+ public void deleteJoePublisherServices(String authInfoJoe, int businessInt, int numberOfCopies) {
+ deleteServices(authInfoJoe, businessInt,JOE_SERVICE_KEY, numberOfCopies);
}
public void saveSamSyndicatorService(String authInfoSam) {
saveService(authInfoSam, SAM_SERVICE_XML, SAM_SERVICE_KEY);
}
- public void saveSamSyndicatorServices(String authInfoSam, int numberOfCopies) {
- saveServices(authInfoSam, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies);
+ public void saveSamSyndicatorServices(String authInfoSam, int businessInt, int numberOfCopies) {
+ saveServices(authInfoSam, businessInt, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies);
}
public void deleteSamSyndicatorService(String authInfoSam) {
deleteService(authInfoSam, SAM_SERVICE_KEY);
}
- public void deleteSamSyndicatorServices(String authInfoSam, int numberOfCopies) {
- deleteServices(authInfoSam, SAM_SERVICE_KEY, numberOfCopies);
+ public void deleteSamSyndicatorServices(String authInfoSam, int businessInt, int numberOfCopies) {
+ deleteServices(authInfoSam, businessInt, SAM_SERVICE_KEY, numberOfCopies);
}
- public void saveServices(String authInfo, String serviceXML, String serviceKey, int numberOfCopies) {
+ public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies) {
+ SaveService ss = null;
try {
org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v3");
String serviceName = bsIn.getName().get(0).getValue();
String bindingKey = bsIn.getBindingTemplates().getBindingTemplate().get(0).getBindingKey();
for (int i=0; i<numberOfCopies; i++) {
// save the entity
- SaveService ss = new SaveService();
+ ss = new SaveService();
ss.setAuthInfo(authInfo);
bsIn.getName().get(0).setValue(serviceName + "-" + i);
-
- bsIn.setServiceKey(serviceKey + "-" + i);
- bsIn.getBindingTemplates().getBindingTemplate().get(0).setBindingKey(bindingKey + "-" + i);
+ bsIn.setBusinessKey(TckBusiness.JOE_BUSINESS_KEY + "-" + businessInt);
+ bsIn.setServiceKey(serviceKey + "-" + businessInt + "-" + i);
+ bsIn.getBindingTemplates().getBindingTemplate().get(0).setBindingKey(bindingKey + "-" + businessInt + "-" + i);
+ bsIn.getBindingTemplates().getBindingTemplate().get(0).setServiceKey(serviceKey + "-" + businessInt + "-" + i);
ss.getBusinessService().add(bsIn);
+
+ BindingTemplate bt = bsIn.getBindingTemplates().getBindingTemplate().get(0);
+ if (! bt.getServiceKey().equals(serviceKey + "-" + businessInt + "-" + i)) {
+ System.out.println("not the same");
+ }
+
publication.saveService(ss);
logger.debug("Add service with key " + bsIn.getServiceKey());
}
@@ -223,16 +232,15 @@ public class TckBusinessService
}
}
- public void deleteServices(String authInfo, String serviceKey, int numberOfCopies) {
+ public void deleteServices(String authInfo, int businessInt, String serviceKey, int numberOfCopies) {
try {
for (int i=0; i<numberOfCopies; i++) {
// Delete the entity and make sure it is removed
DeleteService ds = new DeleteService();
ds.setAuthInfo(authInfo);
-
- ds.getServiceKey().add(serviceKey + "-" + i);
+ ds.getServiceKey().add(serviceKey + "-" + businessInt + "-" + i);
publication.deleteService(ds);
- logger.debug("Deleted Service with key " + serviceKey + "-" + i);
+ logger.debug("Deleted Service with key " + businessInt + "-" + serviceKey + "-" + i);
}
}
catch(Exception e) {
Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java Mon Apr 15 13:07:00 2013
@@ -65,6 +65,7 @@ public class TckFindEntity
{
final static String FIND_BUSINESS_XML = "uddi_data/find/findBusiness1.xml";
final static String FIND_ALL_BUSINESSES_XML = "uddi_data/find/findAllBusinesses.xml";
+ final static String FIND_ALL_SIGNED_BUSINESSES_XML= "uddi_data/find/findAllSignedBusinesses.xml";
final static String FIND_RELATED_BUSINESS_SORT_BY_NAME_XML = "uddi_data/find/findRelatedBusinesses_sortByName.xml";
final static String FIND_RELATED_BUSINESS_FROM_KEY= "uddi_data/find/findRelatedBusinesses_fromKey.xml";
final static String FIND_RELATED_BUSINESS_TO_KEY = "uddi_data/find/findRelatedBusinesses_toKey.xml";
@@ -151,6 +152,30 @@ public class TckFindEntity
}
}
+ public List<BusinessInfo> findAllSignedBusiness() {
+ List<BusinessInfo> biList = null;
+ try {
+ FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_ALL_SIGNED_BUSINESSES_XML, "org.uddi.api_v3");
+ BusinessList result = inquiry.findBusiness(body);
+ if (result == null)
+ Assert.fail("Null result from find business operation");
+ BusinessInfos bInfos = result.getBusinessInfos();
+ if (bInfos == null)
+ Assert.fail("No result from find business operation");
+ biList = bInfos.getBusinessInfo();
+ if (biList == null || biList.size() == 0)
+ Assert.fail("No result from find business operation");
+ //expecting at one business
+ Assert.assertTrue(biList.size()==1);
+ return biList;
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ return biList;
+ }
+
public void findRelatedBusiness_sortByName(boolean isOneSided) {
try {
FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_SORT_BY_NAME_XML, "org.uddi.api_v3");
@@ -242,10 +267,11 @@ public class TckFindEntity
}
}
- public String findService() {
+ public String findService(String findQualifier) {
String serviceKey = null;
try {
FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
ServiceList result = inquiry.findService(body);
if (result == null)
Assert.fail("Null result from find service operation");
@@ -330,9 +356,10 @@ public class TckFindEntity
Assert.fail("No exception should be thrown.");
}
}
- public void findBinding() {
+ public void findBinding(String findQualifier) {
try {
FindBinding body = (FindBinding)EntityCreator.buildFromDoc(FIND_BINDING_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
BindingDetail result = inquiry.findBinding(body);
if (result == null)
Assert.fail("Null result from find binding operation");
@@ -355,9 +382,10 @@ public class TckFindEntity
}
}
- public void findTModel() {
+ public void findTModel(String findQualifier) {
try {
FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+ if (findQualifier!=null) body.getFindQualifiers().getFindQualifier().add(findQualifier);
TModelList result = inquiry.findTModel(body);
if (result == null)
Assert.fail("Null result from find tModel operation");
Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java:r1460934-1467812
Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/resources/uddi_data:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business1.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business1.xml?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business1.xml (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/tompublisher/juddi456-business1.xml Mon Apr 15 13:07:00 2013
@@ -30,7 +30,7 @@
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:uddi.tompublisher.com:tmodeltest02" keyValue="value-x"/>
+ <keyedReference tModelKey="uddi:uddi.tompublisher.com:tmodeltest02" keyValue="value-z"/>
</categoryBag>
</businessService>
</businessServices>
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java Mon Apr 15 13:07:00 2013
@@ -3,7 +3,6 @@ package org.apache.juddi.v3.tck;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
-import java.net.URL;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.v3.client.UDDIService;
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java Mon Apr 15 13:07:00 2013
@@ -27,11 +27,11 @@ public class UDDI_040_BusinessServiceLoa
tckTModel.saveJoePublisherTmodel(authInfoJoe);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
long startSave = System.currentTimeMillis();
- tckBusinessService.saveJoePublisherServices(authInfoJoe, numberOfServices);
+ tckBusinessService.saveJoePublisherServices(authInfoJoe, 0, numberOfServices);
long saveDuration = System.currentTimeMillis() - startSave;
System.out.println("Save " + numberOfServices + " Joes Services Duration=" + saveDuration);
long startDelete = System.currentTimeMillis();
- tckBusinessService.deleteJoePublisherServices(authInfoJoe, numberOfServices);
+ tckBusinessService.deleteJoePublisherServices(authInfoJoe, 0, numberOfServices);
long deleteDuration = System.currentTimeMillis() - startDelete;
System.out.println("Delete " + numberOfServices + " Joes Services Duration= " + deleteDuration);
tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
@@ -43,11 +43,11 @@ public class UDDI_040_BusinessServiceLoa
tckTModel.saveSamSyndicatorTmodel(authInfoSam);
tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
long startSave = System.currentTimeMillis();
- tckBusinessService.saveSamSyndicatorServices(authInfoSam, numberOfServices);
+ tckBusinessService.saveSamSyndicatorServices(authInfoSam, 0, numberOfServices);
long saveDuration = System.currentTimeMillis() - startSave;
System.out.println("Save " + numberOfServices + " Sams Services Duration=" + saveDuration);
long startDelete = System.currentTimeMillis();
- tckBusinessService.deleteSamSyndicatorServices(authInfoSam, numberOfServices);
+ tckBusinessService.deleteSamSyndicatorServices(authInfoSam, 0, numberOfServices);
long deleteDuration = System.currentTimeMillis() - startDelete;
System.out.println("Delete " + numberOfServices + " Sams Services Duration= " + deleteDuration);
tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Mon Apr 15 13:07:00 2013
@@ -97,17 +97,17 @@ public class UDDI_050_BindingTemplateInt
tckBusinessService.saveJoePublisherService(authInfoJoe);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
tckBindingTemplate.deleteBinding(authInfoJoe, "uddi:uddi.joepublisher.com:bindingone");
- String serviceKey = tckFindEntity.findService();
+ String serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
- serviceKey = tckFindEntity.findService();
+ serviceKey = tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
- tckFindEntity.findService();
+ tckFindEntity.findService(null);
tckFindEntity.findServiceDetail(serviceKey);
} finally {
tckBusinessService.deleteJoePublisherService(authInfoJoe);
Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Mon Apr 15 13:07:00 2013
@@ -17,6 +17,7 @@ package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
@@ -83,9 +84,9 @@ public class UDDI_070_FindEntityIntegrat
tckBusinessService.saveJoePublisherService(authInfoJoe);
tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
tckFindEntity.findBusiness();
- tckFindEntity.findService();
- tckFindEntity.findBinding();
- tckFindEntity.findTModel();
+ tckFindEntity.findService(null);
+ tckFindEntity.findBinding(null);
+ tckFindEntity.findTModel(null);
tckFindEntity.getNonExitingBusiness();
} catch (Exception e) {
e.printStackTrace();
@@ -99,9 +100,31 @@ public class UDDI_070_FindEntityIntegrat
tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
tckTModel.deleteJoePublisherTmodel(authInfoJoe);
}
-
}
+ @Test
+ public void findSignedEntities() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
+ tckBusinessService.saveJoePublisherService(authInfoJoe);
+ tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
+
+ tckFindEntity.findAllSignedBusiness();
+ tckFindEntity.findService(UDDIConstants.SIGNATURE_PRESENT);
+ tckFindEntity.findBinding(UDDIConstants.SIGNATURE_PRESENT);
+ //tckFindEntity.findTModel(UDDIConstants.SIGNATURE_PRESENT);
+
+ tckFindEntity.findAllBusiness();
+ tckFindEntity.getNonExitingBusiness();
+ } finally {
+ tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
+ tckBusinessService.deleteJoePublisherService(authInfoJoe);
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ }
+
+ }
}
Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Mon Apr 15 13:07:00 2013
@@ -14,8 +14,6 @@ package org.apache.juddi.v3.tck;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.util.Date;
-
import javax.xml.ws.Endpoint;
import org.apache.commons.configuration.ConfigurationException;
Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java:r1460934-1467812
Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java?rev=1468025&r1=1468024&r2=1468025&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java Mon Apr 15 13:07:00 2013
@@ -20,22 +20,19 @@ import java.util.List;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.uddi.api_v3.BusinessInfo;
-import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
import org.uddi.api_v3.FindService;
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.ServiceInfo;
import org.uddi.api_v3.ServiceList;
-import org.uddi.api_v3.TModelBag;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -61,21 +58,21 @@ public class UDDI_120_CombineCategoryBag
final static String TOM_BUSINESS1_XML = "uddi_data/tompublisher/juddi456-business1.xml";
final static String TOM_BUSINESS2_XML = "uddi_data/tompublisher/juddi456-business2.xml";
+ final static String TOM_BUSINESS5_XML = "uddi_data/tompublisher/juddi456-business5.xml";
final static String TOM_BUSINESS1_KEY = "uddi:uddi.tompublisher.com:businesstest01";
final static String TOM_BUSINESS2_KEY = "uddi:uddi.tompublisher.com:businesstest02";
+ final static String TOM_BUSINESS5_KEY = "uddi:uddi.tompublisher.com:businesstest05";
- final static String SERVICE_KEY = "uddi:uddi.tompublisher.com:servicetest02";
+ final static String SERVICE_KEY1 = "uddi:uddi.tompublisher.com:servicetest01";
+ final static String SERVICE_KEY5 = "uddi:uddi.tompublisher.com:servicetest05";
final static String TOM_PUBLISHER_SERVICEINFO_NAME = "servicetest01";
- private static Log logger = LogFactory.getLog(UDDI_040_BusinessServiceIntegrationTest.class);
+ private static Log logger = LogFactory.getLog(UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class);
protected static TckTModel tckTModel = null;
- protected static TckTModel tckTModel01 = null;
- protected static TckTModel tckTModel02 = null;
+ protected static TckBusiness tckBusiness = null;
- protected static TckBusiness tckBusiness1 = null;
- protected static TckBusiness tckBusiness2 = null;
protected static String authInfoJoe = null;
private static UDDIInquiryPortType inquiry = null;
@@ -101,10 +98,7 @@ public class UDDI_120_CombineCategoryBag
inquiry = transport.getUDDIInquiryService();
tckTModel = new TckTModel(publication, inquiry);
- tckTModel01 = new TckTModel(publication, inquiry);
- tckTModel02 = new TckTModel(publication, inquiry);
- tckBusiness1 = new TckBusiness(publication, inquiry);
- tckBusiness2 = new TckBusiness(publication, inquiry);
+ tckBusiness = new TckBusiness(publication, inquiry);
} catch (Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
@@ -112,29 +106,28 @@ public class UDDI_120_CombineCategoryBag
}
@Test
- public void tompublisher() {
+ public void findServiceByCategoryBag() {
try {
tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
- tckTModel01.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
- tckTModel02.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
- tckBusiness1.saveBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
- tckBusiness2.saveBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS5_XML, TOM_BUSINESS5_KEY, 1);
try {
int size = 0;
ServiceList sl = null;
FindService fs = new FindService();
- FindQualifiers fqs = new FindQualifiers();
- fqs.getFindQualifier().add("combineCategoryBags");
- fs.setFindQualifiers(fqs);
-
- KeyedReference keyRef1 = new KeyedReference();
- keyRef1.setTModelKey(TOM_PUBLISHER_TMODEL01_KEY);
- keyRef1.setKeyValue("value-z");
-
- KeyedReference keyRef2 = new KeyedReference();
- keyRef2.setTModelKey(TOM_PUBLISHER_TMODEL02_KEY);
+
+ //by default keys are ADD, we should only find service 5
+ KeyedReference keyRef1 = new KeyedReference();
+ keyRef1.setTModelKey(TOM_PUBLISHER_TMODEL01_KEY);
+ keyRef1.setKeyValue("value-z");
+
+ KeyedReference keyRef2 = new KeyedReference();
+ keyRef2.setTModelKey(TOM_PUBLISHER_TMODEL02_KEY);
keyRef2.setKeyValue("value-x");
CategoryBag cb = new CategoryBag();
@@ -144,18 +137,18 @@ public class UDDI_120_CombineCategoryBag
sl = inquiry.findService(fs);
if (sl.getServiceInfos() == null) {
- Assert.fail("Should have found one entry on FindBusiness with TModelBag, "
- + "found " + size);
+ Assert.fail("Should have found one entry on FindService with TModelBag, "
+ + "found " + size);
}
size = sl.getServiceInfos().getServiceInfo().size();
if (size != 1) {
- Assert.fail("Should have found one entry on FindBusiness with TModelBag, "
+ Assert.fail("Should have found one entry on FindService with TModelBag, "
+ "found " + size);
} else {
- List<ServiceInfo> siList = sl.getServiceInfos().getServiceInfo();
+ List<ServiceInfo> siList = sl.getServiceInfos().getServiceInfo();
String serviceKey = siList.get(0).getServiceKey();
- if (!SERVICE_KEY.equals(serviceKey)) {
- Assert.fail("Should have found service key " + SERVICE_KEY
+ if (!SERVICE_KEY5.equals(serviceKey)) {
+ Assert.fail("Should have found service key " + SERVICE_KEY5
+ " but found [" + serviceKey + "]");
}
}
@@ -164,13 +157,118 @@ public class UDDI_120_CombineCategoryBag
Assert.fail(e.getMessage());
}
} finally {
- tckBusiness1.deleteBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
- tckBusiness2.deleteBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS5_XML, TOM_BUSINESS5_KEY, 1);
tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
- tckTModel01.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
- tckTModel02.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+ }
+ }
+
+ @Test
+ public void findNoServiceByCategoryBag() {
+ try {
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS5_XML, TOM_BUSINESS5_KEY, 1);
+ try {
+ int size = 0;
+ ServiceList sl = null;
+
+ FindService fs = new FindService();
+
+ //by default keys are ADD, we should only find service 5
+ KeyedReference keyRef1 = new KeyedReference();
+ keyRef1.setTModelKey(TOM_PUBLISHER_TMODEL01_KEY);
+ keyRef1.setKeyValue("value-y");
+
+ CategoryBag cb = new CategoryBag();
+ cb.getKeyedReference().add(keyRef1);
+ fs.setCategoryBag(cb);
+
+ sl = inquiry.findService(fs);
+ if (sl.getServiceInfos() != null) {
+ Assert.fail("Should have found no entries on FindService, "
+ + " found " + size);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ }
+ } finally {
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS5_XML, TOM_BUSINESS5_KEY, 1);
+
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+ }
+ }
+ /*
+ * For a combinedCategoryBag, we find a service if either the categoryBag on the service
+ * matches, or one of the categoryBags on the bindings.
+ */
+ @Test
+ public void findServiceByCombinedCategoryBag() {
+ try {
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.saveTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
+
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.saveBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+ try {
+ int size = 0;
+ ServiceList sl = null;
+ FindService fs = new FindService();
+ FindQualifiers fqs = new FindQualifiers();
+ fqs.getFindQualifier().add(UDDIConstants.COMBINE_CATEGORY_BAGS);
+ fs.setFindQualifiers(fqs);
+
+ KeyedReference keyRef1 = new KeyedReference();
+ keyRef1.setTModelKey(TOM_PUBLISHER_TMODEL01_KEY);
+ keyRef1.setKeyValue("value-y");
+
+ CategoryBag cb = new CategoryBag();
+ cb.getKeyedReference().add(keyRef1);
+ fs.setCategoryBag(cb);
+
+ sl = inquiry.findService(fs);
+ if (sl.getServiceInfos() == null) {
+ Assert.fail("Should have found one entry on FindService with TModelBag, "
+ + "found " + size);
+ }
+ size = sl.getServiceInfos().getServiceInfo().size();
+ if (size != 1) {
+ Assert.fail("Should have found one entry on FindService with TModelBag, "
+ + "found " + size);
+ } else {
+ List<ServiceInfo> siList = sl.getServiceInfos().getServiceInfo();
+ String serviceKey = siList.get(0).getServiceKey();
+ if (!SERVICE_KEY1.equals(serviceKey)) {
+ Assert.fail("Should have found service key " + SERVICE_KEY1
+ + " but found [" + serviceKey + "]");
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ }
+ } finally {
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS1_XML, TOM_BUSINESS1_KEY, 1);
+ tckBusiness.deleteBusinesses(authInfoJoe, TOM_BUSINESS2_XML, TOM_BUSINESS2_KEY, 1);
+
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL_XML, TOM_PUBLISHER_TMODEL_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL01_XML, TOM_PUBLISHER_TMODEL01_KEY);
+ tckTModel.deleteTModel(authInfoJoe, TOM_PUBLISHER_TMODEL02_XML, TOM_PUBLISHER_TMODEL02_KEY);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org