[jbossws-commits] JBossWS SVN: r1689 - in branches/tdiesler/trunk/integration-jboss42: . src/main/java/org/jboss/ws/integration/jboss42

Author: thomas.diesler(a)jboss.com Date: 2006-12-21 08:46:51 -0500 (Thu, 21 Dec 2006) New Revision: 1689 Added: branches/tdiesler/trunk/integration-jboss42/.classpath branches/tdiesler/trunk/integration-jboss42/.project Removed: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java Log: partial commit Added: branches/tdiesler/trunk/integration-jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-21 13:46:46 UTC (rev 1688) +++ branches/tdiesler/trunk/integration-jboss42/.classpath 2006-12-21 13:46:51 UTC (rev 1689) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> + <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/concurrent.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/hibernate3.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/javassist.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jaxb-api.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jaxb-impl.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jaxb-xjc.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-container.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-deployers.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/junit.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/log4j.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/mailapi.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/resolver.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/serializer.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/xml-apis.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Added: branches/tdiesler/trunk/integration-jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration-jboss42/.project 2006-12-21 13:46:46 UTC (rev 1688) +++ branches/tdiesler/trunk/integration-jboss42/.project 2006-12-21 13:46:51 UTC (rev 1689) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>integration-jboss42</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 13:46:46 UTC (rev 1688) +++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBoss42ServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689) @@ -24,8 +24,6 @@ // $Id$ import java.net.URL; -import java.util.HashSet; -import java.util.Set; import javax.management.MBeanServer; @@ -37,10 +35,6 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.ws.core.server.ServiceEndpointPublisher; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; /** * Publish the HTTP service endpoint to Tomcat @@ -75,25 +69,6 @@ return "OK"; } - public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi) - { - Set<String> links = new HashSet<String>(); - - UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); - - for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) - { - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; - links.add(sepMetaData.getLinkName()); - - } - } - - return links; - } - private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException { MBeanServer server = MBeanServerLocator.locateJBoss(); Deleted: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 13:46:46 UTC (rev 1688) +++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/JBossServiceEndpointPublisher.java 2006-12-21 13:46:51 UTC (rev 1689) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.integration.jboss42; - -// $Id$ - -import java.net.URL; -import java.util.HashSet; -import java.util.Set; - -import javax.management.MBeanServer; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.MainDeployerMBean; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; - -/** - * Publish the HTTP service endpoint to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class JBossServiceEndpointPublisher extends ServiceEndpointPublisher -{ - - public String publishServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception - { - URL warURL = udi.localUrl; - DeploymentInfo di = (DeploymentInfo)udi.context.get(DeploymentInfo.class.getName()); - if (di == null) - throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); - - rewriteWebXml(udi); - - // Preserve the repository config - DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - auxdi.repositoryConfig = di.getTopRepositoryConfig(); - getMainDeployer().deploy(auxdi); - return "OK"; - } - - public String destroyServiceEndpoint(UnifiedDeploymentInfo udi) throws Exception - { - getMainDeployer().undeploy(udi.localUrl); - return "OK"; - } - - public Set<String> getWebServiceServletLinks(UnifiedDeploymentInfo udi) - { - Set<String> links = new HashSet<String>(); - - UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); - - for (ServiceMetaData serviceMetaData : wsMetaData.getServices()) - { - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData; - links.add(sepMetaData.getLinkName()); - - } - } - - return links; - } - - private MainDeployerMBean getMainDeployer() throws MBeanProxyCreationException - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - MainDeployerMBean mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); - return mainDeployer; - } -} Modified: branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2006-12-21 13:46:46 UTC (rev 1688) +++ branches/tdiesler/trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2006-12-21 13:46:51 UTC (rev 1689) @@ -27,12 +27,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import org.jboss.metadata.WebMetaData; import org.jboss.metadata.WebSecurityMetaData; import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; @@ -51,10 +49,8 @@ UnifiedWebMetaData umd = new UnifiedWebMetaData(); umd.setContextRoot(wmd.getContextRoot()); umd.setServletMappings(wmd.getServletMappings()); - umd.setServletClassMap(wmd.getServletClassMap()); umd.setConfigName(wmd.getConfigName()); umd.setConfigFile(wmd.getConfigFile()); - umd.setContextLoader(wmd.getContextLoader()); umd.setSecurityDomain(wmd.getSecurityDomain()); umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));