[jboss-svn-commits] JBL Code SVN: r30616 - labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 11 16:29:27 EST 2009
Author: dward
Date: 2009-12-11 16:29:27 -0500 (Fri, 11 Dec 2009)
New Revision: 30616
Modified:
labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/contract.jsp
labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/index.jsp
Log:
Fix for JBESB-2913
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/contract.jsp
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/contract.jsp 2009-12-11 17:01:19 UTC (rev 30615)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/contract.jsp 2009-12-11 21:29:27 UTC (rev 30616)
@@ -1,92 +1,97 @@
-<%@ page import="java.util.List" %>
-<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
-<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
-<%@ page import="org.jboss.soa.esb.services.registry.ServiceNotFoundException" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
-<%@ page import="java.net.URI" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractInfo" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ServletContractPublisher" %>
-<%@ page import="org.jboss.soa.esb.Service" %>
-<%
- Registry registry = RegistryFactory.getRegistry();
- String targetServiceCat = request.getParameter("serviceCat");
- String targetServiceName = request.getParameter("serviceName");
- String targetProtocol = request.getParameter("protocol");
- final Service service = new Service(targetServiceCat, targetServiceName) ;
-
- final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
- ContractInfo contractInfo = null;
- String contractData = "";
-
- List eprs;
- try {
- eprs = (List) registry.findEPRs(targetServiceCat, targetServiceName);
- } catch (ServiceNotFoundException e) {
+<%@ page import="java.util.List" %>
+<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
+<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
+<%@ page import="org.jboss.soa.esb.services.registry.ServiceNotFoundException" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractInfo" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ServletContractPublisher" %>
+<%@ page import="org.jboss.soa.esb.Service" %>
+<%
+ Registry registry = RegistryFactory.getRegistry();
+ String targetServiceCat = request.getParameter("serviceCat");
+ String targetServiceName = request.getParameter("serviceName");
+ String targetProtocol = request.getParameter("protocol");
+ final Service service = new Service(targetServiceCat, targetServiceName) ;
+
+ final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
+ ContractInfo contractInfo = null;
+ String contractData = "";
+
+ List eprs;
+ if (targetProtocol == null || !targetProtocol.toLowerCase().startsWith("http")) {
// ignore for now - just return an empty list
eprs = new ArrayList();
- } catch (RegistryException e) {
- // ignore for now - just return an empty list
- eprs = new ArrayList();
- }
-
- EPR contractPublisherEPR = null ;
- for (int ii = 0; ii < eprs.size(); ii++) {
- EPR epr = (EPR) eprs.get(ii);
- URI eprURI = URI.create(epr.getAddr().getAddress());
- String protocol = eprURI.getScheme();
-
- if (protocol.equalsIgnoreCase(targetProtocol)) {
- contractPublisherEPR = epr ;
- break;
- }
- }
-
- for (ServicePublisher servicePublisher: servicePublishers) {
-
- if (contractPublisherEPR != null) {
- final ContractPublisher contractPublisher = servicePublisher.getContractPublisher() ;
- if (contractPublisher == null) {
- continue;
- }
-
- if(contractPublisher instanceof ServletContractPublisher) {
- contractInfo = ((ServletContractPublisher)contractPublisher).getContractInfo(contractPublisherEPR, request);
- } else {
- contractInfo = contractPublisher.getContractInfo(contractPublisherEPR);
- }
-
- if (contractInfo != null) {
+ } else {
+ try {
+ eprs = (List) registry.findEPRs(targetServiceCat, targetServiceName);
+ } catch (ServiceNotFoundException e) {
+ // ignore for now - just return an empty list
+ eprs = new ArrayList();
+ } catch (RegistryException e) {
+ // ignore for now - just return an empty list
+ eprs = new ArrayList();
+ }
+ }
+
+ EPR contractPublisherEPR = null ;
+ for (int ii = 0; ii < eprs.size(); ii++) {
+ EPR epr = (EPR) eprs.get(ii);
+ URI eprURI = URI.create(epr.getAddr().getAddress());
+ String protocol = eprURI.getScheme();
+
+ if (protocol.equalsIgnoreCase(targetProtocol)) {
+ contractPublisherEPR = epr ;
+ break;
+ }
+ }
+
+ for (ServicePublisher servicePublisher: servicePublishers) {
+
+ if (contractPublisherEPR != null) {
+ final ContractPublisher contractPublisher = servicePublisher.getContractPublisher() ;
+ if (contractPublisher == null) {
+ continue;
+ }
+
+ if(contractPublisher instanceof ServletContractPublisher) {
+ contractInfo = ((ServletContractPublisher)contractPublisher).getContractInfo(contractPublisherEPR, request);
+ } else {
+ contractInfo = contractPublisher.getContractInfo(contractPublisherEPR);
+ }
+
+ if (contractInfo != null) {
contractData = contractInfo.getData();
- if (contractData != null) {
+ if (contractData != null) {
response.setContentType(contractInfo.getMimeType());
- }
- }
+ }
+ }
if (contractData == null) {
- contractData = "<Unavailable/>";
- response.setContentType("text/xml");
- }
- break ;
- } else {
- final Publisher publisher = servicePublisher.getPublisher() ;
- if (publisher instanceof ContractReferencePublisher) {
- final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
- final URI serviceURI = contractReferencePublisher.getServiceURI() ;
- if (serviceURI.getScheme().equalsIgnoreCase(targetProtocol)) {
- response.sendRedirect(contractReferencePublisher.getServiceContractURI().toString()) ;
- return ;
- }
- }
- }
- }
- // JBESB-1547 - Contract console should generate HTTP 404 when asking for non-deployed service WSDL
+ // will trigger HttpServletResponse.SC_NOT_FOUND below
+ contractPublisherEPR = null;
+ }
+ break ;
+ } else {
+ final Publisher publisher = servicePublisher.getPublisher() ;
+ if (publisher instanceof ContractReferencePublisher) {
+ final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
+ final URI serviceURI = contractReferencePublisher.getServiceURI() ;
+ if (serviceURI.getScheme().equalsIgnoreCase(targetProtocol)) {
+ response.sendRedirect(contractReferencePublisher.getServiceContractURI().toString()) ;
+ return ;
+ }
+ }
+ }
+ }
+ // JBESB-1547 - Contract console should generate HTTP 404 when asking for non-deployed service WSDL
if (contractPublisherEPR == null) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
- return;
+ return;
}
%><%=contractData%>
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/contract.jsp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/index.jsp
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/index.jsp 2009-12-11 17:01:19 UTC (rev 30615)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/index.jsp 2009-12-11 21:29:27 UTC (rev 30616)
@@ -1,103 +1,103 @@
-<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
-<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
-<%@ page import="java.net.URI" %>
-<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
+<%@ page import="org.jboss.soa.esb.listeners.config.ServicePublisher" %>
+<%@ page import="java.util.List" %>
+<%@ page import="org.jboss.soa.esb.services.registry.Registry" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryFactory" %>
+<%@ page import="org.jboss.soa.esb.addressing.EPR" %>
+<%@ page import="java.net.URI" %>
+<%@ page import="org.jboss.soa.esb.services.registry.RegistryException" %>
<%@ page import="java.util.ArrayList" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
-<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
-<%@ page import="org.jboss.soa.esb.Service" %>
-<html>
-<head>
- <title>JBoss ESB - Service List</title>
- <link rel='stylesheet' href='./styles.css'>
-</head>
-<body>
-
-<div class="pageSection">
-<h2>JBoss ESB Service Deployments</h2>
-</div>
-
-<div class="pageSection">
- <%
- List<Service> services = ServicePublisher.getServices();
- Registry registry = RegistryFactory.getRegistry();
-
- for (Service service: services) {
- String serviceCategory = service.getCategory();
- String serviceName = service.getName();
-
- final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
- if ((servicePublishers != null) && (servicePublishers.size() > 0)) {
- %>
- <fieldset>
- <legend><b><%=service%></b></legend>
- <%=servicePublishers.get(0).getDescription()%>
- <%
- for(ServicePublisher servicePublisher: servicePublishers) {
- final Publisher publisher = servicePublisher.getPublisher() ;
- if (!(publisher instanceof ContractReferencePublisher)) {
- List eprs;
-
- try {
- eprs = (List) registry.findEPRs(serviceCategory, serviceName);
- } catch (Exception e) {
- // ignore for now - just return an empty list
- eprs = new ArrayList();
- }
- for (int ii = 0; ii < eprs.size(); ii++) {
- EPR epr = (EPR) eprs.get(ii);
- URI eprURI = URI.create(epr.getAddr().getAddress());
- String protocol = eprURI.getScheme();
- String relContractURI = "contract.jsp?serviceCat=" + serviceCategory + "&serviceName=" + serviceName + "&protocol=" + protocol;
- %>
- <fieldset>
- <legend><b><%=protocol.toUpperCase()%></b></legend>
-
- <ul>
- <li><b>Endpoint</b>: <%=eprURI%></li>
- <%
- if(publisher != null) {
- URI thisPage = URI.create(request.getRequestURL().toString());
- URI contractURI = thisPage.resolve(relContractURI);
- %>
- <li><b>Contract</b>: <a href="<%=relContractURI%>"><%=contractURI%></a></li>
- <%
- } else {
- %>
- <li><b>Contract</b>: Unavailable</li>
- <%
- }
- %>
- </ul>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractPublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.ContractReferencePublisher" %>
+<%@ page import="org.jboss.internal.soa.esb.publish.Publisher" %>
+<%@ page import="org.jboss.soa.esb.Service" %>
+<html>
+<head>
+ <title>JBoss ESB - Service List</title>
+ <link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class="pageSection">
+<h2>JBoss ESB Service Deployments</h2>
+</div>
+
+<div class="pageSection">
+ <%
+ List<Service> services = ServicePublisher.getServices();
+ Registry registry = RegistryFactory.getRegistry();
+
+ for (Service service: services) {
+ String serviceCategory = service.getCategory();
+ String serviceName = service.getName();
+
+ final List<ServicePublisher> servicePublishers = ServicePublisher.getServicePublishers(service) ;
+ if ((servicePublishers != null) && (servicePublishers.size() > 0)) {
+ %>
+ <fieldset>
+ <legend><b><%=service%></b></legend>
+ <%=servicePublishers.get(0).getDescription()%>
+ <%
+ for(ServicePublisher servicePublisher: servicePublishers) {
+ final Publisher publisher = servicePublisher.getPublisher() ;
+ if (!(publisher instanceof ContractReferencePublisher)) {
+ List eprs;
+
+ try {
+ eprs = (List) registry.findEPRs(serviceCategory, serviceName);
+ } catch (Exception e) {
+ // ignore for now - just return an empty list
+ eprs = new ArrayList();
+ }
+ for (int ii = 0; ii < eprs.size(); ii++) {
+ EPR epr = (EPR) eprs.get(ii);
+ URI eprURI = URI.create(epr.getAddr().getAddress());
+ String protocol = eprURI.getScheme();
+ String relContractURI = "contract.jsp?serviceCat=" + serviceCategory + "&serviceName=" + serviceName + "&protocol=" + protocol;
+ %>
+ <fieldset>
+ <legend><b><%=protocol.toUpperCase()%></b></legend>
+
+ <ul>
+ <li><b>Endpoint</b>: <%=eprURI%></li>
+ <%
+ if(publisher != null && protocol.toLowerCase().startsWith("http")) {
+ URI thisPage = URI.create(request.getRequestURL().toString());
+ URI contractURI = thisPage.resolve(relContractURI);
+ %>
+ <li><b>Contract</b>: <a href="<%=relContractURI%>"><%=contractURI%></a></li>
+ <%
+ } else {
+ %>
+ <li><b>Contract</b>: Unavailable</li>
+ <%
+ }
+ %>
+ </ul>
</fieldset>
- <%
- }
- } else {
- final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
- final URI serviceURI = contractReferencePublisher.getServiceURI() ;
- final URI serviceContractURI = contractReferencePublisher.getServiceContractURI() ;
+ <%
+ }
+ } else {
+ final ContractReferencePublisher contractReferencePublisher = (ContractReferencePublisher)publisher ;
+ final URI serviceURI = contractReferencePublisher.getServiceURI() ;
+ final URI serviceContractURI = contractReferencePublisher.getServiceContractURI() ;
%>
- <fieldset>
- <legend><b><%=serviceURI.getScheme().toUpperCase()%></b></legend>
-
- <ul>
- <li><b>Endpoint</b>: <%=serviceURI%></li>
- <li><b>Contract</b>: <a href="<%=serviceContractURI%>"><%=serviceContractURI%></a></li>
- </ul>
+ <fieldset>
+ <legend><b><%=serviceURI.getScheme().toUpperCase()%></b></legend>
+
+ <ul>
+ <li><b>Endpoint</b>: <%=serviceURI%></li>
+ <li><b>Contract</b>: <a href="<%=serviceContractURI%>"><%=serviceContractURI%></a></li>
+ </ul>
</fieldset>
- <%
- }
- }
- %>
- </fieldset>
- <%
- }
- }
- %>
-</div>
-</body>
-</html>
+ <%
+ }
+ }
+ %>
+ </fieldset>
+ <%
+ }
+ }
+ %>
+</div>
+</body>
+</html>
Property changes on: labs/jbossesb/branches/JBESB_4_7_CP/product/contract-web/src/main/webapp/index.jsp
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the jboss-svn-commits
mailing list