JBossWS SVN: r12615 - spi/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 07:08:47 -0400 (Fri, 09 Jul 2010)
New Revision: 12615
Removed:
spi/branches/jms-integration/
Log:
[JBWS-3086] removing obsolete branch
15 years, 10 months
JBossWS SVN: r12614 - in container/jboss60/branches/jbossws-jboss600M3: src/main/java/org/jboss/webservices/integration/deployers and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 07:04:05 -0400 (Fri, 09 Jul 2010)
New Revision: 12614
Added:
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java
Modified:
container/jboss60/branches/jbossws-jboss600M3/pom.xml
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss60/branches/jbossws-jboss600M3/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-3086] merging JMS CXF prototype upstream + some refactorings on DD parsers - see processor classes
Modified: container/jboss60/branches/jbossws-jboss600M3/pom.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/pom.xml 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/pom.xml 2010-07-09 11:04:05 UTC (rev 12614)
@@ -130,6 +130,11 @@
<artifactId>hornetq-jms-client</artifactId>
<version>${jboss.hornetq.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${jboss.hornetq.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -211,6 +216,10 @@
<artifactId>hornetq-jms-client</artifactId>
</dependency>
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
</dependency>
Added: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -0,0 +1,79 @@
+/*
+ * 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.webservices.integration.deployers;
+
+import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.vfs.VFSInputSource;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.wsf.spi.metadata.DescriptorProcessor;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.xml.sax.InputSource;
+
+/**
+ * Abstract descriptor deployer.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractDescriptorDeployer<P extends DescriptorProcessor<T>, T> extends ObjectModelFactoryDeployer<T>
+{
+ private P ddProcessor;
+
+ AbstractDescriptorDeployer(Class<T> output)
+ {
+ super(output);
+ this.setName("UNSPECIFIED");
+ this.setUseSchemaValidation(false);
+ }
+
+ @Override
+ protected T parse(final VFSDeploymentUnit unit, final VirtualFile file, final T root) throws Exception
+ {
+ if (this.ddProcessor != null)
+ {
+ InputSource source = new VFSInputSource(file);
+ ObjectModelFactory factory = this.ddProcessor.getFactory(file.toURL());
+ return getHelper().parse(source, root, factory);
+ }
+
+ return null;
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time subclass specific DescriptorProcessor bean will be installed.
+ */
+ protected void setProcessor(final P ddProcessor)
+ {
+ if (this.ddProcessor != null)
+ throw new IllegalStateException("Only one " + this.ddProcessor.getClass() + " instance can be installed in MC");
+
+ this.ddProcessor = ddProcessor;
+ this.setName(this.ddProcessor.getDescriptorName());
+ this.setUseSchemaValidation(this.ddProcessor.isValidating());
+ }
+
+ @Override
+ protected ObjectModelFactory getObjectModelFactory(final T root)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Added: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -0,0 +1,51 @@
+/*
+ * 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.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.jms.JMSDescriptorProcessor;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+/**
+ * Stack agnostic JMS descriptor deployer.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorProcessor, JMSEndpointsMetaData>
+{
+ /**
+ * Constructor.
+ */
+ public JMSDescriptorDeployer()
+ {
+ super(JMSEndpointsMetaData.class);
+ }
+
+ /**
+ * MC incallback method. It will be invoked each time JMSDescriptorProcessor bean will be installed.
+ * @param processor the processor
+ */
+ @Override
+ public void setProcessor(final JMSDescriptorProcessor processor)
+ {
+ super.setProcessor(processor);
+ }
+}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -23,11 +23,13 @@
import java.util.Set;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -56,15 +58,29 @@
WSDeploymentAspectDeployer(final DeploymentAspect aspect)
{
super();
-
- // inputs
- this.addInput(JBossWebMetaData.class);
- this.addInput(Deployment.class);
- if (aspect.isLast())
+ if (aspect instanceof JMSDeploymentAspect)
{
- this.addInput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ // inputs
+ this.addInput(org.jboss.system.metadata.ServiceDeployment.class);
+ this.addInput(org.jboss.system.metadata.ServiceMetaData.class);
}
+ else
+ {
+ // inputs
+ this.addInput(JBossWebMetaData.class);
+ this.addInput(Deployment.class);
+ if (aspect.isLast())
+ {
+ this.addInput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+ // outputs
+ this.addOutput(JBossWebMetaData.class);
+ if (!aspect.isLast())
+ {
+ this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
+ }
+ }
// propagate DA requirements and map them to deployer inputs
final Set<String> inputs = aspect.getRequiresAsSet();
for (String input : inputs)
@@ -72,13 +88,6 @@
this.addInput(WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + input);
}
- // outputs
- this.addOutput(JBossWebMetaData.class);
- if (!aspect.isLast())
- {
- this.addOutput(WSDeploymentAspectDeployer.JBOSSWS_METADATA);
- }
-
// propagate DA provides and map them to deployer outputs
final Set<String> outputs = aspect.getProvidesAsSet();
for (String output : outputs)
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -21,19 +21,16 @@
*/
package org.jboss.webservices.integration.deployers;
-import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-import org.jboss.xb.binding.ObjectModelFactory;
/**
* webservices.xml deployer.
*
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public final class WSDescriptorDeployer extends ObjectModelFactoryDeployer<WebservicesMetaData>
+public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorProcessor, WebservicesMetaData>
{
-
/**
* Constructor.
*/
@@ -41,18 +38,14 @@
{
super(WebservicesMetaData.class);
}
-
+
/**
- * Model factory generator.
- *
- * @param root object tree root
- * @return object model factory
+ * MC incallback method. It will be invoked each time WebservicesDescriptorProcessor bean will be installed.
+ * @param processor the processor
*/
@Override
- protected ObjectModelFactory getObjectModelFactory(final WebservicesMetaData root)
+ public void setProcessor(final WebservicesDescriptorProcessor processor)
{
- this.log.debug("Returning webservices descriptor factory");
- return new WebservicesFactory(null);
+ super.setProcessor(processor);
}
-
}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -29,6 +29,7 @@
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
@@ -85,6 +86,11 @@
this.log.debug("Detected JAXRPC EJB21 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
}
+ else if (this.isJaxwsJmsDeployment(unit))
+ {
+ this.log.debug("Detected JAXWS JMS deployment");
+ unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS);
+ }
}
/**
@@ -156,4 +162,15 @@
return false;
}
+ /**
+ * Returns true if JAXWS JMS deployment is detected.
+ *
+ * @param unit deployment unit
+ * @return true if JAXWS JMS, false otherwise
+ */
+ private boolean isJaxwsJmsDeployment(final DeploymentUnit unit)
+ {
+ return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class);
+ }
+
}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -76,14 +76,14 @@
protected abstract void build(Deployment dep, DeploymentUnit unit);
/**
- * Creates new Web Service endpoint.
+ * Creates new Http Web Service endpoint.
*
* @param endpointClass endpoint class name
* @param endpointName endpoint name
* @param dep deployment
* @return WS endpoint
*/
- protected final Endpoint newEndpoint(final String endpointClass, final String endpointName, final Deployment dep)
+ protected final Endpoint newHttpEndpoint(final String endpointClass, final String endpointName, final Deployment dep)
{
if (endpointName == null)
{
@@ -95,7 +95,7 @@
throw new NullPointerException("Null endpoint class");
}
- final Endpoint endpoint = this.deploymentModelFactory.newEndpoint(endpointClass);
+ final Endpoint endpoint = this.deploymentModelFactory.newHttpEndpoint(endpointClass);
endpoint.setShortName(endpointName);
dep.getService().addEndpoint(endpoint);
@@ -103,6 +103,33 @@
}
/**
+ * Creates new JMS Web Service endpoint.
+ *
+ * @param endpointClass endpoint class name
+ * @param endpointName endpoint name
+ * @param dep deployment
+ * @return WS endpoint
+ */
+ protected final Endpoint newJMSEndpoint(final String endpointClass, final String endpointName, final Deployment dep)
+ {
+ if (endpointName == null)
+ {
+ throw new NullPointerException("Null endpoint name");
+ }
+
+ if (endpointClass == null)
+ {
+ throw new NullPointerException("Null endpoint class");
+ }
+
+ final Endpoint endpoint = this.deploymentModelFactory.newJMSEndpoint(endpointClass);
+ endpoint.setShortName(endpointName);
+ dep.getService().addEndpoint(endpoint);
+
+ return endpoint;
+ }
+
+ /**
* Creates new Web Service deployment.
*
* @param unit deployment unit
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -49,7 +49,7 @@
final String ejbClass = beanMetaData.getEjbClass();
this.log.debug("EJB21 class: " + ejbClass);
- this.newEndpoint(ejbClass, ejbName, dep);
+ this.newHttpEndpoint(ejbClass, ejbName, dep);
}
}
}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -48,7 +48,7 @@
final String servletClass = ASHelper.getEndpointName(servletMD);
this.log.debug("JSE class: " + servletClass);
- this.newEndpoint(servletClass, servletName, dep);
+ this.newHttpEndpoint(servletClass, servletName, dep);
}
}
}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -44,7 +44,7 @@
final String ejbClass = container.getComponentClassName();
this.log.debug("EJB3 class: " + ejbClass);
- final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep);
+ final Endpoint ep = this.newHttpEndpoint(ejbClass, ejbName, dep);
ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName());
}
}
Copied: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java (from rev 12282, container/jboss60/branches/jbossws-jboss600M3-jms-integration/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java)
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java (rev 0)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -0,0 +1,71 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+
+/**
+ * Create JAXWS SPI Deployment for JAXWS_JMS type deployment
+ * @author <a herf="ema(a)redhat.com>Jim Ma</a>
+ *
+ */
+public class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder
+{
+
+ /**
+ * Constructor.
+ */
+ DeploymentModelBuilderJAXWS_JMS()
+ {
+ super();
+ }
+
+ /**
+ * Creates new JAXWS JMS deployment and registers it with deployment unit.
+ *
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ */
+ @Override
+ protected void build(final Deployment dep, final DeploymentUnit unit)
+ {
+ this.getAndPropagateAttachment(JMSEndpointsMetaData.class, unit, dep);
+ JMSEndpointsMetaData jmsEndpointsMD = dep.getAttachment(JMSEndpointsMetaData.class);
+ for (JMSEndpointMetaData endpoint : jmsEndpointsMD.getEndpointsMetaData())
+ {
+ if (endpoint.getName() == null)
+ {
+ endpoint.setName(endpoint.getImplementor());
+ }
+ this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep);
+ }
+ }
+
+ }
\ No newline at end of file
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -44,7 +44,7 @@
final String servletClass = ASHelper.getEndpointName(servlet);
this.log.debug("JSE class: " + servletClass);
- this.newEndpoint(servletClass, servletName, dep);
+ this.newHttpEndpoint(servletClass, servletName, dep);
}
}
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -48,6 +48,7 @@
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE());
WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3());
WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21());
+ WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS());
}
/**
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-07-09 11:04:05 UTC (rev 12614)
@@ -36,6 +36,7 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
/**
* Creator of web app meta data for EJB endpoints.
@@ -185,7 +186,7 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
final String endpointName = ep.getShortName();
- final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
+ final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
@@ -241,7 +242,7 @@
final WebResourceCollectionsMetaData webResourceCollections = WebMetaDataHelper
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
- final String urlPattern = ejbEndpoint.getURLPattern();
+ final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern();
this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: "
+ urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess,
Modified: container/jboss60/branches/jbossws-jboss600M3/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss600M3/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-07-09 10:07:15 UTC (rev 12613)
+++ container/jboss60/branches/jbossws-jboss600M3/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-07-09 11:04:05 UTC (rev 12614)
@@ -50,12 +50,21 @@
-->
</bean>
+ <!-- stack agnostic webservices.xml processor -->
+ <bean name="WSDescriptorProcessor" class="org.jboss.wsf.framework.deployment.jms.WebservicesDescriptorProcessorImpl">
+ <property name="validating">true</property>
+ <property name="descriptorName">webservices.xml</property>
+ </bean>
+
<!-- deployers -->
<bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer">
- <property name="name">webservices.xml</property>
- <property name="useSchemaValidation">true</property>
+ <incallback method="setProcessor"/>
</bean>
-
+
+ <bean name="JMSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.JMSDescriptorDeployer">
+ <incallback method="setProcessor"/>
+ </bean>
+
<bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>
<bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer"/>
15 years, 10 months
JBossWS SVN: r12613 - common/trunk/src/main/java/org/jboss/wsf/common/integration.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 06:07:15 -0400 (Fri, 09 Jul 2010)
New Revision: 12613
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java
Log:
[JBWS-3086] merging CXF protype upstream - JMSDA cannot be final
Modified: common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java 2010-07-09 09:08:28 UTC (rev 12612)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java 2010-07-09 10:07:15 UTC (rev 12613)
@@ -29,7 +29,7 @@
*
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/
-public final class JMSDeploymentAspect extends AbstractDeploymentAspect
+public class JMSDeploymentAspect extends AbstractDeploymentAspect
{
@Override
public boolean canHandle(final Deployment dep)
15 years, 10 months
JBossWS SVN: r12612 - container/jboss50/branches.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 05:08:28 -0400 (Fri, 09 Jul 2010)
New Revision: 12612
Removed:
container/jboss50/branches/jbossws-jboss510-jms-integration/
Log:
[JBWS-3086] removing obsolete branch
15 years, 10 months
JBossWS SVN: r12611 - in framework/trunk/src/main/java/org/jboss/wsf/framework: deployment/jms and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 04:42:12 -0400 (Fri, 09 Jul 2010)
New Revision: 12611
Added:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractDefaultEndpoint.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultJMSEndpoint.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/jms/
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/jms/WebservicesDescriptorProcessorImpl.java
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
Log:
[JBWS-3086] merging CXF protype upstream
Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractDefaultEndpoint.java (from rev 12281, framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/AbstractDefaultEndpoint.java)
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractDefaultEndpoint.java (rev 0)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/AbstractDefaultEndpoint.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -0,0 +1,284 @@
+/*
+ * 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.wsf.framework.deployment;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.jboss.wsf.common.injection.PreDestroyHolder;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.LifecycleHandler;
+import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.RequestHandler;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.management.recording.Record;
+import org.jboss.wsf.spi.management.recording.RecordFilter;
+import org.jboss.wsf.spi.management.recording.RecordProcessor;
+
+/**
+ * A general abstract JAXWS endpoint.
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class AbstractDefaultEndpoint extends AbstractExtensible
+{
+ protected Service service;
+ protected ObjectName name;
+ protected String shortName;
+ protected String urlPattern;
+ protected String targetBean;
+ protected Class<?> targetBeanClass;
+ protected EndpointState state;
+ protected RequestHandler requestHandler;
+ protected InvocationHandler invocationHandler;
+ protected LifecycleHandler lifecycleHandler;
+ protected EndpointMetrics metrics;
+ protected String address;
+ protected List<RecordProcessor> recordProcessors = new Vector<RecordProcessor>();
+
+ AbstractDefaultEndpoint(String targetBean)
+ {
+ this.targetBean = targetBean;
+ this.state = EndpointState.UNDEFINED;
+ }
+
+ public Service getService()
+ {
+ return service;
+ }
+
+ public void setService(Service service)
+ {
+ assertEndpointSetterAccess();
+ this.service = service;
+ }
+
+ public String getTargetBeanName()
+ {
+ return targetBean;
+ }
+
+ public void setTargetBeanName(String targetBean)
+ {
+ assertEndpointSetterAccess();
+ this.targetBean = targetBean;
+ }
+
+ public synchronized Class<?> getTargetBeanClass()
+ {
+ if (targetBean == null)
+ throw new IllegalStateException("Target bean not set");
+ if (targetBeanClass != null)
+ return targetBeanClass;
+
+ ClassLoader classLoader = service.getDeployment().getRuntimeClassLoader();
+
+ try
+ {
+ targetBeanClass = classLoader.loadClass(targetBean);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ throw new WSFDeploymentException(ex);
+ }
+
+ return targetBeanClass;
+ }
+
+ public ObjectName getName()
+ {
+ if(null==name)
+ {
+ // build implicit name
+ try
+ {
+ name = new ObjectName(
+ Endpoint.SEPID_DOMAIN,
+ Endpoint.SEPID_PROPERTY_ENDPOINT, targetBean
+ );
+
+ } catch (MalformedObjectNameException e)
+ {
+ //
+ }
+ }
+
+ return name;
+ }
+
+ public void setName(ObjectName name)
+ {
+ assertEndpointSetterAccess();
+ this.name = name;
+ }
+
+ public String getShortName()
+ {
+ return shortName;
+ }
+
+ public void setShortName(String shortName)
+ {
+ assertEndpointSetterAccess();
+ this.shortName = shortName;
+ }
+
+
+ public EndpointState getState()
+ {
+ return state;
+ }
+
+ public void setState(EndpointState state)
+ {
+ this.state = state;
+ }
+
+ public RequestHandler getRequestHandler()
+ {
+ return requestHandler;
+ }
+
+ public void setRequestHandler(RequestHandler handler)
+ {
+ assertEndpointSetterAccess();
+ this.requestHandler = handler;
+ }
+
+ public LifecycleHandler getLifecycleHandler()
+ {
+ return lifecycleHandler;
+ }
+
+ public void setLifecycleHandler(LifecycleHandler handler)
+ {
+ assertEndpointSetterAccess();
+ this.lifecycleHandler = handler;
+ }
+
+ public InvocationHandler getInvocationHandler()
+ {
+ return invocationHandler;
+ }
+
+ public void setInvocationHandler(InvocationHandler handler)
+ {
+ assertEndpointSetterAccess();
+ this.invocationHandler = handler;
+ }
+
+ @Override
+ public <T> T addAttachment(Class<T> clazz, Object obj)
+ {
+ boolean isPreDestroyHolderClass = clazz.equals(PreDestroyHolder.class); // JBWS-2268 hack
+ boolean isObjectClass = clazz.equals(Object.class); // JBWS-2486 hack
+
+ if (!isPreDestroyHolderClass && !isObjectClass)
+ {
+ assertEndpointSetterAccess();
+ }
+ return super.addAttachment(clazz, obj);
+ }
+
+ @Override
+ public <T> T removeAttachment(Class<T> key)
+ {
+ boolean isPreDestroyHolderClass = key.equals(PreDestroyHolder.class); // JBWS-2268 hack
+ boolean isObjectClass = key.equals(Object.class); // JBWS-2486 hack
+
+ if (!isPreDestroyHolderClass && !isObjectClass)
+ {
+ assertEndpointSetterAccess();
+ }
+ return super.removeAttachment(key);
+ }
+
+ public void removeProperty(String key)
+ {
+ assertEndpointSetterAccess();
+ super.removeProperty(key);
+ }
+
+ public void setProperty(String key, Object value)
+ {
+ assertEndpointSetterAccess();
+ super.setProperty(key, value);
+ }
+
+ protected void assertEndpointSetterAccess()
+ {
+ if (state == EndpointState.STARTED)
+ throw new IllegalStateException("Cannot modify endpoint properties in state: " + state);
+ }
+
+ public List<RecordProcessor> getRecordProcessors()
+ {
+ return recordProcessors;
+ }
+
+ public void setRecordProcessors(List<RecordProcessor> recordProcessors)
+ {
+ this.recordProcessors = new Vector<RecordProcessor>(recordProcessors);
+ }
+
+ public void processRecord(Record record)
+ {
+ for (RecordProcessor processor : recordProcessors)
+ {
+ if (processor.isRecording())
+ {
+ boolean match = true;
+ if (processor.getFilters() != null)
+ {
+ for (Iterator<RecordFilter> it = processor.getFilters().iterator(); it.hasNext() && match;)
+ {
+ match = it.next().match(record);
+ }
+ }
+ if (match)
+ {
+ processor.processRecord(record);
+ }
+ }
+ }
+ }
+
+ public String getAddress()
+ {
+ return this.address;
+ }
+
+ public void setAddress(String address)
+ {
+ this.address = address;
+ }
+
+}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -42,8 +42,22 @@
return new DefaultService();
}
+ @Deprecated
+ /**
+ * Use #newHttpEndpoint(String) instead
+ */
public Endpoint newEndpoint(String targetBean)
{
- return new DefaultEndpoint(targetBean);
+ return this.newHttpEndpoint(targetBean);
}
+
+ public Endpoint newHttpEndpoint(String targetBean)
+ {
+ return new DefaultHttpEndpoint(targetBean);
+ }
+
+ public Endpoint newJMSEndpoint(String targetBean)
+ {
+ return new DefaultJMSEndpoint(targetBean);
+ }
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentModelFactory.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -42,8 +42,22 @@
return new DefaultService();
}
+ @Deprecated
+ /**
+ * Use #newHttpEndpoint(String) instead
+ */
public Endpoint newEndpoint(String targetBean)
{
- return new DefaultEndpoint(targetBean);
+ return this.newHttpEndpoint(targetBean);
}
+
+ public Endpoint newHttpEndpoint(String targetBean)
+ {
+ return new DefaultHttpEndpoint(targetBean);
+ }
+
+ public Endpoint newJMSEndpoint(String targetBean)
+ {
+ return new DefaultJMSEndpoint(targetBean);
+ }
}
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -1,329 +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.wsf.framework.deployment;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.management.ObjectName;
-import javax.management.MalformedObjectNameException;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.wsf.common.injection.InjectionException;
-import org.jboss.wsf.common.injection.PreDestroyHolder;
-import org.jboss.wsf.spi.deployment.AbstractExtensible;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.LifecycleHandler;
-import org.jboss.wsf.spi.deployment.Service;
-import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
-import org.jboss.wsf.spi.invocation.RequestHandler;
-import org.jboss.wsf.spi.management.EndpointMetrics;
-import org.jboss.wsf.spi.management.recording.Record;
-import org.jboss.wsf.spi.management.recording.RecordFilter;
-import org.jboss.wsf.spi.management.recording.RecordProcessor;
-
-/**
- * A general JAXWS endpoint.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 20-Apr-2007
- */
-public class DefaultEndpoint extends AbstractExtensible implements Endpoint
-{
- private Service service;
- private ObjectName name;
- private String shortName;
- private String urlPattern;
- private String targetBean;
- private Class<?> targetBeanClass;
- private EndpointState state;
- private RequestHandler requestHandler;
- private InvocationHandler invocationHandler;
- private LifecycleHandler lifecycleHandler;
- private EndpointMetrics metrics;
- private String address;
- private List<RecordProcessor> recordProcessors = new Vector<RecordProcessor>();
-
- DefaultEndpoint(String targetBean)
- {
- this.targetBean = targetBean;
- this.state = EndpointState.UNDEFINED;
- }
-
- public Service getService()
- {
- return service;
- }
-
- public void setService(Service service)
- {
- assertEndpointSetterAccess();
- this.service = service;
- }
-
- public String getTargetBeanName()
- {
- return targetBean;
- }
-
- public void setTargetBeanName(String targetBean)
- {
- assertEndpointSetterAccess();
- this.targetBean = targetBean;
- }
-
- public String getAddress()
- {
- return this.address;
- }
-
- public void setAddress(String address)
- {
- this.address = address;
- }
-
- public synchronized Class<?> getTargetBeanClass()
- {
- if (targetBean == null)
- throw new IllegalStateException("Target bean not set");
- if (targetBeanClass != null)
- return targetBeanClass;
-
- ClassLoader classLoader = service.getDeployment().getRuntimeClassLoader();
-
- try
- {
- targetBeanClass = classLoader.loadClass(targetBean);
- }
- catch (ClassNotFoundException ex)
- {
- throw new WSFDeploymentException(ex);
- }
-
- return targetBeanClass;
- }
-
- public ObjectName getName()
- {
- if(null==name)
- {
- // build implicit name
- try
- {
- name = new ObjectName(
- Endpoint.SEPID_DOMAIN,
- Endpoint.SEPID_PROPERTY_ENDPOINT, targetBean
- );
-
- } catch (MalformedObjectNameException e)
- {
- //
- }
- }
-
- return name;
- }
-
- public void setName(ObjectName name)
- {
- assertEndpointSetterAccess();
- this.name = name;
- }
-
- public String getShortName()
- {
- return shortName;
- }
-
- public void setShortName(String shortName)
- {
- assertEndpointSetterAccess();
- this.shortName = shortName;
- }
-
- public String getURLPattern()
- {
- return urlPattern;
- }
-
- public void setURLPattern(String urlPattern)
- {
- assertEndpointSetterAccess();
- this.urlPattern = urlPattern;
- }
-
- public EndpointState getState()
- {
- return state;
- }
-
- public void setState(EndpointState state)
- {
- this.state = state;
- }
-
- public RequestHandler getRequestHandler()
- {
- return requestHandler;
- }
-
- public void setRequestHandler(RequestHandler handler)
- {
- assertEndpointSetterAccess();
- this.requestHandler = handler;
- }
-
- public LifecycleHandler getLifecycleHandler()
- {
- return lifecycleHandler;
- }
-
- public void setLifecycleHandler(LifecycleHandler handler)
- {
- assertEndpointSetterAccess();
- this.lifecycleHandler = handler;
- }
-
- public InvocationHandler getInvocationHandler()
- {
- return invocationHandler;
- }
-
- public void setInvocationHandler(InvocationHandler handler)
- {
- assertEndpointSetterAccess();
- this.invocationHandler = handler;
- }
-
- public EndpointMetrics getEndpointMetrics()
- {
- return metrics;
- }
-
- public void setEndpointMetrics(EndpointMetrics metrics)
- {
- assertEndpointSetterAccess();
- metrics.setEndpoint(this);
- this.metrics = metrics;
-
- }
-
- @Override
- public <T> T addAttachment(Class<T> clazz, Object obj)
- {
- boolean isPreDestroyHolderClass = clazz.equals(PreDestroyHolder.class); // JBWS-2268 hack
- boolean isObjectClass = clazz.equals(Object.class); // JBWS-2486 hack
-
- if (!isPreDestroyHolderClass && !isObjectClass)
- {
- assertEndpointSetterAccess();
- }
- return super.addAttachment(clazz, obj);
- }
-
- @Override
- public <T> T removeAttachment(Class<T> key)
- {
- boolean isPreDestroyHolderClass = key.equals(PreDestroyHolder.class); // JBWS-2268 hack
- boolean isObjectClass = key.equals(Object.class); // JBWS-2486 hack
-
- if (!isPreDestroyHolderClass && !isObjectClass)
- {
- assertEndpointSetterAccess();
- }
- return super.removeAttachment(key);
- }
-
- @Override
- public void removeProperty(String key)
- {
- assertEndpointSetterAccess();
- super.removeProperty(key);
- }
-
- @Override
- public void setProperty(String key, Object value)
- {
- assertEndpointSetterAccess();
- super.setProperty(key, value);
- }
-
- private void assertEndpointSetterAccess()
- {
- if (state == EndpointState.STARTED)
- throw new IllegalStateException("Cannot modify endpoint properties in state: " + state);
- }
-
- public List<RecordProcessor> getRecordProcessors()
- {
- return recordProcessors;
- }
-
- public void setRecordProcessors(List<RecordProcessor> recordProcessors)
- {
- this.recordProcessors = new Vector<RecordProcessor>(recordProcessors);
- }
-
- public void processRecord(Record record)
- {
- for (RecordProcessor processor : recordProcessors)
- {
- if (processor.isRecording())
- {
- boolean match = true;
- if (processor.getFilters() != null)
- {
- for (Iterator<RecordFilter> it = processor.getFilters().iterator(); it.hasNext() && match;)
- {
- match = it.next().match(record);
- }
- }
- if (match)
- {
- processor.processRecord(record);
- }
- }
- }
- }
-
- @Override
- public Context getJNDIContext()
- {
- Context retVal = null;
-
- try
- {
- retVal = this.getInvocationHandler().getJNDIContext(this);
- }
- catch (NamingException e)
- {
- final String message = "Cannot get JNDI context";
- InjectionException.rethrow(message, e);
- }
-
- return retVal;
- }
-
-}
Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java (from rev 12281, framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java)
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java (rev 0)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultHttpEndpoint.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -0,0 +1,85 @@
+/*
+ * 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.wsf.framework.deployment;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.wsf.common.injection.InjectionException;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * DefaultHttpEndpoint implementation
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class DefaultHttpEndpoint extends AbstractDefaultEndpoint implements HttpEndpoint
+{
+
+ DefaultHttpEndpoint(String targetBean)
+ {
+ super(targetBean);
+ }
+
+ public EndpointMetrics getEndpointMetrics()
+ {
+ return metrics;
+ }
+
+ public void setEndpointMetrics(EndpointMetrics metrics)
+ {
+ assertEndpointSetterAccess();
+ metrics.setEndpoint(this);
+ this.metrics = metrics;
+
+ }
+
+ public String getURLPattern()
+ {
+ return urlPattern;
+ }
+
+ public void setURLPattern(String urlPattern)
+ {
+ assertEndpointSetterAccess();
+ this.urlPattern = urlPattern;
+ }
+
+ public Context getJNDIContext()
+ {
+ Context retVal = null;
+
+ try
+ {
+ retVal = getInvocationHandler().getJNDIContext(this);
+ }
+ catch (NamingException e)
+ {
+ final String message = "Cannot get JNDI context";
+ InjectionException.rethrow(message, e);
+ }
+
+ return retVal;
+ }
+
+}
Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultJMSEndpoint.java (from rev 12281, framework/branches/jms-integration/src/main/java/org/jboss/wsf/framework/deployment/DefaultJMSEndpoint.java)
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultJMSEndpoint.java (rev 0)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultJMSEndpoint.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -0,0 +1,122 @@
+/*
+ * 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.wsf.framework.deployment;
+
+import java.net.URI;
+
+import javax.naming.Context;
+
+import org.jboss.wsf.spi.deployment.JMSEndpoint;
+import org.jboss.wsf.spi.management.EndpointMetrics;
+
+/**
+ * Default JMSEndpoint implementation
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class DefaultJMSEndpoint extends AbstractDefaultEndpoint implements JMSEndpoint
+{
+
+ private String targetDestination;
+ private String replyDestination;
+ private URI requestURI;
+
+ DefaultJMSEndpoint(String targetBean)
+ {
+ super(targetBean);
+ }
+
+ @Deprecated// TODO: moved to HttpEndpoint - explicit cast required
+ public String getURLPattern()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Deprecated// TODO: moved to HttpEndpoint - explicit cast required
+ public void setURLPattern(String urlPattern)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getTargetDestination()
+ {
+ return targetDestination;
+ }
+
+ public void setTargetDestination(String targetDestination)
+ {
+ this.targetDestination = targetDestination;
+ }
+
+ public String getReplyDestination()
+ {
+ return replyDestination;
+ }
+
+ public void setReplyDestination(String replyDestination)
+ {
+ this.replyDestination = replyDestination;
+ }
+
+ public URI getRequestURI()
+ {
+ return this.requestURI;
+ }
+
+ public void setRequestURI(URI requestURI)
+ {
+ this.requestURI = requestURI;
+ }
+
+ public String getAddress()
+ {
+ if (getTargetDestination() != null)
+ {
+ StringBuffer address = new StringBuffer();
+ address.append("jms:jndi:" + getTargetDestination());
+ if (this.getReplyDestination() != null)
+ {
+ address.append("?replyToName =" + this.getReplyDestination());
+ }
+ return address.toString();
+ }
+ return "Not available";
+ }
+
+ //TODO:enable jms endpoint management
+ @Override
+ public EndpointMetrics getEndpointMetrics()
+ {
+ return null;
+ }
+ @Override
+ public Context getJNDIContext()
+ {
+ return null;
+ }
+
+ @Override
+ public void setEndpointMetrics(EndpointMetrics metrics)
+ {
+
+ }
+}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -26,6 +26,7 @@
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;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
@@ -71,9 +72,9 @@
ep.setShortName(shortName);
}
- if (ep.getURLPattern() == null)
+ if (((HttpEndpoint)ep).getURLPattern() == null)
{
- ep.setURLPattern("/*");
+ ((HttpEndpoint)ep).setURLPattern("/*");
}
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -25,21 +25,21 @@
import java.util.Map;
import org.jboss.wsf.common.integration.AbstractDeploymentAspect;
-import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.annotation.WebContext;
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.Deployment.DeploymentType;
import org.jboss.wsf.spi.management.ServerConfig;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection;
-import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
/**
* A deployer that assigns the endpoint address.
@@ -77,7 +77,9 @@
boolean confidential = isConfidentialTransportGuarantee(dep, ep);
int currentPort = confidential ? securePort : port;
String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : "");
- String urlPattern = ep.getURLPattern();
+
+ HttpEndpoint httpEp = (HttpEndpoint)ep;
+ String urlPattern = httpEp.getURLPattern();
if (urlPattern == null)
throw new IllegalStateException("Cannot obtain url pattern");
@@ -85,7 +87,7 @@
urlPattern = urlPattern.substring(0, urlPattern.length() - 2);
protocol = confidential ? "https://" : "http://";
- ep.setAddress(protocol + hostAndPort + contextRoot + urlPattern);
+ httpEp.setAddress(protocol + hostAndPort + contextRoot + urlPattern);
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
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.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
@@ -48,7 +49,8 @@
{
for (Endpoint ep : dep.getService().getEndpoints())
{
- String urlPattern = ep.getURLPattern();
+ HttpEndpoint httpEp = (HttpEndpoint)ep;
+ String urlPattern = httpEp.getURLPattern();
if (urlPattern == null)
{
urlPattern = getExplicitPattern(dep, ep);
@@ -59,7 +61,7 @@
if (urlPattern.startsWith("/") == false)
urlPattern = "/" + urlPattern;
- ep.setURLPattern(urlPattern);
+ httpEp.setURLPattern(urlPattern);
}
}
}
Added: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/jms/WebservicesDescriptorProcessorImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/jms/WebservicesDescriptorProcessorImpl.java (rev 0)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/jms/WebservicesDescriptorProcessorImpl.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -0,0 +1,87 @@
+/*
+ * 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.wsf.framework.deployment.jms;
+
+import java.net.URL;
+
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.xb.binding.ObjectModelFactory;
+
+/**
+ * Webservices descriptor processor implementation.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebservicesDescriptorProcessorImpl implements WebservicesDescriptorProcessor
+{
+ private String descriptorName;
+ private boolean isValidating;
+
+ /* (non-Javadoc)
+ * @see org.jboss.wsf.spi.metadata.DescriptorProcessor#getDescriptorName()
+ */
+ @Override
+ public String getDescriptorName()
+ {
+ return this.descriptorName;
+ }
+
+ /**
+ * Invoked via MC.
+ * @param descriptorName
+ */
+ public void setDescriptorName(final String descriptorName)
+ {
+ this.descriptorName = descriptorName;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.wsf.spi.metadata.DescriptorProcessor#getFactory(java.net.URL)
+ */
+ @Override
+ public ObjectModelFactory getFactory(final URL url)
+ {
+ if (url == null)
+ throw new IllegalArgumentException("URL cannot be null");
+
+ return new WebservicesFactory(url);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.wsf.spi.metadata.DescriptorProcessor#isValidating()
+ */
+ @Override
+ public boolean isValidating()
+ {
+ return this.isValidating;
+ }
+
+ /**
+ * Invoked via MC.
+ * @param isValidating
+ */
+ public void setValidating(final boolean isValidating)
+ {
+ this.isValidating = isValidating;
+ }
+}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2010-07-09 08:10:04 UTC (rev 12610)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java 2010-07-09 08:42:12 UTC (rev 12611)
@@ -184,18 +184,12 @@
private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException
{
String address = createAddress(requestURL, ep.getAddress());
- try
+
+ if (address.startsWith("jms"))
{
- String scheme = new URI(address).getScheme();
- if (scheme.equalsIgnoreCase("jms"))
- {
- return ep.getAddress();
- }
+ return ep.getAddress();
}
- catch (Exception e)
- {
- //ignore
- }
+
StringBuilder sb = new StringBuilder("<a href='");
sb.append(address);
sb.append("?wsdl'>");
15 years, 10 months
JBossWS SVN: r12610 - common/trunk/src/main/java/org/jboss/wsf/common/integration.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 04:10:04 -0400 (Fri, 09 Jul 2010)
New Revision: 12610
Added:
common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
Log:
[JBWS-3086] merging CXF protype upstream
Copied: common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java (from rev 12279, common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java)
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/JMSDeploymentAspect.java 2010-07-09 08:10:04 UTC (rev 12610)
@@ -0,0 +1,39 @@
+/*
+ * 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.wsf.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 final class JMSDeploymentAspect extends AbstractDeploymentAspect
+{
+ @Override
+ public boolean canHandle(final Deployment dep)
+ {
+ return this.isForJaxWs() && dep.getAttachment(JMSEndpointsMetaData.class) != null;
+ }
+}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-07-09 07:52:03 UTC (rev 12609)
+++ common/trunk/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-07-09 08:10:04 UTC (rev 12610)
@@ -133,6 +133,17 @@
{
return DeploymentType.JAXWS_JSE.equals( dep.getType() );
}
+
+ /**
+ * Returns true if deployment represents JAXWS JMS deployment.
+ *
+ * @param dep webservice deployment
+ * @return true if JAXWS JMS deployment, false otherwise
+ */
+ public static boolean isJaxwsJmsDeployment( final Deployment dep )
+ {
+ return DeploymentType.JAXWS_JMS.equals( dep.getType() );
+ }
/**
* Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
@@ -189,5 +200,4 @@
return isJaxrpcEjb || isJaxrpcJse;
}
-
}
15 years, 10 months
JBossWS SVN: r12609 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-09 03:52:03 -0400 (Fri, 09 Jul 2010)
New Revision: 12609
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
Log:
[JBWS-3086] merging CXF protype upstream - ensuring SPI BC
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2010-07-08 18:12:27 UTC (rev 12608)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -32,7 +32,7 @@
{
public enum DeploymentType
{
- JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3,
+ JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_JMS;
};
public enum DeploymentState
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2010-07-08 18:12:27 UTC (rev 12608)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -33,5 +33,14 @@
public abstract Service newService();
+ @Deprecated
+ /**
+ * Use #newHttpEndpoint(String) instead
+ */
public abstract Endpoint newEndpoint(String targetBean);
+
+ public abstract Endpoint newHttpEndpoint(String targetBean);
+
+ public abstract Endpoint newJMSEndpoint(String targetBean);
+
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-07-08 18:12:27 UTC (rev 12608)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -52,6 +52,13 @@
UNDEFINED, STARTED, STOPPED
};
+ /** Get the URL pattern for this endpoint */
+ @Deprecated// TODO: moved to HttpEndpoint - explicit cast required
+ String getURLPattern();
+ /** Set the URL pattern for this endpoint */
+ @Deprecated// TODO: moved to HttpEndpoint - explicit cast required
+ void setURLPattern(String urlPattern);
+
/** Get the service this endpoint belongs to */
Service getService();
@@ -84,19 +91,7 @@
/** Use the deployment classloader to load the bean */
Class getTargetBeanClass();
-
- /** Get the URL pattern for this endpoint */
- String getURLPattern();
-
- /** Set the URL pattern for this endpoint */
- void setURLPattern(String urlPattern);
-
- /** Get endpoint address */
- String getAddress();
-
- /** Set endpoint address */
- void setAddress(String address);
-
+
/** Set the request handler for this endpoint */
void setRequestHandler(RequestHandler handler);
@@ -132,4 +127,10 @@
/** Returns associated JNDI context with this endpoint. */
Context getJNDIContext();
+
+ /** Get endpoint address */
+ String getAddress();
+
+ /** Set endpoint address */
+ void setAddress(String address);
}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java (from rev 12280, spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,36 @@
+/*
+ * 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.wsf.spi.deployment;
+
+/**
+ * To represents a http transport endpoint
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public interface HttpEndpoint extends Endpoint
+{
+ /** Get the URL pattern for this endpoint */
+ String getURLPattern();
+
+ /** Set the URL pattern for this endpoint */
+ void setURLPattern(String urlPattern);
+}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java (from rev 12280, spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/JMSEndpoint.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,50 @@
+/*
+ * 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.wsf.spi.deployment;
+
+import java.net.URI;
+
+/**
+ * To represent the jms transport endpoint
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public interface JMSEndpoint extends Endpoint
+{
+ //Set jms target destination
+ void setTargetDestination(String dest);
+
+ //Get jms target destination
+ String getTargetDestination();
+
+ //Set jms reply destination
+ void setReplyDestination(String replyTo);
+
+ //Get jms reply destination
+ String getReplyDestination();
+
+ //Set soap over jms requestURI
+ void setRequestURI(URI uri);
+
+ //Get soap over jms requestURI
+ URI getRequestURI();
+}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/DescriptorProcessor.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,50 @@
+/*
+ * 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.wsf.spi.metadata;
+
+import java.net.URL;
+
+import org.jboss.xb.binding.ObjectModelFactory;
+
+/**
+ * Descriptor processor is abstraction over configuration procesing.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface DescriptorProcessor<T>
+{
+ /**
+ * Indicates whether validation is turned on or off.
+ * @return true if validation is on, false otherwise
+ */
+ boolean isValidating();
+ /**
+ * Descriptor name to parse and process.
+ * @return descriptor name to consume.
+ */
+ String getDescriptorName();
+ /**
+ * OM factory building object tree from the configuration file.
+ * @return OM factory
+ */
+ ObjectModelFactory getFactory(final URL url);
+}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms (from rev 12280, spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms)
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSDescriptorProcessor.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,33 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+import org.jboss.wsf.spi.metadata.DescriptorProcessor;
+
+/**
+ * Processor for JMS UMDM.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface JMSDescriptorProcessor extends DescriptorProcessor<JMSEndpointsMetaData>
+{
+}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2010-05-20 02:50:57 UTC (rev 12280)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -1,96 +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.wsf.spi.metadata.jms;
-
-/**
- * JMS Meta data class contains the implementor and address information
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-public class JMSEndpointMetaData
-{
- //Endpoint name
- private String name;
-
- //port name
- private String endpointName = "";
-
- //implementor class
- private String implementor = "";
-
- //wsdl location
- private String wsdlLocation = "";
-
-
- //parent component
- private JMSEndpointsMetaData endpointsMetaData = null;
-
- public JMSEndpointMetaData(JMSEndpointsMetaData endpoints)
- {
- endpointsMetaData = endpoints;
- }
-
- public JMSEndpointsMetaData getParentMetaData()
- {
- return endpointsMetaData;
- }
-
- public String getImplementor()
- {
- return implementor;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getEndpointName()
- {
- return endpointName;
- }
-
- public String getWsdlLocation()
- {
- return wsdlLocation;
- }
-
- public void setImplementor(String implementor)
- {
- this.implementor = implementor;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public void setEndpointName(String endpointName)
- {
- this.endpointName = endpointName;
- }
-
- public void setWsdlLocation(String wsdlLocation)
- {
- this.wsdlLocation = wsdlLocation;
- }
-
-}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java (from rev 12280, spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointMetaData.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,96 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+/**
+ * JMS Meta data class contains the implementor and address information
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointMetaData
+{
+ //Endpoint name
+ private String name;
+
+ //port name
+ private String endpointName = "";
+
+ //implementor class
+ private String implementor = "";
+
+ //wsdl location
+ private String wsdlLocation = "";
+
+
+ //parent component
+ private JMSEndpointsMetaData endpointsMetaData = null;
+
+ public JMSEndpointMetaData(JMSEndpointsMetaData endpoints)
+ {
+ endpointsMetaData = endpoints;
+ }
+
+ public JMSEndpointsMetaData getParentMetaData()
+ {
+ return endpointsMetaData;
+ }
+
+ public String getImplementor()
+ {
+ return implementor;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getEndpointName()
+ {
+ return endpointName;
+ }
+
+ public String getWsdlLocation()
+ {
+ return wsdlLocation;
+ }
+
+ public void setImplementor(String implementor)
+ {
+ this.implementor = implementor;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public void setEndpointName(String endpointName)
+ {
+ this.endpointName = endpointName;
+ }
+
+ public void setWsdlLocation(String wsdlLocation)
+ {
+ this.wsdlLocation = wsdlLocation;
+ }
+
+}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
===================================================================
--- spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2010-05-20 02:50:57 UTC (rev 12280)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -1,62 +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.wsf.spi.metadata.jms;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>Meta data class from jbossws-cxf.xml</p>
- * @author <a href="ema(a)redhat.com">Jim Ma</a>
- */
-
-public class JMSEndpointsMetaData
-{
- //The endpoints list
- private List<JMSEndpointMetaData> endpointsMetaData = new ArrayList<JMSEndpointMetaData>();
-
- private URL descriptorURL;
-
- public JMSEndpointsMetaData()
- {
- }
-
- public JMSEndpointsMetaData(URL descriptorURL)
- {
- this.descriptorURL = descriptorURL;
- }
-
- public URL getDescriptorURL()
- {
- return descriptorURL;
- }
-
- public void addEndpointMetaData(JMSEndpointMetaData endpointMetaData)
- {
- endpointsMetaData.add(endpointMetaData);
- }
-
- public List<JMSEndpointMetaData> getEndpointsMetaData() {
- return this.endpointsMetaData;
- }
-}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java (from rev 12280, spi/branches/jms-integration/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,62 @@
+/*
+ * 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.wsf.spi.metadata.jms;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>Meta data class from jbossws-cxf.xml</p>
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+
+public class JMSEndpointsMetaData
+{
+ //The endpoints list
+ private List<JMSEndpointMetaData> endpointsMetaData = new ArrayList<JMSEndpointMetaData>();
+
+ private URL descriptorURL;
+
+ public JMSEndpointsMetaData()
+ {
+ }
+
+ public JMSEndpointsMetaData(URL descriptorURL)
+ {
+ this.descriptorURL = descriptorURL;
+ }
+
+ public URL getDescriptorURL()
+ {
+ return descriptorURL;
+ }
+
+ public void addEndpointMetaData(JMSEndpointMetaData endpointMetaData)
+ {
+ endpointsMetaData.add(endpointMetaData);
+ }
+
+ public List<JMSEndpointMetaData> getEndpointsMetaData() {
+ return this.endpointsMetaData;
+ }
+}
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesDescriptorProcessor.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -0,0 +1,33 @@
+/*
+ * 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.wsf.spi.metadata.webservices;
+
+import org.jboss.wsf.spi.metadata.DescriptorProcessor;
+
+/**
+ * Processor for WS UMDM.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface WebservicesDescriptorProcessor extends DescriptorProcessor<WebservicesMetaData>
+{
+}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2010-07-08 18:12:27 UTC (rev 12608)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2010-07-09 07:52:03 UTC (rev 12609)
@@ -45,6 +45,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 16-Apr-2004
*/
+// TODO: move to jbossws-framework or jbossws-common
public class WebservicesFactory implements ObjectModelFactory
{
// provide logging
15 years, 10 months
JBossWS SVN: r12608 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-08 14:12:27 -0400 (Thu, 08 Jul 2010)
New Revision: 12608
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
Log:
[JBWS-3085] Adding sample for client side logging
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2010-07-08 17:28:34 UTC (rev 12607)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2010-07-08 18:12:27 UTC (rev 12608)
@@ -21,6 +21,9 @@
*/
package org.jboss.test.ws.jaxws.cxf.logging;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -28,6 +31,9 @@
import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
@@ -56,7 +62,8 @@
Service service = Service.create(wsdlURL, serviceName);
QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort");
port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class);
- //This is actually just a sample, the test does not actually assert the logs are written for the exchanges message
+
+ //This is actually just a sample, the test does not actually assert the logs are written on server side for the exchanges message
//The CXF @Feature on the endpoint ensures exchanged messages are written to the server log
assertEquals("foo", port.echo("foo"));
}
@@ -71,4 +78,33 @@
assertEquals("foo", port.echo("foo"));
}
+ public void testClientLogging() throws Exception
+ {
+ URL wsdlURL = new URL(loggingFeatureEndpointURL + "?wsdl");
+ QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureService");
+
+ Bus bus = BusFactory.newInstance().createBus();
+ try
+ {
+ //install the a LoggingInInterceptor in the bus used for the client
+ LoggingInInterceptor myLoggingInterceptor = new LoggingInInterceptor();
+ OutputStream out = new ByteArrayOutputStream();
+ myLoggingInterceptor.setPrintWriter(new PrintWriter(out, true));
+ bus.getInInterceptors().add(myLoggingInterceptor);
+ BusFactory.setDefaultBus(bus);
+
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort");
+ port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class);
+ String content = "foo";
+ port.echo(content);
+ String s = out.toString();
+ assertTrue("'" + content + "' not found in captured message: \n" + s, s.contains(content));
+ }
+ finally
+ {
+ bus.shutdown(true);
+ }
+ }
+
}
15 years, 10 months
JBossWS SVN: r12607 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/logging and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-08 13:28:34 -0400 (Thu, 08 Jul 2010)
New Revision: 12607
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingEndpoint.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3085] Adding message logging sample
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-07-08 13:50:00 UTC (rev 12606)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-07-08 17:28:34 UTC (rev 12607)
@@ -50,6 +50,15 @@
</fileset>
</jar>
+ <!-- jaxws-cxf-logging -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-cxf-management -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java 2010-07-08 17:28:34 UTC (rev 12607)
@@ -0,0 +1,21 @@
+package org.jboss.test.ws.jaxws.cxf.logging;
+
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.message.Message;
+
+public class CustomInInterceptor extends LoggingInInterceptor
+{
+ private static volatile int count = 0;
+
+ public void handleMessage(Message message) throws Fault {
+ count++;
+ super.handleMessage(message);
+ }
+
+ public static int getCount()
+ {
+ System.out.println("COUNT = "+count);
+ return count;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CustomInInterceptor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingEndpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingEndpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingEndpoint.java 2010-07-08 17:28:34 UTC (rev 12607)
@@ -0,0 +1,33 @@
+/*
+ * 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.test.ws.jaxws.cxf.logging;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+public interface LoggingEndpoint
+{
+ @WebMethod
+ public String echo(String input);
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.java 2010-07-08 17:28:34 UTC (rev 12607)
@@ -0,0 +1,48 @@
+/*
+ * 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.test.ws.jaxws.cxf.logging;
+
+import javax.annotation.Resource;
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+import org.apache.cxf.feature.Features;
+import org.jboss.logging.Logger;
+
+@WebService(name = "LoggingFeatureEndpoint", targetNamespace = "http://logging.cxf.jaxws.ws.test.jboss.org/", serviceName = "LoggingFeatureService")
+@Stateless
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+public class LoggingFeatureEndpointImpl
+{
+ @Resource
+ WebServiceContext ctx;
+
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return input;
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingFeatureEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.java 2010-07-08 17:28:34 UTC (rev 12607)
@@ -0,0 +1,45 @@
+/*
+ * 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.test.ws.jaxws.cxf.logging;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.apache.cxf.interceptor.InInterceptors;
+import org.apache.cxf.interceptor.OutInterceptors;
+import org.jboss.logging.Logger;
+
+@WebService(name = "LoggingInterceptorsEndpoint", targetNamespace = "http://logging.cxf.jaxws.ws.test.jboss.org/", serviceName = "LoggingInterceptorsService")
+@Stateless
+@InInterceptors(interceptors = "org.jboss.test.ws.jaxws.cxf.logging.CustomInInterceptor")
+//@InInterceptors(interceptors = "org.apache.cxf.interceptor.LoggingInInterceptor")
+@OutInterceptors(interceptors = "org.apache.cxf.interceptor.LoggingOutInterceptor")
+public class LoggingInterceptorsEndpointImpl
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ Logger.getLogger(this.getClass()).info("echo: " + input);
+ return CustomInInterceptor.getCount() > 0 ? input : "Interceptor not called";
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/LoggingInterceptorsEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2010-07-08 17:28:34 UTC (rev 12607)
@@ -0,0 +1,74 @@
+/*
+ * 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.test.ws.jaxws.cxf.logging;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Tests configuration of message exchange logging using API
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 08-Jul-2010
+ */
+public class MessageLoggingTestCase extends JBossWSTest
+{
+ private String loggingFeatureEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingFeatureEndpoint";
+ private String loggingInterceptorsEndpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-logging/LoggingInterceptorsEndpoint";
+
+ private LoggingEndpoint port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(MessageLoggingTestCase.class, "jaxws-cxf-logging.jar");
+ }
+
+ public void testLoggingFeature() throws Exception
+ {
+ URL wsdlURL = new URL(loggingFeatureEndpointURL + "?wsdl");
+ QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingFeatureEndpointPort");
+ port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class);
+ //This is actually just a sample, the test does not actually assert the logs are written for the exchanges message
+ //The CXF @Feature on the endpoint ensures exchanged messages are written to the server log
+ assertEquals("foo", port.echo("foo"));
+ }
+
+ public void testLoggingWithCustomInterceptors() throws Exception
+ {
+ URL wsdlURL = new URL(loggingInterceptorsEndpointURL + "?wsdl");
+ QName serviceName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingInterceptorsService");
+ Service service = Service.create(wsdlURL, serviceName);
+ QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/", "LoggingInterceptorsEndpointPort");
+ port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class);
+ assertEquals("foo", port.echo("foo"));
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
JBossWS SVN: r12606 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples and 11 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-08 09:50:00 -0400 (Thu, 08 Jul 2010)
New Revision: 12606
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
Removed:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsa/
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3073] Moving WS-Addressing testcase out of testsuite requiring spring
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-07-08 09:25:32 UTC (rev 12605)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-07-08 13:50:00 UTC (rev 12606)
@@ -76,24 +76,6 @@
</metainf>
</jar>
-
-
- <!-- jaxws-samples-wsa -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- </webinf>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
- prefix="WEB-INF/wsdl"/>
- </war>
-
<!-- jaxws-samples-wsrm -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-07-08 09:25:32 UTC (rev 12605)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-07-08 13:50:00 UTC (rev 12606)
@@ -58,6 +58,22 @@
</classes>
</war>
+ <!-- jaxws-samples-wsa -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
<!-- Please add alphabetically -->
</target>
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,58 @@
+/*
+ * 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.test.ws.jaxws.samples.wsa;
+
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.AddressingFeature;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Client invoking web service using WS-Addressing
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class AddressingTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war");
+ }
+
+ public void test() throws Exception
+ {
+ // construct proxy
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class, new AddressingFeature());
+ // invoke method
+ assertEquals("Hello World!", proxy.sayHello());
+ }
+
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,35 @@
+/*
+ * 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.test.ws.jaxws.samples.wsa;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,42 @@
+/*
+ * 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.test.ws.jaxws.samples.wsa;
+
+import javax.jws.WebService;
+import javax.xml.ws.soap.Addressing;
+
+@WebService
+(
+ portName = "AddressingServicePort",
+ serviceName = "AddressingService",
+ wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface"
+)
+@Addressing(enabled=true, required=true)
+public class ServiceImpl implements ServiceIface
+{
+ public String sayHello()
+ {
+ return "Hello World!";
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,38 @@
+/*
+ * 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.test.ws.jaxws.samples.wsa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Mon Apr 21 16:36:02 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ */
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+
+public class SayHello {}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,55 @@
+/*
+ * 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.test.ws.jaxws.samples.wsa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Mon Apr 21 16:36:02 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ */
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+public class SayHelloResponse
+{
+
+ @XmlElement(name = "return")
+ private java.lang.String _return;
+
+ public java.lang.String get_return()
+ {
+ return this._return;
+ }
+
+ public void set_return( java.lang.String new_return )
+ {
+ this._return = new_return;
+ }
+
+}
+
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>AddressingService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddressingService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2010-07-08 13:50:00 UTC (rev 12606)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing">
+<xsd:element name="sayHello" type="tns:sayHello"/>
+<xsd:complexType name="sayHello">
+<xsd:sequence/>
+</xsd:complexType>
+<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+<xsd:complexType name="sayHelloResponse">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="return" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="sayHelloResponse">
+ <wsdl:part name="parameters" element="tns:sayHelloResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="sayHello">
+ <wsdl:part name="parameters" element="tns:sayHello">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="ServiceIface">
+ <wsdl:operation name="sayHello">
+ <wsdl:input name="sayHello" message="tns:sayHello">
+ </wsdl:input>
+ <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="sayHello">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHello">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHelloResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="AddressingService">
+ <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding">
+ <soap:address location="http://localhost:9090/hello"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months