JBossWS SVN: r6424 - in container/jboss42: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 13:32:37 -0400 (Mon, 14 Apr 2008)
New Revision: 6424
Added:
container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/
Removed:
container/jboss42/branches/jbossws-jboss-4.2.1/
Log:
Tag jbossws-jboss42-4.2.1.SP1
Copied: container/jboss42/tags/jbossws-jboss42-4.2.1.SP1 (from rev 6423, container/jboss42/branches/jbossws-jboss-4.2.1)
16 years, 9 months
- 1
- 0
JBossWS SVN: r6423 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/samples and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-14 13:29:30 -0400 (Mon, 14 Apr 2008)
New Revision: 6423
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
stack/native/trunk/src/test/resources/jaxws/samples/wsrm/
stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/
stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
[JBWS-2097][JBWS-2138] adding WS-RM example for native based on prepared tutorial
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-14 17:12:06 UTC (rev 6422)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-14 17:29:30 UTC (rev 6423)
@@ -494,6 +494,18 @@
</metainf>
</jar>
+ <!-- jaxws-samples-wsrm -->
+ <war
+ warfile="${tests.output.dir}/libs/jaxws-samples-wsrm.war"
+ webxml="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/>
+ </classes>
+ <zipfileset
+ dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
<!-- Please add alphabetically -->
</target>
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsrm.client;
+
+import java.lang.reflect.Method;
+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;
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+
+/**
+ * Client invoking web service using WS-RM
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class SimpleServiceTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService";
+ private SimpleService proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (SimpleService)service.getPort(SimpleService.class);
+ }
+
+ public void test() throws Exception
+ {
+ proxy.ping(); // one way call
+ assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,60 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echo complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echo">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echo", propOrder = {
+ "arg0"
+})
+public class Echo {
+
+ protected String arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setArg0(String value) {
+ this.arg0 = value;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,62 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for echoResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="echoResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "echoResponse", propOrder = {
+ "_return"
+})
+public class EchoResponse {
+
+ @XmlElement(name = "return")
+ protected String _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReturn(String value) {
+ this._return = value;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,89 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse");
+ private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo");
+ private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link EchoResponse }
+ *
+ */
+ public EchoResponse createEchoResponse() {
+ return new EchoResponse();
+ }
+
+ /**
+ * Create an instance of {@link Ping }
+ *
+ */
+ public Ping createPing() {
+ return new Ping();
+ }
+
+ /**
+ * Create an instance of {@link Echo }
+ *
+ */
+ public Echo createEcho() {
+ return new Echo();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse")
+ public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) {
+ return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo")
+ public JAXBElement<Echo> createEcho(Echo value) {
+ return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping")
+ public JAXBElement<Ping> createPing(Ping value) {
+ return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,32 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ping complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ping">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ping")
+public class Ping {
+
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,45 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1-b03-
+ * Generated source version: 2.0
+ *
+ */
+@WebService(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+public interface SimpleService {
+
+
+ /**
+ *
+ * @param arg0
+ * @return
+ * returns java.lang.String
+ */
+ @WebMethod
+ @WebResult(targetNamespace = "")
+ @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo")
+ @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse")
+ public String echo(
+ @WebParam(name = "arg0", targetNamespace = "")
+ String arg0);
+
+ /**
+ *
+ */
+ @WebMethod
+ @Oneway
+ @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping")
+ public void ping();
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,53 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+
+
+/**
+ * This class was generated by the JAX-WS RI.
+ * JAX-WS RI 2.1.1-b03-
+ * Generated source version: 2.0
+ *
+ */
+@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/native/step1/wsprovide/generated/wsdl/SimpleService.wsdl")
+public class SimpleService_Service
+ extends Service
+{
+
+ private final static URL SIMPLESERVICE_WSDL_LOCATION;
+
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/home/opalka/TODO/TUTORIAL/native/step1/wsprovide/generated/wsdl/SimpleService.wsdl");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ SIMPLESERVICE_WSDL_LOCATION = url;
+ }
+
+ public SimpleService_Service(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SimpleService_Service() {
+ super(SIMPLESERVICE_WSDL_LOCATION, new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"));
+ }
+
+ /**
+ *
+ * @return
+ * returns SimpleService
+ */
+ @WebEndpoint(name = "SimpleServicePort")
+ public SimpleService getSimpleServicePort() {
+ return (SimpleService)super.getPort(new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort"), SimpleService.class);
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+package org.jboss.test.ws.jaxws.samples.wsrm.generated;
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsrm.service;
+
+import javax.jws.Oneway;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ name = "SimpleService",
+ serviceName = "SimpleService",
+ wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm"
+)
+public class SimpleServiceImpl
+{
+ @Oneway
+ @WebMethod
+ public void ping()
+ {
+ System.out.println("ping()");
+ }
+
+ @WebMethod
+ public String echo(String s)
+ {
+ System.out.println("echo(" + s + ")");
+ return s;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,26 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.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;
+
+@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class Echo {
+
+ @XmlElement(name = "arg0", namespace = "")
+ private String arg0;
+
+ public String getArg0() {
+ return this.arg0;
+ }
+
+ public void setArg0(String arg0) {
+ this.arg0 = arg0;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,26 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.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;
+
+@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class EchoResponse {
+
+ @XmlElement(name = "return", namespace = "")
+ private String _return;
+
+ public String getReturn() {
+ return this._return;
+ }
+
+ public void setReturn(String _return) {
+ this._return = _return;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,15 @@
+
+package org.jboss.test.ws.jaxws.samples.wsrm.service.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;
+
+@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class Ping {
+
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-14 17:29:30 UTC (rev 6423)
@@ -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>SimpleService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SimpleService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-14 17:29:30 UTC (rev 6423)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='SimpleService' targetNamespace='http://www.jboss.org/jbossws/ws-extensions/wsrm' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://www.jboss.org/jbossws/ws-extensions/wsrm' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://www.jboss.org/jbossws/ws-extensions/wsrm' version='1.0' xmlns:tns='http://www.jboss.org/jbossws/ws-extensions/wsrm' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:element name='ping' type='tns:ping'/>
+ <xs:complexType name='ping'>
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='SimpleService_echo'>
+ <part element='tns:echo' name='echo'/>
+ </message>
+ <message name='SimpleService_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'/>
+ </message>
+ <message name='SimpleService_ping'>
+ <part element='tns:ping' name='ping'/>
+ </message>
+ <portType name='SimpleService'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:SimpleService_echo'/>
+ <output message='tns:SimpleService_echoResponse'/>
+ </operation>
+ <operation name='ping'>
+ <input message='tns:SimpleService_ping'/>
+ </operation>
+ </portType>
+ <binding name='SimpleServiceBinding' type='tns:SimpleService'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='ping'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ </operation>
+ </binding>
+ <service name='SimpleService'>
+ <port binding='tns:SimpleServiceBinding' name='SimpleServicePort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
- 1
- 0
JBossWS SVN: r6422 - container/jboss42/branches/jbossws-jboss-4.2.1.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 13:12:06 -0400 (Mon, 14 Apr 2008)
New Revision: 6422
Modified:
container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
Log:
version=4.2.1.SP1
Modified: container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml 2008-04-14 14:31:11 UTC (rev 6421)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml 2008-04-14 17:12:06 UTC (rev 6422)
@@ -6,7 +6,7 @@
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.1-SNAPSHOT</version>
+ <version>4.2.1.SP1</version>
<organization>
<name>JBoss, a division of Red Hat</name>
16 years, 9 months
- 1
- 0
JBossWS SVN: r6421 - stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-14 10:31:11 -0400 (Mon, 14 Apr 2008)
New Revision: 6421
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
Log:
refactoring + repaired method names for variables that are keywords
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 14:04:55 UTC (rev 6420)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 14:31:11 UTC (rev 6421)
@@ -60,7 +60,6 @@
private static Logger log = Logger.getLogger(SourceWrapperGenerator.class);
private PrintStream stream;
private JCodeModel codeModel;
-
public SourceWrapperGenerator(ClassLoader loader, PrintStream stream)
{
@@ -82,28 +81,31 @@
codeModel.build(directory, stream);
}
- public void generate(ParameterMetaData pmd)
+ public void generate(ParameterMetaData parameterMD)
{
- List<WrappedParameter> wrappedParameters = pmd.getWrappedParameters();
- OperationMetaData operationMetaData = pmd.getOperationMetaData();
+ List<WrappedParameter> wrappedParameters = parameterMD.getWrappedParameters();
+ OperationMetaData operationMetaData = parameterMD.getOperationMetaData();
if (operationMetaData.isDocumentWrapped() == false)
+ {
throw new WSException("Operation is not document/literal (wrapped)");
+ }
if (wrappedParameters == null)
+ {
throw new WSException("Cannot generate a type when there is no type information");
+ }
- String wrapperName = pmd.getJavaTypeName();
+ String wrapperName = parameterMD.getJavaTypeName();
log.debug("Generating wrapper: " + wrapperName);
try
{
-
JDefinedClass clazz = codeModel._class(wrapperName);
- addClassAnnotations(clazz, pmd.getXmlName(), pmd.getXmlType(), null);
+ addClassAnnotations(clazz, parameterMD.getXmlName(), parameterMD.getXmlType(), null);
for (WrappedParameter wrapped : wrappedParameters)
{
- addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable());
+ addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable(), loader);
}
}
catch (Exception e)
@@ -111,10 +113,11 @@
throw new WSException("Could not generate wrapper type: " + wrapperName, e);
}
}
- public void generate(FaultMetaData fmd)
+
+ public void generate(FaultMetaData faultMD)
{
- String faultBeanName = fmd.getFaultBeanName();
- Class<?> exception = fmd.getJavaType();
+ String faultBeanName = faultMD.getFaultBeanName();
+ Class<?> exception = faultMD.getJavaType();
try
{
@@ -122,10 +125,12 @@
String[] propertyOrder = properties.keySet().toArray(new String[0]);
JDefinedClass clazz = codeModel._class(faultBeanName);
- addClassAnnotations(clazz, fmd.getXmlName(), fmd.getXmlType(), propertyOrder);
+ addClassAnnotations(clazz, faultMD.getXmlName(), faultMD.getXmlType(), propertyOrder);
for (String property : propertyOrder)
- addProperty(clazz, properties.get(property).getName(), new QName(property), property);
+ {
+ addProperty(clazz, properties.get(property).getName(), new QName(property), property, loader);
+ }
}
catch (Exception e)
{
@@ -135,47 +140,67 @@
private static String getterPrefix(Class<?> type)
{
- return Boolean.TYPE == type || Boolean.class == type ? "is" : "get";
+ return (Boolean.TYPE == type || Boolean.class == type) ? "is" : "get";
}
- private void addProperty(JDefinedClass clazz, String typeName, QName name, String variable)
- throws ClassNotFoundException
+ private static void addProperty(JDefinedClass clazz, String typeName, QName name, String variable, ClassLoader loader)
+ throws ClassNotFoundException
{
- variable = JavaUtils.isReservedKeyword(variable) ? "_" + variable : variable;
+ // be careful about reserved keywords when generating variable names
+ String realVariableName = JavaUtils.isReservedKeyword(variable) ? "_" + variable : variable;
+
+ // define variable
Class<?> type = JavaUtils.loadJavaType(typeName, loader);
- JFieldVar field = clazz.field(JMod.PRIVATE, type, variable);
+ JFieldVar field = clazz.field(JMod.PRIVATE, type, realVariableName);
+
+ // define XmlElement annotation for variable
JAnnotationUse annotation = field.annotate(XmlElement.class);
+ annotation.param("name", name.getLocalPart());
if (name.getNamespaceURI() != null)
+ {
annotation.param("namespace", name.getNamespaceURI());
- annotation.param("name", name.getLocalPart());
+ }
- // Add acessor methods
+ // generate acessor get method for variable
JMethod method = clazz.method(JMod.PUBLIC, type, getterPrefix(type) + JavaUtils.capitalize(variable));
- method.body()._return(JExpr._this().ref(variable));
-
+ method.body()._return(JExpr._this().ref(realVariableName));
+
+ // generate acessor set method for variable
method = clazz.method(JMod.PUBLIC, void.class, "set" + JavaUtils.capitalize(variable));
- method.body().assign(JExpr._this().ref(variable), method.param(type, variable));
+ method.body().assign(JExpr._this().ref(realVariableName), method.param(type, realVariableName));
}
private static void addClassAnnotations(JDefinedClass clazz, QName xmlName, QName xmlType, String[] propertyOrder)
{
- JAnnotationUse annotation = clazz.annotate(XmlRootElement.class);
- if (xmlName.getNamespaceURI() != null && xmlName.getNamespaceURI().length() > 0)
- annotation.param("namespace", xmlName.getNamespaceURI());
- annotation.param("name", xmlName.getLocalPart());
+ // define XmlRootElement class annotation
+ JAnnotationUse xmlRootElementAnnotation = clazz.annotate(XmlRootElement.class);
+ xmlRootElementAnnotation.param("name", xmlName.getLocalPart());
+ String xmlNameNS = xmlName.getNamespaceURI();
+ if (xmlNameNS != null && xmlNameNS.length() > 0)
+ {
+ xmlRootElementAnnotation.param("namespace", xmlNameNS);
+ }
- annotation = clazz.annotate(XmlType.class);
- if (xmlType.getNamespaceURI() != null & xmlType.getNamespaceURI().length() > 0)
- annotation.param("namespace", xmlType.getNamespaceURI());
- annotation.param("name", xmlType.getLocalPart());
+ // define XmlType class annotation
+ JAnnotationUse xmlTypeAnnotation = clazz.annotate(XmlType.class);
+ xmlTypeAnnotation.param("name", xmlType.getLocalPart());
+ String xmlTypeNS = xmlType.getNamespaceURI();
+ if (xmlTypeNS != null & xmlTypeNS.length() > 0)
+ {
+ xmlTypeAnnotation.param("namespace", xmlTypeNS);
+ }
if (propertyOrder != null)
{
- JAnnotationArrayMember paramArray = annotation.paramArray("propOrder");
+ JAnnotationArrayMember paramArray = xmlTypeAnnotation.paramArray("propOrder");
for (String property : propertyOrder)
+ {
paramArray.param(property);
+ }
}
- annotation = clazz.annotate(XmlAccessorType.class);
- annotation.param("value", XmlAccessType.FIELD);
+ // define XmlAccessorType class annotation
+ JAnnotationUse xmlAccessorTypeAnnotation = clazz.annotate(XmlAccessorType.class);
+ xmlAccessorTypeAnnotation.param("value", XmlAccessType.FIELD);
}
+
}
\ No newline at end of file
16 years, 9 months
- 1
- 0
JBossWS SVN: r6420 - stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-14 10:04:55 -0400 (Mon, 14 Apr 2008)
New Revision: 6420
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
Log:
use explicit imports + fixing java warnings
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 13:50:16 UTC (rev 6419)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 14:04:55 UTC (rev 6420)
@@ -21,7 +21,14 @@
*/
package org.jboss.ws.tools.jaxws.impl;
-import com.sun.codemodel.*;
+import com.sun.codemodel.JAnnotationUse;
+import com.sun.codemodel.JAnnotationArrayMember;
+import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JDefinedClass;
+import com.sun.codemodel.JExpr;
+import com.sun.codemodel.JFieldVar;
+import com.sun.codemodel.JMethod;
+import com.sun.codemodel.JMod;
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxws.AbstractWrapperGenerator;
@@ -30,8 +37,11 @@
import org.jboss.ws.metadata.umdm.ParameterMetaData;
import org.jboss.ws.metadata.umdm.WrappedParameter;
import org.jboss.wsf.common.JavaUtils;
-
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import java.io.File;
import java.io.IOException;
@@ -81,11 +91,10 @@
throw new WSException("Operation is not document/literal (wrapped)");
if (wrappedParameters == null)
- throw new WSException("Cannot generate a type when their is no type information");
+ throw new WSException("Cannot generate a type when there is no type information");
String wrapperName = pmd.getJavaTypeName();
- if (log.isDebugEnabled())
- if(log.isDebugEnabled()) log.debug("Generating wrapper: " + wrapperName);
+ log.debug("Generating wrapper: " + wrapperName);
try
{
@@ -105,7 +114,7 @@
public void generate(FaultMetaData fmd)
{
String faultBeanName = fmd.getFaultBeanName();
- Class exception = fmd.getJavaType();
+ Class<?> exception = fmd.getJavaType();
try
{
@@ -124,7 +133,7 @@
}
}
- private static String getterPrefix(Class type)
+ private static String getterPrefix(Class<?> type)
{
return Boolean.TYPE == type || Boolean.class == type ? "is" : "get";
}
@@ -133,7 +142,7 @@
throws ClassNotFoundException
{
variable = JavaUtils.isReservedKeyword(variable) ? "_" + variable : variable;
- Class type = JavaUtils.loadJavaType(typeName, loader);
+ Class<?> type = JavaUtils.loadJavaType(typeName, loader);
JFieldVar field = clazz.field(JMod.PRIVATE, type, variable);
JAnnotationUse annotation = field.annotate(XmlElement.class);
if (name.getNamespaceURI() != null)
16 years, 9 months
- 1
- 0
JBossWS SVN: r6419 - in stack/cxf/branches/tdiesler/trunk: ant-import and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 09:50:16 -0400 (Mon, 14 Apr 2008)
New Revision: 6419
Added:
stack/cxf/branches/tdiesler/trunk/runtime/server/ant/
stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/META-INF/
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf.sar/
Removed:
stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/META-INF/
stack/cxf/branches/tdiesler/trunk/src/main/resources/
Modified:
stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
Log:
Migrate resource handling
Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -42,9 +42,8 @@
<include name="jbossws-cxf-server-${version.id}.jar"/>
</fileset>
</copy>
- <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${deploy.artifacts.dir}/lib/wstx.jar"/>
<copy todir="${deploy.artifacts.dir}/resources">
- <fileset dir="${cxf.output.resources.dir}">
+ <fileset dir="${cxf.runtime.server.dir}/target/resources">
<include name="jbossws-cxf42-beans.xml"/>
<include name="jbossws-cxf50-beans.xml"/>
<include name="jbossws-jboss42.sar/**"/>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -72,40 +72,8 @@
| documentation compiles.
-->
- <target name="compile" depends="init,compile-resources" description="Compile all source files."/>
+ <target name="compile" depends="init" description="Compile all source files."/>
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
-
- <!-- Concat jbossws-cxf50-beans.xml -->
- <mkdir dir="${cxf.output.resources.dir}"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <copy todir="${cxf.output.resources.dir}">
- <fileset dir="${cxf.resources.dir}">
- <include name="jbossws-cxf.sar/**"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
Added: stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main">
+
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+
+ <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="main" depends="init">
+
+ <!-- concat jbossws-cxf50-beans.xml -->
+ <echo message="Concat jbossws-cxf50-beans.xml"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-cxf50-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-cxf42-beans.xml -->
+ <echo message="Concat jbossws-cxf42-beans.xml"/>
+ <unzip dest="${project.build.resources.directory}" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-cxf42-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+</project>
Property changes on: stack/cxf/branches/tdiesler/trunk/runtime/server/ant/build-concat.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-14 13:34:48 UTC (rev 6418)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -6,6 +6,7 @@
<artifactId>jbossws-cxf-server</artifactId>
<packaging>jar</packaging>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-cxf-runtime</artifactId>
@@ -14,13 +15,23 @@
<!-- Plugins -->
<build>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <directory>src/main/resources/jbossws-cxf-server.jar</directory>
+ </resource>
+ <resource>
+ <targetPath>../resources/jbossws-cxf.sar</targetPath>
+ <directory>src/main/resources/jbossws-cxf.sar</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy</id>
+ <id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
@@ -32,6 +43,23 @@
</execution>
</executions>
</plugin>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="ant/build-concat.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml (from rev 6407, stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf-config.xml)
===================================================================
--- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml (rev 0)
+++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-14 13:50:16 UTC (rev 6419)
@@ -0,0 +1,126 @@
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+ </bean>
+
+ <!-- The registry for web service endpoints -->
+ <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- Logging redirector -->
+ <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
+ <property name="namespaces">
+ <list class="java.util.LinkedList" elementClass="java.lang.String">
+ <value>org.apache.cxf</value>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Installed Record Processors-->
+ <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+ </bean>
+ <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+ </bean>
+
+ <!--
+ The stack specific deployment aspects
+ -->
+ <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
+ <property name="requires">EndpointAddress</property>
+ <property name="provides">StackDescriptor</property>
+ <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
+ <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ </bean>
+
+ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler</property>
+ <property name="provides">StackEndpointHandler</property>
+ </bean>
+
+ <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
+
+ <!-- Phase 2 -->
+ <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ </bean>
+
+ <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+ </bean>
+
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-server.jar/META-INF (from rev 6407, stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/META-INF)
Copied: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf.sar (from rev 6407, stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf.sar)
16 years, 9 months
- 1
- 0
JBossWS SVN: r6418 - stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-14 09:34:48 -0400 (Mon, 14 Apr 2008)
New Revision: 6418
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
Log:
take care of reserved keywords when generating jaxws artifacts
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 13:04:11 UTC (rev 6417)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2008-04-14 13:34:48 UTC (rev 6418)
@@ -132,6 +132,7 @@
private void addProperty(JDefinedClass clazz, String typeName, QName name, String variable)
throws ClassNotFoundException
{
+ variable = JavaUtils.isReservedKeyword(variable) ? "_" + variable : variable;
Class type = JavaUtils.loadJavaType(typeName, loader);
JFieldVar field = clazz.field(JMod.PRIVATE, type, variable);
JAnnotationUse annotation = field.annotate(XmlElement.class);
16 years, 9 months
- 1
- 0
JBossWS SVN: r6417 - stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-04-14 09:04:11 -0400 (Mon, 14 Apr 2008)
New Revision: 6417
Modified:
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
Log:
Fix some compilation failures.
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-04-14 12:58:16 UTC (rev 6416)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/MicrosoftInteropTestCase.java 2008-04-14 13:04:11 UTC (rev 6417)
@@ -95,7 +95,7 @@
cal.set(Calendar.MINUTE, 22);
cal.set(Calendar.SECOND, 25);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
decoder.decode(soapEnv.getOwnerDocument());
decoder.complete();
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-04-14 12:58:16 UTC (rev 6416)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-04-14 13:04:11 UTC (rev 6417)
@@ -95,7 +95,7 @@
env = soapMsg.getSOAPPart().getEnvelope();
doc = env.getOwnerDocument();
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), null, null);
decoder.decode(doc);
decoder.verify(buildRequireOperations());
decoder.complete();
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-04-14 12:58:16 UTC (rev 6416)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SunInteropTestCase.java 2008-04-14 13:04:11 UTC (rev 6417)
@@ -72,7 +72,7 @@
cal.set(Calendar.MINUTE, 32);
cal.set(Calendar.SECOND, 25);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
decoder.decode(doc);
decoder.complete();
@@ -107,7 +107,7 @@
cal.set(Calendar.SECOND, 40);
- SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null);
+ SecurityDecoder decoder = new SecurityDecoder(new SecurityStore(), cal, null, null);
decoder.decode(doc);
decoder.complete();
16 years, 9 months
- 1
- 0
JBossWS SVN: r6416 - in stack/native/branches/dlofthouse/JBWS-1316: src/main/java/org/jboss/ws/extensions/security and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-04-14 08:58:16 -0400 (Mon, 14 Apr 2008)
New Revision: 6416
Added:
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpoint.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpointImpl.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestSecurityHandler.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jaxrpc-mapping.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jboss-wsse-server.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/web.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/webservices.xml
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/wstools-config.xml
Modified:
stack/native/branches/dlofthouse/JBWS-1316/ant-import-tests/build-jars-jaxrpc.xml
stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/operation/TimestampVerificationOperation.java
stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java
stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java
Log:
Added full message test case and completed implementation to make use of configuration.
Modified: stack/native/branches/dlofthouse/JBWS-1316/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/ant-import-tests/build-jars-jaxrpc.xml 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/ant-import-tests/build-jars-jaxrpc.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -2416,7 +2416,35 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
-
+
+ <!-- jaxrpc-jbws1316 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="jboss-wsse-server.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1316-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1316/WEB-INF">
+ <include name="wsdl/**"/>
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-jbws1378 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/SecurityDecoder.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -42,6 +42,7 @@
import org.jboss.ws.extensions.security.operation.RequireSignatureOperation;
import org.jboss.ws.extensions.security.operation.SignatureVerificationOperation;
import org.jboss.ws.extensions.security.operation.TimestampVerificationOperation;
+import org.jboss.ws.metadata.wsse.TimestampVerification;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -62,16 +63,19 @@
private NonceFactory nonceFactory;
private SecurityStore store;
+
+ private TimestampVerification timestampVerification;
private HashSet<String> signedIds = new HashSet<String>();
private HashSet<String> encryptedIds = new HashSet<String>();
- public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory)
+ public SecurityDecoder(SecurityStore store, NonceFactory nonceFactory, TimestampVerification timestampVerification)
{
org.apache.xml.security.Init.init();
this.store = store;
this.nonceFactory = nonceFactory;
+ this.timestampVerification = timestampVerification;
}
/**
@@ -81,9 +85,9 @@
* @param SecurityStore the security store that contains key and trust information
* @param now The timestamp to use as the current time when validating a message expiration
*/
- public SecurityDecoder(SecurityStore store, Calendar now, NonceFactory nonceFactory)
+ public SecurityDecoder(SecurityStore store, Calendar now, NonceFactory nonceFactory, TimestampVerification timestampVerification)
{
- this(store, nonceFactory);
+ this(store, nonceFactory, timestampVerification);
this.now = now;
}
@@ -110,7 +114,7 @@
if (timestamp != null)
{
TimestampVerificationOperation operation =
- (now == null) ? new TimestampVerificationOperation() : new TimestampVerificationOperation(now);
+ (now == null) ? new TimestampVerificationOperation(timestampVerification) : new TimestampVerificationOperation(now);
operation.process(message, timestamp);
}
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -214,7 +214,7 @@
SecurityStore securityStore = new SecurityStore(configuration.getKeyStoreURL(), configuration.getKeyStoreType(), configuration.getKeyStorePassword(),
configuration.getKeyPasswords(), configuration.getTrustStoreURL(), configuration.getTrustStoreType(), configuration.getTrustStorePassword());
NonceFactory factory = Util.loadFactory(NonceFactory.class, configuration.getNonceFactory(), DefaultNonceFactory.class);
- SecurityDecoder decoder = new SecurityDecoder(securityStore, factory);
+ SecurityDecoder decoder = new SecurityDecoder(securityStore, factory, configuration.getTimestampVerification());
decoder.decode(message.getSOAPPart(), secHeaderElement);
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/operation/TimestampVerificationOperation.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/operation/TimestampVerificationOperation.java 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/extensions/security/operation/TimestampVerificationOperation.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -23,18 +23,24 @@
import java.util.Calendar;
+import org.jboss.logging.Logger;
import org.jboss.ws.extensions.security.element.Timestamp;
import org.jboss.ws.extensions.security.exception.FailedCheckException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
+import org.jboss.ws.metadata.wsse.TimestampVerification;
import org.w3c.dom.Document;
-
public class TimestampVerificationOperation
{
+ private static final Logger log = Logger.getLogger(TimestampVerificationOperation.class);
+
+ private TimestampVerification timestampVerification;
+
private Calendar now = null;
- public TimestampVerificationOperation()
+ public TimestampVerificationOperation(TimestampVerification timestampVerification)
{
+ this.timestampVerification = timestampVerification;
}
/**
@@ -50,14 +56,51 @@
public void process(Document message, Timestamp timestamp) throws WSSecurityException
{
- Calendar expired = timestamp.getExpires();
+ Calendar expires = timestamp.getExpires();
Calendar created = timestamp.getCreated();
+
Calendar now = (this.now == null) ? Calendar.getInstance() : this.now;
- if (created.after(now))
+ boolean rejectCreated = created.after(now);
+ if (rejectCreated && timestampVerification != null && timestampVerification.getCreatedTolerance() > 0)
+ {
+ Calendar tolerantCreatedNow = (Calendar)now.clone();
+ tolerantCreatedNow.add(Calendar.SECOND, (int)timestampVerification.getCreatedTolerance());
+
+ rejectCreated = created.after(tolerantCreatedNow);
+
+ if (rejectCreated == false && timestampVerification.isWarnCreated())
+ {
+ log.warn("Accepting Timestamp with 'created' after now but within configured tolerance.");
+ }
+ }
+
+ if (rejectCreated)
+ {
throw new WSSecurityException("Invalid timestamp, message claimed to be created after now");
+ }
- if (expired != null && ! now.before(expired))
+ log.info("Now " + now);
+ log.info("Expires " + expires);
+ boolean rejectExpires = expires != null && !now.before(expires);
+ if (rejectExpires && timestampVerification != null && timestampVerification.getExpiresTolerance() > 0)
+ {
+ Calendar tolerantExpiresNow = (Calendar)now.clone();
+ tolerantExpiresNow.add(Calendar.SECOND, (int)timestampVerification.getExpiresTolerance() * -1);
+ log.info("Toleran Expires Now " + tolerantExpiresNow);
+
+ rejectExpires = !tolerantExpiresNow.before(expires);
+
+ if (rejectExpires == false && timestampVerification.isWarnExpires())
+ {
+ log.warn("Accepting Timestamp with 'expires' in past but within configured tolerance.");
+ }
+ }
+
+ if (rejectExpires)
+ {
throw new FailedCheckException("Expired message.");
+ }
+
}
}
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/main/java/org/jboss/ws/metadata/wsse/TimestampVerification.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -29,6 +29,7 @@
*
* @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
* @version $Revision$
+ * @since Aril 14 2008
*/
public class TimestampVerification implements Serializable
{
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,136 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.ws.jaxrpc.jbws1316;
+
+import java.rmi.RemoteException;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test case to test reading the TimestampVerification configuration.
+ *
+ * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
+ * @version $Revision$
+ * @since Aril 14 2008
+ */
+public class JBWS1316CallTestCase extends JBossWSTest
+{
+
+ private static final String MESSAGE = "Hello JBWS1316!!";
+
+ private static TestEndpoint port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1316CallTestCase.class, "jaxrpc-jbws1316.war, jaxrpc-jbws1316-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ /**
+ * Test that a message without a wsse:Security header is rejected.
+ *
+ * @throws Exception
+ */
+ public void testCall_NoSecurity() throws Exception
+ {
+ Stub stub = (Stub)port;
+ stub._setProperty(TestSecurityHandler.JBWS1316_CREATED, null);
+ stub._setProperty(TestSecurityHandler.JBWS1316_EXPIRES, null);
+
+ try
+ {
+ port.echoMessage(MESSAGE);
+ fail("Call should have failed due to no wsse:Security.");
+ }
+ catch (RemoteException e)
+ {
+ assertTrue(e.getMessage().contains("[InvalidSecurity]"));
+ }
+ }
+
+ public void testCall_ValidTimestamp() throws Exception
+ {
+ long started = System.currentTimeMillis();
+
+ Stub stub = (Stub)port;
+ stub._setProperty(TestSecurityHandler.JBWS1316_CREATED, Integer.valueOf(0));
+ stub._setProperty(TestSecurityHandler.JBWS1316_EXPIRES, Integer.valueOf(10));
+
+ String response = port.echoMessage(MESSAGE);
+ assertEquals("Expected Response", MESSAGE, response);
+
+ long finished = System.currentTimeMillis();
+ long duration = finished - started;
+ assertTrue("Execution time less than 10s", duration < 10000);
+ }
+
+ public void testCall_FutureTimestamp() throws Exception
+ {
+ long started = System.currentTimeMillis();
+
+ Stub stub = (Stub)port;
+ stub._setProperty(TestSecurityHandler.JBWS1316_CREATED, Integer.valueOf(10));
+ stub._setProperty(TestSecurityHandler.JBWS1316_EXPIRES, Integer.valueOf(20));
+
+ String response = port.echoMessage(MESSAGE);
+ assertEquals("Expected Response", MESSAGE, response);
+
+ long finished = System.currentTimeMillis();
+ long duration = finished - started;
+ assertTrue("Execution time less than 10s", duration < 10000);
+ }
+
+ public void testCall_PastExpires() throws Exception
+ {
+ long started = System.currentTimeMillis();
+
+ Stub stub = (Stub)port;
+ stub._setProperty(TestSecurityHandler.JBWS1316_CREATED, Integer.valueOf(0));
+ stub._setProperty(TestSecurityHandler.JBWS1316_EXPIRES, Integer.valueOf(-5));
+
+ String response = port.echoMessage(MESSAGE);
+ assertEquals("Expected Response", MESSAGE, response);
+
+ long finished = System.currentTimeMillis();
+ long duration = finished - started;
+ assertTrue("Execution time less than 10s", duration < 10000);
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java 2008-04-14 12:13:40 UTC (rev 6415)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316ConfigurationTestCase.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -35,6 +35,7 @@
*
* @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
* @version $Revision$
+ * @since Aril 14 2008
*/
public class JBWS1316ConfigurationTestCase extends JBossWSTest
{
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpoint.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpoint.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.ws.jaxrpc.jbws1316;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * Simple TestEndpoint to test the handling to WSSE timestamps.
+ *
+ * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
+ * @version $Revision$
+ * @since Aril 14 2008
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public String echoMessage(final String message) throws RemoteException;
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpointImpl.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.ws.jaxrpc.jbws1316;
+
+/**
+ * Simple TestEndpoint to test the handling to WSSE timestamps.
+ *
+ * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
+ * @version $Revision$
+ * @since Aril 14 2008
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echoMessage(String message)
+ {
+ return message;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestSecurityHandler.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestSecurityHandler.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestSecurityHandler.java 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,115 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.ws.jaxrpc.jbws1316;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.extensions.security.Constants;
+import org.jboss.ws.extensions.security.Util;
+import org.jboss.xb.binding.SimpleTypeBindings;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Simple handler to add wsse:Security and Timestamp to header in controlled
+ * way to test JBWS-1316 implementation.
+ *
+ * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
+ * @version $Revision$
+ * @since Aril 14 2008
+ */
+public class TestSecurityHandler extends GenericHandler
+{
+
+ public static final String JBWS1316_CREATED = "jbws1316.created";
+
+ public static final String JBWS1316_EXPIRES = "jbws1316.expires";
+
+ @Override
+ public boolean handleRequest(MessageContext msgContext)
+ {
+ Integer createdValue = (Integer)msgContext.getProperty(JBWS1316_CREATED);
+ Integer expiresValue = (Integer)msgContext.getProperty(JBWS1316_EXPIRES);
+
+ // Created is bare minimum to add the header.
+ if (createdValue == null)
+ {
+ return super.handleRequest(msgContext);
+ }
+
+ Calendar baseCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+
+ Calendar createdCalendar = (Calendar)baseCalendar.clone();
+ createdCalendar.add(Calendar.SECOND, createdValue);
+
+ Calendar expiresCalendar = null;
+
+ if (expiresValue != null)
+ {
+ expiresCalendar = (Calendar)baseCalendar.clone();
+ expiresCalendar.add(Calendar.SECOND, expiresValue);
+ }
+
+ CommonMessageContext ctx = (CommonMessageContext)msgContext;
+ SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage();
+ Document message = soapMessage.getSOAPPart();
+
+ Element soapHeader = Util.findOrCreateSoapHeader(message.getDocumentElement());
+
+ Element wsseSecurityElement = message.createElementNS(Constants.WSSE_NS, Constants.WSSE_HEADER);
+ Util.addNamespace(wsseSecurityElement, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ Util.addNamespace(wsseSecurityElement, Constants.WSU_PREFIX, Constants.WSU_NS);
+
+ Element wsseTimestampElement = message.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Timestamp");
+ wsseTimestampElement.setAttributeNS(Constants.WSU_NS, Constants.WSU_ID, "timestamp");
+ Element child = message.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Created");
+ child.appendChild(message.createTextNode(SimpleTypeBindings.marshalDateTime(createdCalendar)));
+ wsseTimestampElement.appendChild(child);
+ if (expiresCalendar != null)
+ {
+ child = message.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Expires");
+ child.appendChild(message.createTextNode(SimpleTypeBindings.marshalDateTime(expiresCalendar)));
+ wsseTimestampElement.appendChild(child);
+ }
+ wsseSecurityElement.appendChild(wsseTimestampElement);
+
+ soapHeader.insertBefore(wsseSecurityElement, soapHeader.getFirstChild());
+
+ return true;
+ }
+
+ @Override
+ public QName[] getHeaders()
+ {
+ return null;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/TestSecurityHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>HelloService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1316.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>ClientHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1316.TestSecurityHandler</handler-class>
+ </handler>
+ </service-ref>
+
+</application-client>
+
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1316?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jaxrpc-mapping.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1316</package-type>
+ <namespaceURI>http://ws.test.jboss.org/jbws1316/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1316.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://ws.test.jboss.org/jbws1316'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1316.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://ws.test.jboss.org/jbws1316'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://ws.test.jboss.org/jbws1316'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoMessage</java-method-name>
+ <wsdl-operation>echoMessage</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://ws.test.jboss.org/jbws1316'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://ws.test.jboss.org/jbws1316'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jboss-wsse-server.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+
+ <timestamp-verification createdTolerance="10" expiresTolerance="10" />
+
+ <config>
+ <requires>
+ <timestamp ttl="30" />
+ </requires>
+ </config>
+
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/web.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>Standard WSSecurity Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1316.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/webservices.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/webservices.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://ws.test.jboss.org/jbws1316'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1316.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/TestService.wsdl 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://ws.test.jboss.org/jbws1316' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://ws.test.jboss.org/jbws1316/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://ws.test.jboss.org/jbws1316' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echoMessage'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoMessageResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoMessage' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoMessage'/>
+ <output message='tns:TestEndpoint_echoMessageResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoMessage'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://ws.test.jboss.org/jbws1316' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://ws.test.jboss.org/jbws1316' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/wstools-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/wstools-config.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/wstools-config.xml 2008-04-14 12:58:16 UTC (rev 6416)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1316.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://ws.test.jboss.org/jbws1316" type-namespace="http://ws.test.jboss.org/jbws1316/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+</configuration>
Property changes on: stack/native/branches/dlofthouse/JBWS-1316/src/test/resources/jaxrpc/jbws1316/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 9 months
- 1
- 0
JBossWS SVN: r6415 - in stack/cxf/branches/tdiesler/trunk: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 08:13:40 -0400 (Mon, 14 Apr 2008)
New Revision: 6415
Removed:
stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
Modified:
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/version.properties
Log:
REmove dependency on thirdparty downloads
Deleted: stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <property file="${cxf.dir}/version.properties"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty" depends="thirdparty-classpath">
- </target>
-
- <target name="thirdparty-init" depends="prepare">
-
- <checksum file="${cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
- <property name="checksum.ok.${checksum.ok}" value="true"/>
-
- <property name="thirdparty.dir" value="${cxf.dir}/thirdparty"/>
- <condition property="force.thirdparty.get">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- </or>
- </condition>
- <echo message="checksum.ok=${checksum.ok}"/>
- </target>
-
- <target name="thirdparty-delete" depends="thirdparty-init" unless="checksum.ok.true">
- <delete dir="${thirdparty.dir}"/>
- </target>
-
- <!--
- thirdpartry-get
- -->
- <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
-
- <checksum file="${cxf.dir}/version.properties" fileext=".md5"/>
- </target>
-
- <target name="thirdparty-classpath" depends="thirdparty-get">
- <path id="cxf.integration.classpath">
- <!--
- A stack MUST NOT have a compile time dependency on framework
- http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071
- -->
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
-
- <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/>
- <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/>
-
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- </path>
- </target>
-
-</project>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -20,7 +20,6 @@
<import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
<import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
<!-- ================================================================== -->
@@ -55,7 +54,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="prepare,thirdparty">
+ <target name="init" depends="prepare">
<xmlproperty file="${cxf.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
<echo message="version.id=${version.id}"/>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -32,6 +32,12 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>1.2.0.GA</version>
+ <type>sar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf-version}</version>
@@ -86,6 +92,20 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>4.2.1-SNAPSHOT</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
Modified: stack/cxf/branches/tdiesler/trunk/version.properties
===================================================================
--- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-14 12:13:40 UTC (rev 6415)
@@ -6,6 +6,4 @@
cxf.geronimo.ws.metadata=2.0_spec
# Thirdparty library versions
-jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
-jboss-jaxr=1.2.0.GA
16 years, 9 months
- 1
- 0