JBossWS SVN: r11732 - in stack/native/trunk/modules/core/src/main/resources: schema and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-08 15:25:50 -0500 (Mon, 08 Mar 2010)
New Revision: 11732
Added:
stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd
stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd
Removed:
stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd
Modified:
stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
Log:
adding WS-Addressing 2006-03 schema
Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2010-03-08 18:46:23 UTC (rev 11731)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2010-03-08 20:25:50 UTC (rev 11732)
@@ -3,7 +3,8 @@
http\://www.jboss.com/ws-security/config=schema/jboss-ws-security_1_0.xsd
http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd
http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd
-http\://www.w3.org/2005/08/addressing=schema/ws-addr.xsd
+http\://www.w3.org/2005/08/addressing=schema/ws-addr-2005-08.xsd
+http\://www.w3.org/2006/03/addressing=schema/ws-addr-2006-03.xsd
http\://schemas.xmlsoap.org/ws/2004/08/eventing=schema/eventing_200408.xsd
http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd
http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd
@@ -19,4 +20,3 @@
http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schema/oasis-200401-wss-wssecurity-secext-1.0.xsd
http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schema/oasis-200401-wss-wssecurity-utility-1.0.xsd
http\://www.w3.org/2000/09/xmldsig#=schema/xmldsig-core-schema.xsd
-
Added: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd 2010-03-08 20:25:50 UTC (rev 11732)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!--
+ W3C XML Schema defined in the Web Services Addressing 1.0 specification
+ http://www.w3.org/TR/ws-addr-core
+
+ Copyright © 2005 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] 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.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://www.w3.org/2005/08/addressing"
+ targetNamespace="http://www.w3.org/2005/08/addressing"
+ blockDefault="#all"
+ elementFormDefault="qualified"
+ finalDefault=""
+ attributeFormDefault="unqualified">
+
+ <!-- Constructs from the WS-Addressing Core -->
+
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+ <xs:complexType name="EndpointReferenceType" mixed="false">
+ <xs:sequence>
+ <xs:element name="Address" type="tns:AttributedURIType"/>
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/>
+ <xs:element ref="tns:Metadata" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:complexType name="ReferenceParametersType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="Metadata" type="tns:MetadataType"/>
+ <xs:complexType name="MetadataType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="MessageID" type="tns:AttributedURIType"/>
+ <xs:element name="RelatesTo" type="tns:RelatesToType"/>
+ <xs:complexType name="RelatesToType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="RelationshipTypeOpenEnum">
+ <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="RelationshipType">
+ <xs:restriction base="xs:anyURI">
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="From" type="tns:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="To" type="tns:AttributedURIType"/>
+ <xs:element name="Action" type="tns:AttributedURIType"/>
+
+ <xs:complexType name="AttributedURIType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!-- Constructs from the WS-Addressing SOAP binding -->
+
+ <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+
+ <xs:simpleType name="FaultCodesOpenEnumType">
+ <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="FaultCodesType">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="tns:InvalidAddressingHeader"/>
+ <xs:enumeration value="tns:InvalidAddress"/>
+ <xs:enumeration value="tns:InvalidEPR"/>
+ <xs:enumeration value="tns:InvalidCardinality"/>
+ <xs:enumeration value="tns:MissingAddressInEPR"/>
+ <xs:enumeration value="tns:DuplicateMessageID"/>
+ <xs:enumeration value="tns:ActionMismatch"/>
+ <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+ <xs:enumeration value="tns:DestinationUnreachable"/>
+ <xs:enumeration value="tns:ActionNotSupported"/>
+ <xs:enumeration value="tns:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+ <xs:complexType name="AttributedUnsignedLongType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+ <xs:complexType name="AttributedQNameType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
+ <xs:complexType name="AttributedAnyType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+
+ <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+ <xs:complexType name="ProblemActionType" mixed="false">
+ <xs:sequence>
+ <xs:element ref="tns:Action" minOccurs="0"/>
+ <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
Added: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2010-03-08 20:25:50 UTC (rev 11732)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ W3C XML Schema defined in the Web Services Addressing 1.0 specification
+ http://www.w3.org/TR/ws-addr-core
+
+ Copyright © 2005 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] 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.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
+
+ <!-- Constructs from the WS-Addressing Core -->
+
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+ <xs:complexType name="EndpointReferenceType" mixed="false">
+ <xs:sequence>
+ <xs:element name="Address" type="tns:AttributedURIType"/>
+ <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
+ <xs:element ref="tns:Metadata" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
+ <xs:complexType name="ReferenceParametersType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="Metadata" type="tns:MetadataType"/>
+ <xs:complexType name="MetadataType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="MessageID" type="tns:AttributedURIType"/>
+ <xs:element name="RelatesTo" type="tns:RelatesToType"/>
+ <xs:complexType name="RelatesToType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="RelationshipTypeOpenEnum">
+ <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="RelationshipType">
+ <xs:restriction base="xs:anyURI">
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="From" type="tns:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="To" type="tns:AttributedURIType"/>
+ <xs:element name="Action" type="tns:AttributedURIType"/>
+
+ <xs:complexType name="AttributedURIType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!-- Constructs from the WS-Addressing SOAP binding -->
+
+ <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+
+ <xs:simpleType name="FaultCodesOpenEnumType">
+ <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="FaultCodesType">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="tns:InvalidAddressingHeader"/>
+ <xs:enumeration value="tns:InvalidAddress"/>
+ <xs:enumeration value="tns:InvalidEPR"/>
+ <xs:enumeration value="tns:InvalidCardinality"/>
+ <xs:enumeration value="tns:MissingAddressInEPR"/>
+ <xs:enumeration value="tns:DuplicateMessageID"/>
+ <xs:enumeration value="tns:ActionMismatch"/>
+ <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+ <xs:enumeration value="tns:DestinationUnreachable"/>
+ <xs:enumeration value="tns:ActionNotSupported"/>
+ <xs:enumeration value="tns:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+ <xs:complexType name="AttributedUnsignedLongType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+ <xs:complexType name="AttributedQNameType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+
+ <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+ <xs:complexType name="ProblemActionType" mixed="false">
+ <xs:sequence>
+ <xs:element ref="tns:Action" minOccurs="0"/>
+ <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
Deleted: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd 2010-03-08 18:46:23 UTC (rev 11731)
+++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd 2010-03-08 20:25:50 UTC (rev 11732)
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
-<!--
- W3C XML Schema defined in the Web Services Addressing 1.0 specification
- http://www.w3.org/TR/ws-addr-core
-
- Copyright © 2005 World Wide Web Consortium,
-
- (Massachusetts Institute of Technology, European Research Consortium for
- Informatics and Mathematics, Keio University). All Rights Reserved. This
- work is distributed under the W3C® Software License [1] 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.
-
- [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.w3.org/2005/08/addressing"
- targetNamespace="http://www.w3.org/2005/08/addressing"
- blockDefault="#all"
- elementFormDefault="qualified"
- finalDefault=""
- attributeFormDefault="unqualified">
-
- <!-- Constructs from the WS-Addressing Core -->
-
- <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
- <xs:complexType name="EndpointReferenceType" mixed="false">
- <xs:sequence>
- <xs:element name="Address" type="tns:AttributedURIType"/>
- <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/>
- <xs:element ref="tns:Metadata" minOccurs="0"/>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:complexType name="ReferenceParametersType" mixed="false">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="Metadata" type="tns:MetadataType"/>
- <xs:complexType name="MetadataType" mixed="false">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="MessageID" type="tns:AttributedURIType"/>
- <xs:element name="RelatesTo" type="tns:RelatesToType"/>
- <xs:complexType name="RelatesToType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:simpleType name="RelationshipTypeOpenEnum">
- <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
- </xs:simpleType>
-
- <xs:simpleType name="RelationshipType">
- <xs:restriction base="xs:anyURI">
- <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
- <xs:element name="From" type="tns:EndpointReferenceType"/>
- <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
- <xs:element name="To" type="tns:AttributedURIType"/>
- <xs:element name="Action" type="tns:AttributedURIType"/>
-
- <xs:complexType name="AttributedURIType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <!-- Constructs from the WS-Addressing SOAP binding -->
-
- <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
-
- <xs:simpleType name="FaultCodesOpenEnumType">
- <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
- </xs:simpleType>
-
- <xs:simpleType name="FaultCodesType">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="tns:InvalidAddressingHeader"/>
- <xs:enumeration value="tns:InvalidAddress"/>
- <xs:enumeration value="tns:InvalidEPR"/>
- <xs:enumeration value="tns:InvalidCardinality"/>
- <xs:enumeration value="tns:MissingAddressInEPR"/>
- <xs:enumeration value="tns:DuplicateMessageID"/>
- <xs:enumeration value="tns:ActionMismatch"/>
- <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
- <xs:enumeration value="tns:DestinationUnreachable"/>
- <xs:enumeration value="tns:ActionNotSupported"/>
- <xs:enumeration value="tns:EndpointUnavailable"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
- <xs:complexType name="AttributedUnsignedLongType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:unsignedLong">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
- <xs:complexType name="AttributedQNameType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:QName">
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
- <xs:complexType name="AttributedAnyType" mixed="false">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
-
- <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
- <xs:complexType name="ProblemActionType" mixed="false">
- <xs:sequence>
- <xs:element ref="tns:Action" minOccurs="0"/>
- <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
15 years
JBossWS SVN: r11731 - stack/metro/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-08 13:46:23 -0500 (Mon, 08 Mar 2010)
New Revision: 11731
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2948] Fix testsuite dependencies
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-03-08 18:28:54 UTC (rev 11730)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-03-08 18:46:23 UTC (rev 11731)
@@ -26,7 +26,6 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
- <jboss.metadata.common.version>2.0.0.Alpha13</jboss.metadata.common.version>
</properties>
<!-- Modules -->
@@ -537,10 +536,38 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
</exclusion>
@@ -557,23 +584,9 @@
<version>${jboss.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>${jboss.metadata.common.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${jboss.version}</version>
</dependency>
</dependencies>
<build>
15 years
JBossWS SVN: r11730 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-08 13:28:54 -0500 (Mon, 08 Mar 2010)
New Revision: 11730
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2948] Fix testsuite dependencies
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-08 18:17:50 UTC (rev 11729)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-08 18:28:54 UTC (rev 11730)
@@ -27,7 +27,6 @@
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
- <jboss.metadata.common.version>2.0.0.Alpha13</jboss.metadata.common.version>
</properties>
<!-- Modules -->
@@ -508,18 +507,13 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
+ <artifactId>jboss-as-aspects</artifactId>
<version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
+ <artifactId>jboss-as-connector</artifactId>
<version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>${jboss.metadata.common.version}</version>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
@@ -535,6 +529,27 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
15 years
JBossWS SVN: r11729 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-08 13:17:50 -0500 (Mon, 08 Mar 2010)
New Revision: 11729
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2948] Fixing test dependencies
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-03-08 14:50:23 UTC (rev 11728)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-03-08 18:17:50 UTC (rev 11729)
@@ -26,7 +26,6 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
- <jboss.metadata.common.version>2.0.0.Alpha13</jboss.metadata.common.version>
</properties>
<!-- Modules -->
@@ -502,18 +501,13 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
+ <artifactId>jboss-as-aspects</artifactId>
<version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
+ <artifactId>jboss-as-connector</artifactId>
<version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>${jboss.metadata.common.version}</version>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
@@ -529,6 +523,27 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
15 years
JBossWS SVN: r11728 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws: metadata/wsdl and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-08 09:50:23 -0500 (Mon, 08 Mar 2010)
New Revision: 11728
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
Log:
[JBWS-2953] fixing WebMethod detection to follow JAX-WS specification
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-03-08 14:49:24 UTC (rev 11727)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2010-03-08 14:50:23 UTC (rev 11728)
@@ -87,6 +87,7 @@
import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
import org.jboss.ws.metadata.wsdl.WSDLMIMEPart;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -586,11 +587,7 @@
{
String javaName = method.getName();
- // Methods added by JBoss AOP will be marked as synthetic and should be skipped.
- if (method.isSynthetic() == true)
- return;
-
- // skip asnyc methods, they dont need meta data representation
+ // skip async methods, they dont need meta data representation
if (method.getName().endsWith(Constants.ASYNC_METHOD_SUFFIX))
return;
@@ -932,35 +929,18 @@
epMetaData.clearOperations();
// Process @WebMethod annotations
- int webMethodCount = 0;
+ boolean webMethodFound = false;
for (Method method : wsClass.getMethods())
{
- WebMethod annotation = method.getAnnotation(WebMethod.class);
- boolean exclude = annotation != null && annotation.exclude();
- if (!exclude && (annotation != null || wsClass.isInterface()))
+ if (WSDLUtils.isWebMethod(method))
{
processWebMethod(epMetaData, method);
- webMethodCount++;
+ webMethodFound = true;
}
}
- // @WebService should expose all inherited methods if @WebMethod is never specified
- if (webMethodCount == 0 && !wsClass.isInterface())
- {
- for (Method method : wsClass.getMethods())
- {
- WebMethod annotation = method.getAnnotation(WebMethod.class);
- boolean exclude = annotation != null && annotation.exclude();
- if (!exclude && method.getDeclaringClass() != Object.class)
- {
- processWebMethod(epMetaData, method);
- webMethodCount++;
- }
- }
- }
-
- if (webMethodCount == 0)
- throw new WSException("No exposable methods found");
+ if (!webMethodFound)
+ throw new WSException("Exposable methods not found: " + wsClass);
}
protected void initWrapperGenerator(ClassLoader loader)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2010-03-08 14:49:24 UTC (rev 11727)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2010-03-08 14:50:23 UTC (rev 11728)
@@ -256,17 +256,11 @@
/** Check if this method should be ignored
*/
- public boolean checkIgnoreMethod(Method method)
+ public boolean checkIgnoreMethod(final Method method)
{
- String methodname = method.getName();
if (ignoredMethods == null)
{
ignoredMethods = new ArrayList<String>();
- Method[] objMethods = Object.class.getMethods();
- for (int i = 0; i < objMethods.length; i++)
- {
- ignoredMethods.add(objMethods[i].getName());
- }
//Add the SessionBean Methods to the ignore list
Method[] sbMethods = SessionBean.class.getMethods();
for (int i = 0; i < sbMethods.length; i++)
@@ -275,16 +269,58 @@
}
}
- boolean ignoreMethod = ignoredMethods.contains(methodname);
+ boolean ignoreMethod = ignoredMethods.contains(method.getName());
// FIXME: This code is a duplicate, it should read from the UMDM
- if (method.getDeclaringClass().isAnnotationPresent(WebService.class) && method.isAnnotationPresent(WebMethod.class) == false)
+ if (!isWebMethod(method))
ignoreMethod = true;
return ignoreMethod;
}
-
+
/**
+ * The public, non-static or non-final methods that satisfy one of the following conditions:
+ * 1. They are annotated with the javax.jws.WebMethod annotation with the exclude element set to
+ * false or missing (since false is the default for this annotation element).
+ * 2. They are not annotated with the javax.jws.WebMethod annotation but their declaring class has a
+ * javax.jws.WebService annotation.
+ * @param method to process
+ * @return true if webmethod, false otherwise
+ */
+ public static boolean isWebMethod(final Method method)
+ {
+ if (!isWebMethodCandidate(method))
+ return false;
+
+ final WebMethod webMethodAnnotation = method.getAnnotation(WebMethod.class);
+
+ if (webMethodAnnotation != null)
+ {
+ return !webMethodAnnotation.exclude();
+ }
+ else
+ {
+ return method.getDeclaringClass().getAnnotation(WebService.class) != null;
+ }
+ }
+
+ /**
+ * Only public, non-static and non-final methods are web method candidates.
+ *
+ * @param method to process
+ * @return true if satisfies modifier requirements, false otherwise
+ */
+ private static boolean isWebMethodCandidate(final Method method)
+ {
+ final int modifiers = method.getModifiers();
+ final boolean isPublic = Modifier.isPublic(modifiers);
+ final boolean isNotStatic = !Modifier.isStatic(modifiers);
+ final boolean isNotFinal = !Modifier.isFinal(modifiers);
+
+ return isPublic && isNotStatic && isNotFinal;
+ }
+
+ /**
* Chop "PortType" at the end of the String
* @param name
* @return
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2010-03-08 14:49:24 UTC (rev 11727)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/metadata/ToolsAnnotationMetaDataBuilder.java 2010-03-08 14:50:23 UTC (rev 11728)
@@ -75,7 +75,7 @@
private void generateOperationMetaData()
{
// Generate the Operation Metadata
- Method[] marr = endpoint.getDeclaredMethods();
+ Method[] marr = endpoint.getMethods();
if( marr != null)
{
int len = Array.getLength(marr);
15 years
JBossWS SVN: r11727 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws: samples/dar and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-08 09:49:24 -0500 (Mon, 08 Mar 2010)
New Revision: 11727
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarJMSEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.java
Log:
[JBWS-2953] fixing tests to follow JAX-WS specification
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBean.java 2010-03-08 14:26:21 UTC (rev 11726)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBean.java 2010-03-08 14:49:24 UTC (rev 11727)
@@ -53,7 +53,7 @@
{
@WebMethod
@PermitAll
- public final String doStuff()
+ public String doStuff()
{
return "i've done stuff";
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarJMSEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarJMSEndpoint.java 2010-03-08 14:26:21 UTC (rev 11726)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/DarJMSEndpoint.java 2010-03-08 14:49:24 UTC (rev 11727)
@@ -63,6 +63,7 @@
}
@Override
+ @WebMethod(exclude=true)
public void onMessage(Message message)
{
log.debug("onMessage: " + message);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java 2010-03-08 14:26:21 UTC (rev 11726)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJMSEndpoint.java 2010-03-08 14:49:24 UTC (rev 11727)
@@ -63,6 +63,7 @@
}
@Override
+ @WebMethod(exclude=true)
public void onMessage(Message message)
{
log.info("onMessage: " + message);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.java 2010-03-08 14:26:21 UTC (rev 11726)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.java 2010-03-08 14:49:24 UTC (rev 11727)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.news;
+import javax.jws.WebService;
+
import org.jboss.logging.Logger;
/**
@@ -29,6 +31,7 @@
* @author alessio.soldano(a)jboss.org
* @since 31-Jan-2008
*/
+@WebService
public abstract class AbstractPressReleaseEndpoint
{
private Logger log = Logger.getLogger(this.getClass());
15 years
JBossWS SVN: r11726 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: samples/addressing and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-03-08 09:26:21 -0500 (Mon, 08 Mar 2010)
New Revision: 11726
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpointImpl.java
Log:
[JBWS-2953] fixing tests to follow JAX-WS standard
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2010-03-05 17:59:27 UTC (rev 11725)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface1.java 2010-03-08 14:26:21 UTC (rev 11726)
@@ -21,9 +21,12 @@
*/
package org.jboss.test.ws.jaxws.jbws1505;
+import javax.jws.WebService;
+
/**
* @author Heiko.Braun(a)jboss.com
*/
+@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1505")
public interface Interface1
{
public int getMember1();
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2010-03-05 17:59:27 UTC (rev 11725)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/Interface2.java 2010-03-08 14:26:21 UTC (rev 11726)
@@ -22,17 +22,14 @@
package org.jboss.test.ws.jaxws.jbws1505;
import javax.jws.WebService;
-import javax.ejb.Remote;
/**
* @author Heiko.Braun(a)jboss.com
*/
@WebService(targetNamespace = "http://org.jboss.test.ws/jbws1505")
-@Remote
public interface Interface2 extends Interface1
{
public int getMember2();
public void setMember2(int member2);
-
public CustomType getCustomType();
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpointImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpointImpl.java 2010-03-05 17:59:27 UTC (rev 11725)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/StatefulEndpointImpl.java 2010-03-08 14:26:21 UTC (rev 11726)
@@ -63,7 +63,7 @@
private WebServiceContext context;
@Resource
- public void setContext(WebServiceContext context)
+ private void setContext(WebServiceContext context)
{
log.info("injecting: " + context);
this.context = context;
15 years
JBossWS SVN: r11725 - framework/trunk/testsuite/test/ant-import.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-05 12:59:27 -0500 (Fri, 05 Mar 2010)
New Revision: 11725
Modified:
framework/trunk/testsuite/test/ant-import/build-testsuite.xml
Log:
[JBWS-2948] Adding ejb3 vfs spi jar to classpath
Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2010-03-05 11:59:22 UTC (rev 11724)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2010-03-05 17:59:27 UTC (rev 11725)
@@ -353,6 +353,7 @@
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
<pathelement location="${jboss.server.lib}/jnpserver.jar"/>
<pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-ejb3-vfs-spi.jar"/>
<pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
<pathelement location="${jboss.server.lib}/netty.jar"/> <!-- For jaxrpc tests -->
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
15 years
JBossWS SVN: r11724 - stack/metro/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-05 06:59:22 -0500 (Fri, 05 Mar 2010)
New Revision: 11724
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2021][JBWS-2948] Using latest jboss-metadata-common
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-03-05 11:58:46 UTC (rev 11723)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-03-05 11:59:22 UTC (rev 11724)
@@ -26,6 +26,7 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <jboss.metadata.common.version>2.0.0.Alpha13</jboss.metadata.common.version>
</properties>
<!-- Modules -->
@@ -555,6 +556,25 @@
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>${jboss.metadata.common.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
15 years
JBossWS SVN: r11723 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-03-05 06:58:46 -0500 (Fri, 05 Mar 2010)
New Revision: 11723
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2021][JBWS-2948] Using latest jboss-metadata-common
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-05 11:58:12 UTC (rev 11722)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-03-05 11:58:46 UTC (rev 11723)
@@ -27,6 +27,7 @@
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
+ <jboss.metadata.common.version>2.0.0.Alpha13</jboss.metadata.common.version>
</properties>
<!-- Modules -->
@@ -515,6 +516,25 @@
<artifactId>jboss-as-security</artifactId>
<version>${jboss.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>${jboss.metadata.common.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
15 years