[jbossws-commits] JBossWS SVN: r15390 - in common/trunk/src/main/java/org/jboss/ws/common: deployment and 2 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:33:48 -0500 (Thu, 15 Dec 2011) New Revision: 15390 Removed: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java Log: [JBWS-3393] Remove support for AS 6 target container Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -22,7 +22,6 @@ package org.jboss.ws.common; import javax.xml.namespace.QName; -import javax.xml.soap.Name; import javax.xml.soap.SOAPConstants; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -25,7 +25,6 @@ import java.net.URL; import java.util.List; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.ResourceResolver; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; @@ -43,8 +42,6 @@ // The root file for this deployment private UnifiedVirtualFile rootFile; - private static Logger log = Logger.getLogger(ArchiveDeploymentImpl.class); - private List<UnifiedVirtualFile> metadataFiles; ArchiveDeploymentImpl(String simpleName, ClassLoader classLoader) Deleted: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.deployment; - -import java.util.ResourceBundle; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.ResourceLoaderAdapter; -import org.jboss.ws.common.integration.AbstractDeploymentAspect; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.HttpEndpoint; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * A deployment aspect for JAXWS Endpoint API endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 31-Jul-2007 - */ -// TODO: [JBWS-2674] review this deployment aspect once AS IL is rewritten -public class EndpointAPIDeploymentAspect extends AbstractDeploymentAspect -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointAPIDeploymentAspect.class); - @Override - public void start(Deployment dep) - { - - if (dep instanceof ArchiveDeployment) - { - ArchiveDeployment arc = (ArchiveDeployment)dep; - UnifiedVirtualFile rootFile = arc.getRootFile(); - if (rootFile == null) - { - rootFile = new ResourceLoaderAdapter(dep.getInitialClassLoader()); - arc.setRootFile(rootFile); - } - } - - ClassLoader rtcl = dep.getRuntimeClassLoader(); - if (rtcl == null) - { - // TODO: What's this? Look's quiet hacky... - log.warn(BundleUtils.getMessage(bundle, "USING_INITAL_CLASS_LAODER_AS_RUNTIME_LAODER"), new IllegalArgumentException()); - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - } - - for (Endpoint ep : dep.getService().getEndpoints()) - { - if (ep.getShortName() == null) - { - String name = ep.getTargetBeanName(); - String shortName = name.substring(name.lastIndexOf('.') + 1); - ep.setShortName(shortName); - } - - if (((HttpEndpoint)ep).getURLPattern() == null) - { - ((HttpEndpoint)ep).setURLPattern("/*"); - } - } - } -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.integration; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; - -/** - * JMS deployment aspect. - * - * @author <a href="mailto:ema@redhat.com">Jim Ma</a> - */ -public class JMSDeploymentAspect extends AbstractDeploymentAspect -{ - @Override - public boolean canHandle(final Deployment dep) - { - return this.isForJaxWs() && dep.getAttachment(JMSEndpointsMetaData.class) != null; - } -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,226 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.common.management; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URL; -import java.util.Set; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointMetrics; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * The servlet that that is associated with context /jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2005 - */ -public class ContextServlet extends HttpServlet -{ - // provide logging - protected final Logger log = Logger.getLogger(ContextServlet.class); - - protected EndpointRegistry epRegistry; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - } - - /** Process GET requests. - */ - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - res.setContentType("text/html"); - - writer.print("<html>"); - setupHTMLResponseHeader(writer); - - URL requestURL = new URL(req.getRequestURL().toString()); - - writer.print("<body>"); - - writer.print("<div class='pageHeader'>JBossWS/Services</div>"); - writer.print("<div class='pageSection'>"); - writer.print("<fieldset>"); - writer.print("<legend><b>Registered Service Endpoints</b></legend>"); - writer.print("<table>"); - - // begin iteration - Set<ObjectName> epNames = epRegistry.getEndpoints(); - - if (epNames.isEmpty()) - { - writer.print("<tr>"); - writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>"); - writer.print("</tr>"); - } - - for (ObjectName oname : epNames) - { - Endpoint ep = epRegistry.getEndpoint(oname); - - writer.print("<tr>"); - writer.print(" <td>Endpoint Name</td>"); - writer.print(" <td>" + ep.getName() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>Endpoint Address</td>"); - writer.print(" <td>" + getAddressHtmlTag(requestURL, ep) + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td colspan=2>"); - writer.print(" "); - writer.print(""); - - EndpointMetrics metrics = ep.getEndpointMetrics(); - if (metrics != null) - { - writer.print("<table class='metrics'>"); - writer.print("<tr>"); - writer.print(" <td>StartTime</td>"); - writer.print(" <td>StopTime</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getStartTime() + "</td>"); - - String stopTime = metrics.getStopTime() != null ? metrics.getStopTime().toString() : ""; - writer.print(" <td>" + stopTime + "</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - - writer.print(" <td>RequestCount</td>"); - writer.print(" <td>ResponseCount</td>"); - writer.print(" <td>FaultCount</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getRequestCount() + "</td>"); - writer.print(" <td>" + metrics.getResponseCount() + "</td>"); - writer.print(" <td>" + metrics.getFaultCount() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>MinProcessingTime</td>"); - writer.print(" <td>MaxProcessingTime</td>"); - writer.print(" <td>AvgProcessingTime</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getMinProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getMaxProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getAverageProcessingTime() + "</td>"); - writer.print("</tr>"); - writer.print(""); - writer.print(""); - writer.print("</table>"); - writer.print(""); - } - - writer.print(" </td>"); - writer.print("</tr>"); - - writer.print("<tr><td colspan='3'>&nbsp;</td></tr>"); - } - // end iteration - writer.print("</table>"); - writer.print(""); - writer.print("</fieldset>"); - writer.print("</div>"); - - writer.print("</body>"); - writer.print("</html>"); - writer.close(); - } - - private void setupHTMLResponseHeader(PrintWriter writer) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - writer.println("<head>"); - writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); - writer.println("<title>JBossWS / " + serverConfig.getImplementationVersion() + "</title>"); - writer.println("<link rel='stylesheet' href='./styles.css'>"); - writer.println("</head>"); - } - - private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException - { - String address = createAddress(requestURL, ep.getAddress()); - - if (address.startsWith("jms")) - { - return ep.getAddress(); - } - - StringBuilder sb = new StringBuilder("<a href='"); - sb.append(address); - sb.append("?wsdl'>"); - sb.append(address); - sb.append("</a>"); - return sb.toString(); - } - - private String createAddress(final URL requestURL, final String endpointAddress) throws IOException - { - String address = endpointAddress; - if (address.contains(ServerConfig.UNDEFINED_HOSTNAME)) - { - URL internalAddress = new URL(address); - - String protocol = requestURL.getProtocol(); - String host = requestURL.getHost(); - int port = requestURL.getPort(); - String path = internalAddress.getPath(); - - if (port > -1) - { - address = new URL(protocol, host, port, path).toString(); - } - else - { - address = new URL(protocol, host, path).toString(); - } - } - - return address; - } - -}