[jbossws-commits] JBossWS SVN: r16753 - in stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Sep 24 08:27:59 EDT 2012
Author: richard.opalka at jboss.com
Date: 2012-09-24 08:27:59 -0400 (Mon, 24 Sep 2012)
New Revision: 16753
Removed:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
Modified:
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
Log:
removing last remaining JAXWS bits
Deleted: stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java
===================================================================
--- stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2012-09-21 15:48:32 UTC (rev 16752)
+++ stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaDataJAXWS.java 2012-09-24 12:27:59 UTC (rev 16753)
@@ -1,111 +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.metadata.umdm;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-
-/**
- * The JAXWS metdata data for a handler element
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class HandlerMetaDataJAXWS extends HandlerMetaData
-{
- private static final long serialVersionUID = 7631133188974299826L;
-
- // The JAXWS service name pattern
- private QName serviceNamePattern;
- // The JAXWS port name pattern
- private QName portNamePattern;
- // The JAXWS protocol bindings
- private String protocolBindings;
-
- public static HandlerMetaDataJAXWS newInstance(UnifiedHandlerMetaData uhmd, HandlerType type)
- {
- HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(type);
- hmd.setHandlerName(uhmd.getHandlerName());
- hmd.setHandlerClassName(uhmd.getHandlerClass());
- hmd.setInitParams(uhmd.getInitParams());
- UnifiedHandlerChainMetaData handlerChain = uhmd.getHandlerChain();
- if (handlerChain != null)
- {
- hmd.setProtocolBindings(handlerChain.getProtocolBindings());
- hmd.setServiceNamePattern(handlerChain.getServiceNamePattern());
- hmd.setPortNamePattern(handlerChain.getPortNamePattern());
- }
- return hmd;
- }
-
- public HandlerMetaDataJAXWS(HandlerType type)
- {
- super(type);
- }
-
- public QName getPortNamePattern()
- {
- return portNamePattern;
- }
-
- public void setPortNamePattern(QName portNamePattern)
- {
- this.portNamePattern = portNamePattern;
- }
-
- public String getProtocolBindings()
- {
- return protocolBindings;
- }
-
- public void setProtocolBindings(String protocolBindings)
- {
- this.protocolBindings = protocolBindings;
- }
-
- public QName getServiceNamePattern()
- {
- return serviceNamePattern;
- }
-
- public void setServiceNamePattern(QName serviceNamePattern)
- {
- this.serviceNamePattern = serviceNamePattern;
- }
-
- public String toString()
- {
- StringBuilder buffer = new StringBuilder("\nHandlerMetaDataJAXWS:");
- buffer.append("\n type=" + getHandlerType());
- buffer.append("\n name=" + getHandlerName());
- buffer.append("\n class=" + getHandlerClass());
- buffer.append("\n params=" + getInitParams());
- buffer.append("\n protocols=" + getProtocolBindings());
- buffer.append("\n services=" + getServiceNamePattern());
- buffer.append("\n ports=" + getPortNamePattern());
- return buffer.toString();
- }
-
-}
Modified: stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java
===================================================================
--- stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2012-09-21 15:48:32 UTC (rev 16752)
+++ stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2012-09-24 12:27:59 UTC (rev 16753)
@@ -78,9 +78,6 @@
private String wsdlFile;
private URL mappingLocation;
private String wsdlPublishLocation;
-
- // The optional service handlers
- private List<HandlerMetaDataJAXWS> handlers = new ArrayList<HandlerMetaDataJAXWS>();
// The type mapping that is maintained by this service
private TypesMetaData types;
@@ -183,16 +180,6 @@
return types;
}
- public void addHandler(HandlerMetaDataJAXWS handler)
- {
- handlers.add(handler);
- }
-
- public List<HandlerMetaDataJAXWS> getHandlerMetaData()
- {
- return Collections.unmodifiableList(handlers);
- }
-
public List<EndpointMetaData> getEndpoints()
{
return new ArrayList<EndpointMetaData>(endpoints.values());
Modified: stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2012-09-21 15:48:32 UTC (rev 16752)
+++ stack/native/branches/ropalka_JBWS-3550/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2012-09-24 12:27:59 UTC (rev 16753)
@@ -23,7 +23,7 @@
import static org.jboss.ws.common.integration.WSHelper.isJaxrpcEjbDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJaxrpcJseDeployment;
-import static org.jboss.ws.common.integration.WSHelper.isJaxwsDeployment;
+import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment;
import java.util.ResourceBundle;
@@ -50,15 +50,16 @@
@Override
public void start(Deployment dep)
{
+ if (!isJaxrpcDeployment(dep)) return;
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
{
- if (isJaxrpcJseDeployment(dep) && !isJaxwsDeployment(dep))
+ if (isJaxrpcJseDeployment(dep))
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
umd = builder.buildMetaData((ArchiveDeployment)dep);
}
- else if (isJaxrpcEjbDeployment(dep) && !isJaxwsDeployment(dep))
+ else if (isJaxrpcEjbDeployment(dep))
{
JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder();
umd = builder.buildMetaData((ArchiveDeployment)dep);
More information about the jbossws-commits
mailing list