JBossWS SVN: r11324 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources: schema and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-18 05:22:24 -0500 (Fri, 18 Dec 2009)
New Revision: 11324
Added:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties
Log:
[JBPAPP-3291] svn merge -r 11322:11323 https://svn.jboss.org/repos/jbossws/stack/native/trunk .
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-12-18 10:06:01 UTC (rev 11323)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-12-18 10:22:24 UTC (rev 11324)
@@ -17,4 +17,5 @@
http\://schemas.xmlsoap.org/ws/2004/09/policy=schema/policy-200409.xsd
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
Copied: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd (from rev 11323, stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2009-12-18 10:22:24 UTC (rev 11324)
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+ PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+ <!ATTLIST schema
+ xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+ <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+ <!ENTITY % p ''>
+ <!ENTITY % s ''>
+ ]>
+
+<!-- Schema for XML Signatures
+ http://www.w3.org/2000/09/xmldsig#
+ $Revision$ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+ Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/
+
+ This document is governed by the W3C Software License [1] as described
+ in the FAQ [2].
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+ [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+ version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+ <restriction base="base64Binary">
+ </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+ <sequence>
+ <element ref="ds:SignedInfo"/>
+ <element ref="ds:SignatureValue"/>
+ <element ref="ds:KeyInfo" minOccurs="0"/>
+ <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="SignatureValue" type="ds:SignatureValueType"/>
+ <complexType name="SignatureValueType">
+ <simpleContent>
+ <extension base="base64Binary">
+ <attribute name="Id" type="ID" use="optional"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+ <sequence>
+ <element ref="ds:CanonicalizationMethod"/>
+ <element ref="ds:SignatureMethod"/>
+ <element ref="ds:Reference" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+ <complexType name="CanonicalizationMethodType" mixed="true">
+ <sequence>
+ <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+ <!-- (0,unbounded) elements from (1,1) namespace -->
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+ <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+ <complexType name="SignatureMethodType" mixed="true">
+ <sequence>
+ <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+ <!-- (0,unbounded) elements from (1,1) external namespace -->
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+ <sequence>
+ <element ref="ds:Transforms" minOccurs="0"/>
+ <element ref="ds:DigestMethod"/>
+ <element ref="ds:DigestValue"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+ <attribute name="URI" type="anyURI" use="optional"/>
+ <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+ <element name="Transforms" type="ds:TransformsType"/>
+ <complexType name="TransformsType">
+ <sequence>
+ <element ref="ds:Transform" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <element name="Transform" type="ds:TransformType"/>
+ <complexType name="TransformType" mixed="true">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ <!-- (1,1) elements from (0,unbounded) namespaces -->
+ <element name="XPath" type="string"/>
+ </choice>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+ <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+ <choice maxOccurs="unbounded">
+ <element ref="ds:KeyName"/>
+ <element ref="ds:KeyValue"/>
+ <element ref="ds:RetrievalMethod"/>
+ <element ref="ds:X509Data"/>
+ <element ref="ds:PGPData"/>
+ <element ref="ds:SPKIData"/>
+ <element ref="ds:MgmtData"/>
+ <any processContents="lax" namespace="##other"/>
+ <!-- (1,1) elements from (0,unbounded) namespaces -->
+ </choice>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="KeyName" type="string"/>
+ <element name="MgmtData" type="string"/>
+
+ <element name="KeyValue" type="ds:KeyValueType"/>
+ <complexType name="KeyValueType" mixed="true">
+ <choice>
+ <element ref="ds:DSAKeyValue"/>
+ <element ref="ds:RSAKeyValue"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ </complexType>
+
+ <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+ <complexType name="RetrievalMethodType">
+ <sequence>
+ <element ref="ds:Transforms" minOccurs="0"/>
+ </sequence>
+ <attribute name="URI" type="anyURI"/>
+ <attribute name="Type" type="anyURI" use="optional"/>
+ </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+ <sequence maxOccurs="unbounded">
+ <choice>
+ <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+ <element name="X509SKI" type="base64Binary"/>
+ <element name="X509SubjectName" type="string"/>
+ <element name="X509Certificate" type="base64Binary"/>
+ <element name="X509CRL" type="base64Binary"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+ <sequence>
+ <element name="X509IssuerName" type="string"/>
+ <element name="X509SerialNumber" type="integer"/>
+ </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+ <choice>
+ <sequence>
+ <element name="PGPKeyID" type="base64Binary"/>
+ <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ <sequence>
+ <element name="PGPKeyPacket" type="base64Binary"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+ <sequence maxOccurs="unbounded">
+ <element name="SPKISexp" type="base64Binary"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##any" processContents="lax"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+ <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+ <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+ <sequence>
+ <element ref="ds:Reference" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+ <sequence>
+ <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+ <complexType name="SignaturePropertyType" mixed="true">
+ <choice maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ <!-- (1,1) elements from (1,unbounded) namespaces -->
+ </choice>
+ <attribute name="Target" type="anyURI" use="required"/>
+ <attribute name="Id" type="ID" use="optional"/>
+ </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+ <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+ <sequence>
+ <sequence minOccurs="0">
+ <element name="P" type="ds:CryptoBinary"/>
+ <element name="Q" type="ds:CryptoBinary"/>
+ </sequence>
+ <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+ <element name="Y" type="ds:CryptoBinary"/>
+ <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+ <sequence minOccurs="0">
+ <element name="Seed" type="ds:CryptoBinary"/>
+ <element name="PgenCounter" type="ds:CryptoBinary"/>
+ </sequence>
+ </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+ <sequence>
+ <element name="Modulus" type="ds:CryptoBinary"/>
+ <element name="Exponent" type="ds:CryptoBinary"/>
+ </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
15 years, 1 month
JBossWS SVN: r11323 - in stack/native/trunk/modules/core/src/main/resources: schema and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-18 05:06:01 -0500 (Fri, 18 Dec 2009)
New Revision: 11323
Added:
stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd
Modified:
stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties
Log:
[JBWS-2876] Adding xmldsig 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 2009-12-18 09:04:15 UTC (rev 11322)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2009-12-18 10:06:01 UTC (rev 11323)
@@ -18,4 +18,5 @@
http\://schemas.xmlsoap.org/ws/2004/09/policy=schema/policy-200409.xsd
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/xmldsig-core-schema.xsd
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2009-12-18 10:06:01 UTC (rev 11323)
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+ PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+ <!ATTLIST schema
+ xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+ <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+ <!ENTITY % p ''>
+ <!ENTITY % s ''>
+ ]>
+
+<!-- Schema for XML Signatures
+ http://www.w3.org/2000/09/xmldsig#
+ $Revision$ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+ Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+ of Technology, Institut National de Recherche en Informatique et en
+ Automatique, Keio University). All Rights Reserved.
+ http://www.w3.org/Consortium/Legal/
+
+ This document is governed by the W3C Software License [1] as described
+ in the FAQ [2].
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+ [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+ version="0.1" elementFormDefault="qualified">
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+ <restriction base="base64Binary">
+ </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+ <sequence>
+ <element ref="ds:SignedInfo"/>
+ <element ref="ds:SignatureValue"/>
+ <element ref="ds:KeyInfo" minOccurs="0"/>
+ <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="SignatureValue" type="ds:SignatureValueType"/>
+ <complexType name="SignatureValueType">
+ <simpleContent>
+ <extension base="base64Binary">
+ <attribute name="Id" type="ID" use="optional"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+ <sequence>
+ <element ref="ds:CanonicalizationMethod"/>
+ <element ref="ds:SignatureMethod"/>
+ <element ref="ds:Reference" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
+ <complexType name="CanonicalizationMethodType" mixed="true">
+ <sequence>
+ <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+ <!-- (0,unbounded) elements from (1,1) namespace -->
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+ <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+ <complexType name="SignatureMethodType" mixed="true">
+ <sequence>
+ <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+ <!-- (0,unbounded) elements from (1,1) external namespace -->
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+ <sequence>
+ <element ref="ds:Transforms" minOccurs="0"/>
+ <element ref="ds:DigestMethod"/>
+ <element ref="ds:DigestValue"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+ <attribute name="URI" type="anyURI" use="optional"/>
+ <attribute name="Type" type="anyURI" use="optional"/>
+</complexType>
+
+ <element name="Transforms" type="ds:TransformsType"/>
+ <complexType name="TransformsType">
+ <sequence>
+ <element ref="ds:Transform" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <element name="Transform" type="ds:TransformType"/>
+ <complexType name="TransformType" mixed="true">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ <!-- (1,1) elements from (0,unbounded) namespaces -->
+ <element name="XPath" type="string"/>
+ </choice>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+ </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Algorithm" type="anyURI" use="required"/>
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+ <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/>
+<complexType name="KeyInfoType" mixed="true">
+ <choice maxOccurs="unbounded">
+ <element ref="ds:KeyName"/>
+ <element ref="ds:KeyValue"/>
+ <element ref="ds:RetrievalMethod"/>
+ <element ref="ds:X509Data"/>
+ <element ref="ds:PGPData"/>
+ <element ref="ds:SPKIData"/>
+ <element ref="ds:MgmtData"/>
+ <any processContents="lax" namespace="##other"/>
+ <!-- (1,1) elements from (0,unbounded) namespaces -->
+ </choice>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="KeyName" type="string"/>
+ <element name="MgmtData" type="string"/>
+
+ <element name="KeyValue" type="ds:KeyValueType"/>
+ <complexType name="KeyValueType" mixed="true">
+ <choice>
+ <element ref="ds:DSAKeyValue"/>
+ <element ref="ds:RSAKeyValue"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ </complexType>
+
+ <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
+ <complexType name="RetrievalMethodType">
+ <sequence>
+ <element ref="ds:Transforms" minOccurs="0"/>
+ </sequence>
+ <attribute name="URI" type="anyURI"/>
+ <attribute name="Type" type="anyURI" use="optional"/>
+ </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/>
+<complexType name="X509DataType">
+ <sequence maxOccurs="unbounded">
+ <choice>
+ <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+ <element name="X509SKI" type="base64Binary"/>
+ <element name="X509SubjectName" type="string"/>
+ <element name="X509Certificate" type="base64Binary"/>
+ <element name="X509CRL" type="base64Binary"/>
+ <any namespace="##other" processContents="lax"/>
+ </choice>
+ </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType">
+ <sequence>
+ <element name="X509IssuerName" type="string"/>
+ <element name="X509SerialNumber" type="integer"/>
+ </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/>
+<complexType name="PGPDataType">
+ <choice>
+ <sequence>
+ <element name="PGPKeyID" type="base64Binary"/>
+ <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ <sequence>
+ <element name="PGPKeyPacket" type="base64Binary"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"
+ maxOccurs="unbounded"/>
+ </sequence>
+ </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/>
+<complexType name="SPKIDataType">
+ <sequence maxOccurs="unbounded">
+ <element name="SPKISexp" type="base64Binary"/>
+ <any namespace="##other" processContents="lax" minOccurs="0"/>
+ </sequence>
+</complexType>
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/>
+<complexType name="ObjectType" mixed="true">
+ <sequence minOccurs="0" maxOccurs="unbounded">
+ <any namespace="##any" processContents="lax"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+ <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+ <attribute name="Encoding" type="anyURI" use="optional"/>
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/>
+<complexType name="ManifestType">
+ <sequence>
+ <element ref="ds:Reference" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
+<complexType name="SignaturePropertiesType">
+ <sequence>
+ <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+ <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
+ <complexType name="SignaturePropertyType" mixed="true">
+ <choice maxOccurs="unbounded">
+ <any namespace="##other" processContents="lax"/>
+ <!-- (1,1) elements from (1,unbounded) namespaces -->
+ </choice>
+ <attribute name="Target" type="anyURI" use="required"/>
+ <attribute name="Id" type="ID" use="optional"/>
+ </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+ <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+ <sequence>
+ <sequence minOccurs="0">
+ <element name="P" type="ds:CryptoBinary"/>
+ <element name="Q" type="ds:CryptoBinary"/>
+ </sequence>
+ <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+ <element name="Y" type="ds:CryptoBinary"/>
+ <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+ <sequence minOccurs="0">
+ <element name="Seed" type="ds:CryptoBinary"/>
+ <element name="PgenCounter" type="ds:CryptoBinary"/>
+ </sequence>
+ </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+ <sequence>
+ <element name="Modulus" type="ds:CryptoBinary"/>
+ <element name="Exponent" type="ds:CryptoBinary"/>
+ </sequence>
+</complexType>
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
Property changes on: stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 1 month
JBossWS SVN: r11322 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/benchmark and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-18 04:04:15 -0500 (Fri, 18 Dec 2009)
New Revision: 11322
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java
Removed:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java
Modified:
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
Log:
svn merge -r 11309:11310 from 3.2.2 branch
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-12-17 13:21:00 UTC (rev 11321)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2009-12-18 09:04:15 UTC (rev 11322)
@@ -36,6 +36,14 @@
</fileset>
</jar>
+ <!-- jaxws-benchmark-basicdoclit -->
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-basicdoclit.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-benchmark-complex -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-benchmark-complex.jar">
<fileset dir="${tests.output.dir}/test-classes">
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-12-17 13:21:00 UTC (rev 11321)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -209,7 +209,8 @@
ExecutorService es = Executors.newFixedThreadPool(threadCount);
long startProcTime = new Date().getTime();
List<Future<Result>> futures = es.invokeAll(callables);
- procTime = procTime + (new Date().getTime() - startProcTime);
+ long currentRunProcTime = new Date().getTime() - startProcTime;
+ procTime = procTime + currentRunProcTime;
try
{
@@ -220,10 +221,12 @@
//ignore
}
+ long currentRunIterations = 0;
for (Future<Result> f : futures)
{
Result result = f.get();
long subtotal = result.getTotal();
+ currentRunIterations = currentRunIterations + subtotal;
total = total + subtotal;
failed = failed + result.getFailures();
if (verbose)
@@ -233,6 +236,12 @@
}
}
System.out.println();
+ System.out.println("----------- RUN STATS -------------");
+ System.out.println("Iterations: " + currentRunIterations);
+ System.out.println("Total processing time: " + currentRunProcTime + " ms");
+ System.out.println("Iterations/sec: " + 1000 * currentRunIterations / currentRunProcTime);
+ System.out.println("------------------------------------");
+ System.out.println();
}
System.out.println("------------------------------------");
System.out.println("Iterations: " + total);
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit)
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java
===================================================================
--- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-16 18:40:07 UTC (rev 11310)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
-import org.jboss.test.ws.jaxws.benchmark.Runner;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 16-Dec-2009
- *
- */
-public class BasicDocLitTest implements BenchmarkTest
-{
- private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basicdoclit/EndpointImpl";
- private String targetNS = "http://basicdoclit.test.benchmark.jaxws.ws.test.jboss.org/";
-
- public Object prepare() throws Exception
- {
- URL wsdlURL = new URL(endpointURL + "?wsdl");
- QName serviceName = new QName(targetNS, "EndpointService");
-
- Service service = Service.create(wsdlURL, serviceName);
- return service.getPort(Endpoint.class);
- }
-
- public void performIteration(Object port) throws Exception
- {
- Double val = Math.random();
- String par = "Hello" + val;
- String ret = ((Endpoint)port).echo(par, val);
- if (!(par.equals(ret)))
- {
- throw new Exception("Unexpected result: " + ret);
- }
- }
-
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/BasicDocLitTest.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
+import org.jboss.test.ws.jaxws.benchmark.Runner;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 16-Dec-2009
+ *
+ */
+public class BasicDocLitTest implements BenchmarkTest
+{
+ private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basicdoclit/EndpointImpl";
+ private String targetNS = "http://basicdoclit.test.benchmark.jaxws.ws.test.jboss.org/";
+
+ public Object prepare() throws Exception
+ {
+ URL wsdlURL = new URL(endpointURL + "?wsdl");
+ QName serviceName = new QName(targetNS, "EndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ return service.getPort(Endpoint.class);
+ }
+
+ public void performIteration(Object port) throws Exception
+ {
+ Double val = Math.random();
+ String par = "Hello" + val;
+ String ret = ((Endpoint)port).echo(par, val);
+ if (!(par.equals(ret)))
+ {
+ throw new Exception("Unexpected result: " + ret);
+ }
+ }
+
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-16 18:40:07 UTC (rev 11310)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-@WebService (name="Endpoint")
-@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
-public interface Endpoint
-{
- @WebMethod
- String echo(String input1, Double input2);
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/Endpoint.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService (name="Endpoint")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public interface Endpoint
+{
+ @WebMethod
+ String echo(String input1, Double input2);
+}
Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java
===================================================================
--- framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-16 18:40:07 UTC (rev 11310)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
-
-import javax.jws.WebService;
-
-import org.jboss.logging.Logger;
-import javax.ejb.Stateless;
-
-@Stateless
-@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.basicdoclit.Endpoint")
-public class EndpointImpl
-{
- // Provide logging
- private static Logger log = Logger.getLogger(EndpointImpl.class);
-
- public String echo(String input1, Double input2)
- {
- if (log.isInfoEnabled())
- {
- log.info("echo: " + input1 + " " + input2);
- }
- return input1;
- }
-}
Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java (from rev 11310, framework/branches/jbossws-framework-3.2.2.GA/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java)
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basicdoclit/EndpointImpl.java 2009-12-18 09:04:15 UTC (rev 11322)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.benchmark.test.basicdoclit;
+
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import javax.ejb.Stateless;
+
+@Stateless
+@WebService(serviceName="EndpointService", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.jaxws.benchmark.test.basicdoclit.Endpoint")
+public class EndpointImpl
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(EndpointImpl.class);
+
+ public String echo(String input1, Double input2)
+ {
+ if (log.isInfoEnabled())
+ {
+ log.info("echo: " + input1 + " " + input2);
+ }
+ return input1;
+ }
+}
15 years, 1 month
JBossWS SVN: r11321 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 08:21:00 -0500 (Thu, 17 Dec 2009)
New Revision: 11321
Modified:
stack/cxf/trunk/pom.xml
Log:
switch to new framework
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-12-17 13:20:34 UTC (rev 11320)
+++ stack/cxf/trunk/pom.xml 2009-12-17 13:21:00 UTC (rev 11321)
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss501.version>3.2.1.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.2.1.GA</jbossws.jboss510.version>
15 years, 1 month
JBossWS SVN: r11320 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 08:20:34 -0500 (Thu, 17 Dec 2009)
New Revision: 11320
Modified:
stack/metro/trunk/pom.xml
Log:
switch to new framework
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-12-17 13:20:00 UTC (rev 11319)
+++ stack/metro/trunk/pom.xml 2009-12-17 13:20:34 UTC (rev 11320)
@@ -45,7 +45,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss501.version>3.2.1.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.2.1.GA</jbossws.jboss510.version>
15 years, 1 month
JBossWS SVN: r11319 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 08:20:00 -0500 (Thu, 17 Dec 2009)
New Revision: 11319
Modified:
stack/native/trunk/pom.xml
Log:
switch to new framework
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-12-17 13:18:25 UTC (rev 11318)
+++ stack/native/trunk/pom.xml 2009-12-17 13:20:00 UTC (rev 11319)
@@ -48,7 +48,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.2.2-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.2.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.framework.version>3.3.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.2-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss501.version>3.2.1.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.2.1.GA</jbossws.jboss510.version>
15 years, 1 month
JBossWS SVN: r11318 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools/wsrunclient and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 08:18:25 -0500 (Thu, 17 Dec 2009)
New Revision: 11318
Removed:
framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
Log:
[JBWS-2875] removing AS IL jars from test classpath
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-12-17 11:44:58 UTC (rev 11317)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase.java 2009-12-17 13:18:25 UTC (rev 11318)
@@ -23,7 +23,6 @@
private static final boolean isUnix = ":".equals( PS );
private static final String SP = " ";
private static final String EXT = isUnix ? ".sh" : ".bat";
- private List<String> integrationJars;
private String commandLineProperties;
private String additionalClasspath;
private List<String> testsToExecute;
@@ -39,8 +38,6 @@
this.commandLineProperties = prepareEnvProperties(properties);
this.testsToExecute = getContent("jaxws/smoke/tools/wsrunclient/tests.txt");
assertTrue(this.testsToExecute.size() > 0);
- this.integrationJars = getContent("jaxws/smoke/tools/wsrunclient/jars.txt");
- assertTrue(this.integrationJars.size() > 0);
this.additionalClasspath = prepareAdditionalClasspath();
}
@@ -60,7 +57,7 @@
Map<String, String> env = new HashMap<String, String>();
env.put("WSRUNCLIENT_CLASSPATH", additionalClasspath);
env.put("JAVA_OPTS", commandLineProperties);
-
+
sb.append(jbossHome).append(FS).append("bin").append(FS).append("wsrunclient").append(EXT);
sb.append(SP).append("junit.textui.TestRunner").append(SP);
String commandWithoutTestParam = sb.toString();
@@ -82,7 +79,6 @@
this.commandLineProperties = null;
this.jbossHome = null;
this.testsToExecute = null;
- this.integrationJars = null;
}
/**
@@ -112,13 +108,6 @@
sb.append(FS).append("target").append(FS).append("junit-libs").append(FS).append("junit.jar");
}
- // setup jbossws integration jars
- String jbossClientDir = System.getProperty("jboss.home") + FS + "client" + FS;
- for (String jar : this.integrationJars)
- {
- sb.append(PS).append(jbossClientDir).append(jar);
- }
-
return sb.toString();
}
Deleted: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-12-17 11:44:58 UTC (rev 11317)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-12-17 13:18:25 UTC (rev 11318)
@@ -1,8 +0,0 @@
-jbossws-jboss50.jar
-jbossws-jboss500.jar
-jbossws-jboss501.jar
-jbossws-jboss510.jar
-jbossws-jboss60.jar
-jbossws-jboss600.jar
-jbossws-jboss601.jar
-jbossws-jboss610.jar
\ No newline at end of file
15 years, 1 month
JBossWS SVN: r11317 - stack/cxf/branches/jbossws-cxf-3.2.2.GA/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 06:44:58 -0500 (Thu, 17 Dec 2009)
New Revision: 11317
Modified:
stack/cxf/branches/jbossws-cxf-3.2.2.GA/src/main/distro/ReleaseNotes.txt
Log:
release notes
Modified: stack/cxf/branches/jbossws-cxf-3.2.2.GA/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.2.2.GA/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:41 UTC (rev 11316)
+++ stack/cxf/branches/jbossws-cxf-3.2.2.GA/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:58 UTC (rev 11317)
@@ -17,7 +17,7 @@
If you have any questions, please post to the JBossWS User Forum
http://www.jboss.org/index.html?module=bb&op=viewforum&f=276
-For details see the change log.
+For details see the change log.
http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.s...
For issues that are scheduled for future versions see the road map.
@@ -28,19 +28,35 @@
Bug
- TODO: enumerate
+ * [JBWS-2769] - Make sure our test suites for all stacks pass on Windows XP
+ * [JBWS-2806] - Wrong parameter number exception with explicit soap headers
+ * [JBWS-2809] - MessageContext WSDL_* properties not available in handlers
+ * [JBWS-2822] - JAX-WS Client endpoint configuration in jbossws-cxf.xml is ignored when using @WebServiceRef
+ * [JBWS-2853] - Ineffective implementation of string normalize method
+ * [JBWS-2859] - Optimize DefaultEndpoint.getTargetBeanClass() method
Feature Request
- TODO: enumerate
+ * [JBWS-2751] - JAXBIntroductions: support @XmlTransient, @XmlID, @XmlIDREF, @XmlElementWrapper and @XmlJavaTypeAdapter
Task
- TODO: enumerate
+ * [JBWS-2692] - Define client/server security policy for JBWS testsuite and run it under a security manager
+ * [JBWS-2765] - Verify logging redirection
+ * [JBWS-2770] - Rewrite org.jboss.test.ws.jaxws.binding testcase to get SOAPMessageContext from handlers
+ * [JBWS-2821] - Remove jbossws.sar from deploy directory
+ * [JBWS-2824] - test.log file not found exception when run the testsuite and wsprovide command log4j configuration is not initilized error
+ * [JBWS-2825] - Remove dependency on cxf-anttasks
+ * [JBWS-2826] - Give more time to copy the process inputstream and error stream in JBossWSTest
+ * [JBWS-2828] - Update to Apache CXF 2.2.5
+ * [JBWS-2835] - Remove deployers ordering workaround forAS 6.x series
+ * [JBWS-2836] - Remove unused jbossws-cxf.sar resources
+ * [JBWS-2840] - Implement support for SOAP12 protocol in wsprovide
+ * [JBWS-2848] - Fix build/testsuite for supporting AS 6.0.0.M1 integration target
Errata
- See: TODO: reference to associated JIRA issue
+ See: https://jira.jboss.org/jira/browse/JBWS-2866
This version of ${project.name} is based on CXF ${cxf.version}
15 years, 1 month
JBossWS SVN: r11316 - stack/cxf/trunk/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 06:44:41 -0500 (Thu, 17 Dec 2009)
New Revision: 11316
Modified:
stack/cxf/trunk/src/main/distro/ReleaseNotes.txt
Log:
release notes
Modified: stack/cxf/trunk/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/cxf/trunk/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:19 UTC (rev 11315)
+++ stack/cxf/trunk/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:41 UTC (rev 11316)
@@ -17,7 +17,7 @@
If you have any questions, please post to the JBossWS User Forum
http://www.jboss.org/index.html?module=bb&op=viewforum&f=276
-For details see the change log.
+For details see the change log.
http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.s...
For issues that are scheduled for future versions see the road map.
@@ -50,6 +50,44 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--------------------
+jbossws-cxf-3.2.2.GA
+--------------------
+
+Bug
+
+ * [JBWS-2769] - Make sure our test suites for all stacks pass on Windows XP
+ * [JBWS-2806] - Wrong parameter number exception with explicit soap headers
+ * [JBWS-2809] - MessageContext WSDL_* properties not available in handlers
+ * [JBWS-2822] - JAX-WS Client endpoint configuration in jbossws-cxf.xml is ignored when using @WebServiceRef
+ * [JBWS-2853] - Ineffective implementation of string normalize method
+ * [JBWS-2859] - Optimize DefaultEndpoint.getTargetBeanClass() method
+
+Feature Request
+
+ * [JBWS-2751] - JAXBIntroductions: support @XmlTransient, @XmlID, @XmlIDREF, @XmlElementWrapper and @XmlJavaTypeAdapter
+
+Task
+
+ * [JBWS-2692] - Define client/server security policy for JBWS testsuite and run it under a security manager
+ * [JBWS-2765] - Verify logging redirection
+ * [JBWS-2770] - Rewrite org.jboss.test.ws.jaxws.binding testcase to get SOAPMessageContext from handlers
+ * [JBWS-2821] - Remove jbossws.sar from deploy directory
+ * [JBWS-2824] - test.log file not found exception when run the testsuite and wsprovide command log4j configuration is not initilized error
+ * [JBWS-2825] - Remove dependency on cxf-anttasks
+ * [JBWS-2826] - Give more time to copy the process inputstream and error stream in JBossWSTest
+ * [JBWS-2828] - Update to Apache CXF 2.2.5
+ * [JBWS-2835] - Remove deployers ordering workaround forAS 6.x series
+ * [JBWS-2836] - Remove unused jbossws-cxf.sar resources
+ * [JBWS-2840] - Implement support for SOAP12 protocol in wsprovide
+ * [JBWS-2848] - Fix build/testsuite for supporting AS 6.0.0.M1 integration target
+
+Errata
+
+ See: https://jira.jboss.org/jira/browse/JBWS-2866
+
+This version of JBoss Web Services - Stack CXF is based on CXF 2.2.5
+
+--------------------
jbossws-cxf-3.2.1.GA
--------------------
15 years, 1 month
JBossWS SVN: r11315 - stack/metro/branches/jbossws-metro-3.2.2.GA/src/main/distro.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-17 06:44:19 -0500 (Thu, 17 Dec 2009)
New Revision: 11315
Modified:
stack/metro/branches/jbossws-metro-3.2.2.GA/src/main/distro/ReleaseNotes.txt
Log:
release notes
Modified: stack/metro/branches/jbossws-metro-3.2.2.GA/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.2.2.GA/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:01 UTC (rev 11314)
+++ stack/metro/branches/jbossws-metro-3.2.2.GA/src/main/distro/ReleaseNotes.txt 2009-12-17 11:44:19 UTC (rev 11315)
@@ -28,19 +28,24 @@
Bug
- TODO: enumerate
+ * [JBWS-2769] - Make sure our test suites for all stacks pass on Windows XP
+ * [JBWS-2820] - NPE when user has insufficent permissions to call a webservice method
+ * [JBWS-2853] - Ineffective implementation of string normalize method
+ * [JBWS-2859] - Optimize DefaultEndpoint.getTargetBeanClass() method
-Feature Request
-
- TODO: enumerate
-
Task
- TODO: enumerate
+ * [JBWS-2692] - Define client/server security policy for JBWS testsuite and run it under a security manager
+ * [JBWS-2770] - Rewrite org.jboss.test.ws.jaxws.binding testcase to get SOAPMessageContext from handlers
+ * [JBWS-2821] - Remove jbossws.sar from deploy directory
+ * [JBWS-2826] - Give more time to copy the process inputstream and error stream in JBossWSTest
+ * [JBWS-2835] - Remove deployers ordering workaround forAS 6.x series
+ * [JBWS-2840] - Implement support for SOAP12 protocol in wsprovide
+ * [JBWS-2848] - Fix build/testsuite for supporting AS 6.0.0.M1 integration target
Errata
- See: TODO: reference to associated JIRA issue
+ See: https://jira.jboss.org/jira/browse/JBWS-2867
This version of ${project.name} is based on the following Metro components:
* WSIT ${sun.wsit.version}
15 years, 1 month