May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3004 - in trunk/jbossws-core/src/resources: standard-config and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-08 19:24:24 -0400 (Tue, 08 May 2007) New Revision: 3004 Added: trunk/jbossws-core/src/resources/standard-config/ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml Removed: trunk/jbossws-core/src/resources/jbossws.sar/ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml Log: Move standard-config Copied: trunk/jbossws-core/src/resources/standard-config (from rev 3002, trunk/jbossws-core/src/resources/jbossws.sar/standard-config) Deleted: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - </client-config> - - <client-config> - <config-name>Standard MTOM client</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - -</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml (from rev 3003, trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + + <client-config> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + +</jaxrpc-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - - <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - -</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml (from rev 3003, trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + +</jaxrpc-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - <feature>http://org.jboss.ws/dispatch/validate</feature> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - -</jaxws-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml (from rev 3003, trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - -</jaxws-config> Copied: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml (from rev 3003, trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml 2007-05-08 23:24:24 UTC (rev 3004) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3003 - trunk/jbossws-core/src/resources/jbossws.sar/standard-config.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-08 19:21:56 -0400 (Tue, 08 May 2007) New Revision: 3003 Modified: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml Log: test Modified: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:21:56 UTC (rev 3003) @@ -11,7 +11,7 @@ <client-config> <config-name>Standard MTOM client</config-name> - <feature>http://org.jboss.ws/mtom</feature> + <feature>http://org.jboss.ws/mtom</feature> </client-config> <client-config>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3002 - in trunk/jbossws-core/src/resources/jbossws.sar: standard-config and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-08 19:16:31 -0400 (Tue, 08 May 2007) New Revision: 3002 Added: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml Removed: trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-client-config.xml trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-endpoint-config.xml Log: Move standard-config Copied: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml (from rev 3001, trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-client-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + + <client-config> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + +</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml (from rev 3001, trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-endpoint-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + +</jaxrpc-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml (from rev 3001, trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-client-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> \ No newline at end of file Copied: trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml (from rev 3001, trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-endpoint-config.xml) =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-config/standard-jaxws-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Deleted: trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-client-config.xml 2007-05-08 23:12:05 UTC (rev 3001) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - </client-config> - - <client-config> - <config-name>Standard MTOM client</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - -</jaxrpc-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:12:05 UTC (rev 3001) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - - <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - -</jaxrpc-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-client-config.xml 2007-05-08 23:12:05 UTC (rev 3001) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-client-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - <feature>http://org.jboss.ws/dispatch/validate</feature> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - -</jaxws-config> \ No newline at end of file Deleted: trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-endpoint-config.xml 2007-05-08 23:12:05 UTC (rev 3001) +++ trunk/jbossws-core/src/resources/jbossws.sar/standard-jaxws-endpoint-config.xml 2007-05-08 23:16:31 UTC (rev 3002) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - -</jaxws-config>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3001 - trunk/jbossws-core/src/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-08 19:12:05 -0400 (Tue, 08 May 2007) New Revision: 3001 Added: trunk/jbossws-core/src/resources/jbossws.sar/ Removed: trunk/jbossws-core/src/resources/standard-config/ Log: Move standard-config Copied: trunk/jbossws-core/src/resources/jbossws.sar (from rev 3000, trunk/jbossws-core/src/resources/standard-config)

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r3000 - in trunk: build and 13 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-08 19:09:24 -0400 (Tue, 08 May 2007) New Revision: 3000 Added: trunk/jbossws-core/src/java/javax/ trunk/jbossws-core/src/resources/jboss-jaxws.jar/ trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/ trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/services/ trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/services/javax.xml.ws.spi.Provider trunk/jbossws-core/src/resources/jboss-saaj.jar/ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MessageFactory trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MetaFactory trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPFactory trunk/jbossws-core/src/resources/standard-config/ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml Removed: trunk/build/etc/wsconsume.bat trunk/build/etc/wsconsume.sh trunk/build/etc/wsprovide.bat trunk/build/etc/wsprovide.sh trunk/build/etc/wspublish.sh trunk/build/etc/wsrunclient.bat trunk/build/etc/wsrunclient.sh trunk/build/etc/wstools-log4j.xml trunk/build/etc/wstools.bat trunk/build/etc/wstools.sh trunk/integration-jboss40/ trunk/integration-jboss42/ trunk/integration-jboss50/ trunk/integration-tomcat/ trunk/integration/ trunk/jbossws-api/ trunk/jbossws-core/src/resources/jbossws.sar/ Modified: trunk/build/ant-import/build-deploy.xml trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/version.properties trunk/jbossws-core/.classpath trunk/jbossws-core/build.xml trunk/jbossws-tests/.classpath trunk/jbossws-tests/build.xml Log: Externalize integration Modified: trunk/build/ant-import/build-deploy.xml =================================================================== --- trunk/build/ant-import/build-deploy.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant-import/build-deploy.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -45,49 +45,26 @@ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/bin" overwrite="true"> - <fileset dir="${build.etc.dir}"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="${api.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${api.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${integration.output.lib.dir}"> - <include name="jbossws-integration.jar"/> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> </fileset> </copy> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> -  - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target>  Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant-import/build-release.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -39,7 +39,7 @@ </target>  - <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" + <target name="release-to-repository" depends="core-jars" description="Release to jboss.local.repository">  @@ -61,68 +61,6 @@ <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> - -  - <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.zip"/> - <include name="jbossws50-src.zip"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss50.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - -  - <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss42.output.lib.dir}"> - <include name="jbossws42.sar"/> - <include name="jbossws42-src.zip"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss42.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - -  - <mkdir dir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws40.sar"/> - <include name="jbossws40-src.zip"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws-jboss40.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - -  - <mkdir dir="${jboss.repository.dir}/jbossws14/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws14/${repository.id}/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws40-jdk14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws14/${repository.id}/component-info.xml" file="${build.etc.dir}/component-info/jbossws14.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> </target> @@ -157,7 +95,7 @@   - <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" + <target name="build-bin-dist" depends="core-jars,build-samples,build-javadoc" description="Build the binary distribution"> <property name="install.bin.dir" value="${build.bin.dist}/install/bin"/> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant-import/build-samples.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -16,7 +16,7 @@  - <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars"> + <target name="build-samples" description="Builds the samples." depends="core-jars"> <property name="samples.target" value="jbossws-samples-${version.id}"/> <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant-import/build-setup.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -23,13 +23,6 @@ <property name="build.dir" value="${basedir}/../build"/> <property name="build.output.dir" value="${build.dir}/output"/> - <property name="docs.dir" value="${basedir}/../jbossws-docs"/> - <property name="integration.dir" value="${basedir}/../integration"/> - <property name="integration.jboss40.dir" value="${basedir}/../integration-jboss40"/> - <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> - <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> - <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/> - <property name="api.dir" value="${basedir}/../jbossws-api"/> <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="tests.dir" value="${basedir}/../jbossws-tests"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant-import/build-thirdparty.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -54,6 +54,8 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> @@ -107,6 +109,7 @@ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/mail.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/stax-api.jar"/> @@ -118,54 +121,6 @@ <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> -  - <path id="jboss50.integration.classpath"> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> - <path refid="core.classpath"/> - </path> - -  - <path id="jboss42.integration.classpath"> - <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss42.lib}/jboss-system.jar"/> - <pathelement location="${jboss42.server.lib}/jboss.jar"/> - <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/> - <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <path refid="core.classpath"/> - </path> - -  - <path id="jboss40.integration.classpath"> - <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> - <pathelement location="${jboss40.lib}/jboss-system.jar"/> - <pathelement location="${jboss40.server.lib}/jboss.jar"/> - <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <path refid="core.classpath"/> - </path> - -  - <path id="tomcat.integration.classpath"> - <path refid="core.classpath"/> - </path> - </target> </project> Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/ant.properties.example 2007-05-08 23:09:24 UTC (rev 3000) @@ -4,7 +4,7 @@ # $Id$ # Optional JBoss Home -#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/build.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -18,12 +18,6 @@ <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-samples.xml"/> <import file="${basedir}/ant-import/build-hudson.xml"/> - <import file="${basedir}/../integration/build.xml"/> - <import file="${basedir}/../integration-jboss40/build.xml"/> - <import file="${basedir}/../integration-jboss42/build.xml"/> - <import file="${basedir}/../integration-jboss50/build.xml"/> - <import file="${basedir}/../integration-tomcat/build.xml"/> - <import file="${basedir}/../jbossws-api/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/../jbossws-tests/build.xml"/> @@ -45,13 +39,7 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}/output"/> - <ant antfile="${api.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${integration.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${integration.jboss40.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/>  </target> Deleted: trunk/build/etc/wsconsume.bat =================================================================== --- trunk/build/etc/wsconsume.bat 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsconsume.bat 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,53 +0,0 @@ -@echo off - -rem $Id: wsgen.bat 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JAVA_HOME%/lib/tools.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-wsconsume-impl.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsconsume %* Deleted: trunk/build/etc/wsconsume.sh =================================================================== --- trunk/build/etc/wsconsume.sh 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsconsume.sh 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,82 +0,0 @@ -#!/bin/sh - -# $Id: wsgen.sh 2158 2007-01-27 06:20:59Z jason.greene(a)jboss.com $ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/wstx.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-wsconsume-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSCONSUME_CLASSPATH=`cygpath --path --windows "$WSCONSUME_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSCONSUME_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsconsume "$@" Deleted: trunk/build/etc/wsprovide.bat =================================================================== --- trunk/build/etc/wsprovide.bat 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsprovide.bat 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,48 +0,0 @@ -@echo off - -rem $Id$ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.ws.tools.jaxws.command.wsprovide %* Deleted: trunk/build/etc/wsprovide.sh =================================================================== --- trunk/build/etc/wsprovide.sh 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsprovide.sh 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,77 +0,0 @@ -#!/bin/sh - -# $Id$ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPROVIDE_CLASSPATH=`cygpath --path --windows "$WSPROVIDE_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSPROVIDE_CLASSPATH" \ - org.jboss.ws.tools.jaxws.command.wsprovide "$@" Deleted: trunk/build/etc/wspublish.sh =================================================================== --- trunk/build/etc/wspublish.sh 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wspublish.sh 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,73 +0,0 @@ -#!/bin/sh - -# $Id$ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$TOMCAT_HOME" ] && - TOMCAT_HOME=`cygpath --unix "$TOMCAT_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi -export TOMCAT_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the WSPUBLISH classpath -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-thirdparty.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/jbossws-core.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/log4j.jar" -WSPUBLISH_CLASSPATH="$WSPUBLISH_CLASSPATH:$TOMCAT_HOME/common/lib/servlet-api.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - TOMCAT_HOME=`cygpath --path --windows "$TOMCAT_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSPUBLISH_CLASSPATH=`cygpath --path --windows "$WSPUBLISH_CLASSPATH"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSPUBLISH Environment" -echo "" -echo " TOMCAT_HOME: $TOMCAT_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSPUBLISH_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -classpath "$WSPUBLISH_CLASSPATH" \ - org.jboss.ws.tools.wspublish -dest $TOMCAT_HOME/webapps "$@" - Deleted: trunk/build/etc/wsrunclient.bat =================================================================== --- trunk/build/etc/wsrunclient.bat 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsrunclient.bat 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,61 +0,0 @@ -@echo off - -rem $Id: wsprovide.bat 2325 2007-02-09 22:14:15Z jason.greene(a)jboss.com $ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - - -if not [%1] == [] goto start - echo %PROGNAME% is a command line tool that invokes a JBossWS JAX-WS Web Service client. - echo It builds the correct classpath and endorsed libs for you. Feel free to use - echo the code for this script to make your own shell scripts. It is open source - echo after all. - echo. - echo usage: %PROGNAME% [-classpath ^<additional class path^>] ^<java-main-class^> [arguments...] - goto EOF -:start -set ARGS= -:loop -if [%1] == [] goto endloop - if not %1 == -classpath goto argset - set WSRUNCLIENT_CLASSPATH=%2 - shift - shift - goto loop - :argset - set ARGS=%ARGS% %1 - shift - goto loop -:endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxb-impl.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-j2ee.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/mail.jar -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSRUNCLIENT_CLASSPATH%" %ARGS% -:EOF Deleted: trunk/build/etc/wsrunclient.sh =================================================================== --- trunk/build/etc/wsrunclient.sh 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wsrunclient.sh 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,99 +0,0 @@ -#!/bin/sh - -# $Id: wsprovide 2325 2007-02-09 22:14:15Z jason.greene(a)jboss.com $ -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -if [ $# -eq 0 ]; then - echo "$PROGNAME is a command line tool that invokes a JBossWS JAX-WS Web Service client." - echo "It builds the correct classpath and endorsed libs for you. Feel free to use" - echo "the code for this script to make your own shell scripts. It is open source" - echo "after all." - echo - echo "usage: $PROGNAME [-classpath <additional class path>] <java-main-class> [arguments...]" - exit 1; -fi - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/getopt.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-j2ee.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-ejb3x.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar" - -while [ $# -ge 1 ]; do - case $1 in - "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;; - *) args="$args \"$1\"";; - esac - shift -done - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSRUNCLIENT_CLASSPATH=`cygpath --path --windows "$WSRUNCLIENT_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Execute the JVM -eval "$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSRUNCLIENT_CLASSPATH" \ - "$args" Deleted: trunk/build/etc/wstools-log4j.xml =================================================================== --- trunk/build/etc/wstools-log4j.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wstools-log4j.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="INFO"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  -  -  - - <category name="org.jboss.ws"> - <priority value="WARN"/> - </category> - - <category name="org.jboss.remoting"> - <priority value="INFO"/> - </category> - -  - -  -  -  - - <root> - <appender-ref ref="CONSOLE"/> - </root> -</log4j:configuration> Deleted: trunk/build/etc/wstools.bat =================================================================== --- trunk/build/etc/wstools.bat 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wstools.bat 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,66 +0,0 @@ -@echo off - -rem $Id$ - -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=.\ -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% -set PROGNAME=run.bat -if "%OS%" == "Windows_NT" set PROGNAME=%~nx0% - -rem Read all command line arguments - -REM -REM The %ARGS% env variable commented out in favor of using %* to include -REM all args in java command line. See bug #840239. [jpl] -REM -REM set ARGS= -REM :loop -REM if [%1] == [] goto endloop -REM set ARGS=%ARGS% %1 -REM shift -REM goto loop -REM :endloop - -set JAVA=%JAVA_HOME%\bin\java -set JBOSS_HOME=%DIRNAME%\.. -rem Setup the java endorsed dirs -set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed - -rem Setup the wstools classpath -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/activation.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossretro-rt.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-backport-concurrent.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws14-client.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/mail.jar -set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar - -rem Display our environment -echo =========================================================================" -echo . -echo WSTools Environment -echo . -echo JBOSS_HOME: %JBOSS_HOME% -echo . -echo JAVA: %JAVA% -echo . -echo JAVA_OPTS: %JAVA_OPTS% -echo . -rem echo CLASSPATH: %WSTOOLS_CLASSPATH% -rem echo . -echo =========================================================================" -echo . - -rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSTOOLS_CLASSPATH%" org.jboss.ws.tools.WSTools %* - Deleted: trunk/build/etc/wstools.sh =================================================================== --- trunk/build/etc/wstools.sh 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/etc/wstools.sh 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,94 +0,0 @@ -#!/bin/sh - -# $Id$ - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="$JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Setup the wstools classpath -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/activation.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossretro-rt.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-backport-concurrent.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws14-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/log4j.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - WSTOOLS_CLASSPATH=`cygpath --path --windows "$WSTOOLS_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " WSTools Environment" -echo "" -echo " JBOSS_HOME: $JBOSS_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -#echo " CLASSPATH: $WSTOOLS_CLASSPATH" -#echo "" -echo "=========================================================================" -echo "" - -# Execute the JVM -"$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -Dlog4j.configuration=wstools-log4j.xml \ - -classpath "$WSTOOLS_CLASSPATH" \ - org.jboss.ws.tools.WSTools "$@" Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/build/version.properties 2007-05-08 23:09:24 UTC (rev 3000) @@ -3,10 +3,10 @@ specification.title=JBossWS specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-1.2 +specification.version=jbossws-2.1 version.id=2.1.0.DEV -repository.id=2.1.0.DEV +repository.id=SNAPSHOT implementation.title=JBoss Web Services (JBossWS) implementation.url=http://www.jboss.org/products/jbossws @@ -17,6 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 +jbossws-spi=SNAPSHOT jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 sun-jaxb=2.0.3jboss @@ -27,22 +28,7 @@ jboss-microcontainer=2.0.0.Beta3 jboss-remoting=2.0.0.GA -# JBossAS-5.0 -jboss-jbossxb-jboss50=2.0.0.CR2 -jboss-microcontainer-jboss50=2.0.0.Beta3 -jboss-remoting-jboss50=2.2.0.GA - -# JBossAS-4.2 -jboss-jbossxb-jboss42=1.0.0.CR10 -jboss-microcontainer-jboss42=1.0.2 -jboss-remoting-jboss42=2.0.0.GA - -# JBossAS-4.0 -jboss-jbossxb-jboss40=1.0.0.CR10 -jboss-microcontainer-jboss40=1.0.2 -jboss-remoting-jboss40=1.4.3.GA - -# thirdparty library versions +# Thirdparty library versions apache-ant=1.6.5 apache-collections=3.1 apache-log4j=1.2.8 Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/jbossws-core/.classpath 2007-05-08 23:09:24 UTC (rev 3000) @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/build/thirdparty/commons-logging.jar"/> @@ -32,6 +31,6 @@ <classpathentry kind="lib" path="/build/thirdparty/wstx.jar"/> <classpathentry kind="lib" path="/build/thirdparty/getopt.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws-api"/> + <classpathentry kind="lib" path="/build/thirdparty/jbossws-spi.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/jbossws-core/build.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -15,7 +15,6 @@ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../integration/build.xml"/> <property name="core.src.dir" value="${core.dir}/src"/> <property name="core.java.dir" value="${core.src.dir}/java"/> @@ -24,6 +23,7 @@ <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> + <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> <target name="core-init" depends="prepare, thirdparty"> @@ -45,23 +45,44 @@ description="Compile all source files."/>  - <target name="core-compile-classes" depends="core-init,integration-compile-classes"> + <target name="core-compile-classes" depends="core-init"> +  + <mkdir dir="${core.output.classes14.dir}"/> + <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> + <include name="javax/xml/rpc/**"/> + <include name="javax/xml/soap/**"/> + <classpath refid="core.classpath"/> + </javac> +  <mkdir dir="${core.output.classes.dir}"/> <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> + <include name="javax/annotation/**"/> + <include name="javax/xml/ws/**"/> + <include name="javax/jws/**"/> <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> + <classpath path="${core.output.classes14.dir}"/> <classpath refid="core.classpath"/> - <classpath path="${api.output.classes14.dir}"/> - <classpath path="${api.output.classes.dir}"/> - <classpath path="${integration.output.classes.dir}"/> </javac> </target>  - <target name="core-compile-etc" depends="core-init,integration-compile-etc"> + <target name="core-compile-etc" depends="core-init"> + <mkdir dir="${build.etc.dir}"/> + <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${build.dir}/etc"/> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> </target>  @@ -71,7 +92,7 @@  - <target name="core-jars" depends="core-compile,core-module-jars,integration-jars" description="Builds all jar files."> + <target name="core-jars" depends="core-compile,core-module-jars" description="Builds all jar files."> </target>  <target name="core-module-jars"> +  + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${core.output.classes14.dir}"> + <include name="javax/xml/rpc/**"/> + </fileset> + </jar> + +  + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${core.output.classes14.dir}"> + <include name="javax/xml/soap/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> + </jar> + +  + <mkdir dir="${core.output.lib.dir}"/> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="javax/annotation/**"/> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/> + </jar> +  <mkdir dir="${core.output.lib.dir}"/> <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf"> Copied: trunk/jbossws-core/src/java/javax (from rev 2998, trunk/jbossws-api/src/java/javax) Added: trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ trunk/jbossws-core/src/resources/jboss-jaxws.jar/META-INF/services/javax.xml.ws.spi.Provider 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1 @@ +org.jboss.ws.core.jaxws.spi.ProviderImpl \ No newline at end of file Added: trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MessageFactory =================================================================== --- trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MessageFactory (rev 0) +++ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MessageFactory 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.MessageFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MetaFactory =================================================================== --- trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MetaFactory (rev 0) +++ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.MetaFactory 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.SAAJMetaFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPFactory =================================================================== --- trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPFactory (rev 0) +++ trunk/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPFactory 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1 @@ +org.jboss.ws.core.soap.SOAPFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + </client-config> + + <client-config> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> + </handler> + </post-handler-chain> + </client-config> + +</jaxrpc-config> \ No newline at end of file Property changes on: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSAddressing Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <pre-handler-chain> + <handler-chain-name>WSSecurity Handlers</handler-chain-name> + <handler> + <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> + <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> + </handler> + </pre-handler-chain> + </endpoint-config> + +</jaxrpc-config> \ No newline at end of file Property changes on: trunk/jbossws-core/src/resources/standard-config/standard-jaxrpc-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> \ No newline at end of file Property changes on: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml (rev 0) +++ trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Property changes on: trunk/jbossws-core/src/resources/standard-config/standard-jaxws-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/jbossws-tests/.classpath 2007-05-08 23:09:24 UTC (rev 3000) @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="output/wsconsume/java"/> - <classpathentry kind="src" path="src/java"/> + <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/java"/> <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-tomcat"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws-api"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar"/> <classpathentry kind="lib" path="/build/thirdparty/policy.jar"/> <classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/> @@ -42,5 +37,6 @@ <classpathentry kind="lib" path="/build/thirdparty/jbosssx-client.jar" sourcepath="/build/thirdparty/jbosssx-src.zip"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common-core.jar" sourcepath="/build/thirdparty/jboss-common-core-sources.jar"/> + <classpathentry kind="lib" path="/build/thirdparty/jbossws-spi.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-05-08 08:00:49 UTC (rev 2999) +++ trunk/jbossws-tests/build.xml 2007-05-08 23:09:24 UTC (rev 3000) @@ -10,12 +10,9 @@ <project default="main" basedir="../jbossws-tests" name="JBossWS-Tests"> + <import file="${basedir}/../build/ant-import/build-deploy.xml"/> <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../integration-jboss50/build.xml"/> - <import file="${basedir}/../integration-jboss42/build.xml"/> - <import file="${basedir}/../integration-jboss40/build.xml"/> - <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> @@ -149,9 +146,9 @@ <property name="jbossws.classpath" value="jbossws.classpath.jdk14"/> <path id="jbossws.classpath.jdk15"> - <pathelement location="${api.output.lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${api.output.lib.dir}/jboss-jaxws.jar"/> - <pathelement location="${api.output.lib.dir}/jboss-saaj.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/> <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> <pathelement location="${integration.output.lib.dir}/jbossws-integration.jar"/>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r2999 - in branches/JBWS-856: jbossws-core/src/java/org/jboss/ws/metadata/wsse and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-05-08 04:00:49 -0400 (Tue, 08 May 2007) New Revision: 2999 Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl Log: Policy deployment seems to work in sample. Need to understand what is happening ws-security config after deployment of specif assertion Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-05-07 21:57:25 UTC (rev 2998) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-05-08 08:00:49 UTC (rev 2999) @@ -21,18 +21,29 @@ */ package org.jboss.ws.extensions.policy.deployer; +import java.io.ByteArrayOutputStream; +import java.io.StringWriter; +import java.nio.ByteOrder; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamWriter; + import org.apache.ws.policy.AndCompositeAssertion; import org.apache.ws.policy.Assertion; import org.apache.ws.policy.Policy; import org.apache.ws.policy.PrimitiveAssertion; import org.apache.ws.policy.XorCompositeAssertion; +import org.apache.ws.policy.util.PolicyFactory; +import org.apache.ws.policy.util.PolicyWriter; +import org.jboss.logging.Logger; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAlternative; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; +import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; @@ -44,14 +55,16 @@ */ public class PolicyDeployer { - + private final static Logger log = Logger.getLogger(PolicyDeployer.class); private static PolicyDeployer me; private Map<String, Class> domainDeployerMap = new HashMap<String, Class>(); static { me = new PolicyDeployer(); - me.domainDeployerMap.put("http://www.jboss.com/ws-security/config",WSSecurityAssertionDeployer.class); + me.domainDeployerMap.put("http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd",WSSecurityAssertionDeployer.class); + me.domainDeployerMap.put("mynamespace",WSSecurityAssertionDeployer.class); + } //hide constructor @@ -76,29 +89,50 @@ public Policy deployServerside(Policy policy, ExtensibleMetaData extMetaData) throws UnsupportedPolicy { - Policy returnedPolicy = (Policy) policy.normalize(); - ((XorCompositeAssertion) returnedPolicy.getTerms().get(0)).getTerms().clear(); - Policy originalPolicy = (Policy) policy.normalize(); +// ByteArrayOutputStream stream = new ByteArrayOutputStream(); +// PolicyWriter writer = +// PolicyFactory.getPolicyWriter(PolicyFactory.StAX_POLICY_WRITER); +// +// writer.writePolicy(policy, stream ); +// log.debug(stream.toString()); + + List<Assertion> returnedPolicyTerms = new LinkedList<Assertion>(); + + if (! policy.isNormalized()) + { + policy.normalize(); + } + // in normal form we have just one wsp:ExactlyOne elemnet containg unbounded wsp:All (alternative) - XorCompositeAssertion exactlyOne = (XorCompositeAssertion) originalPolicy.getTerms().get(0); + XorCompositeAssertion exactlyOne = (XorCompositeAssertion) policy.getTerms().get(0); + log.debug("####"+ exactlyOne.getClass()); + log.debug("####"+ exactlyOne.getTerms()); for (AndCompositeAssertion alternative: (List<AndCompositeAssertion>) exactlyOne.getTerms() ) { + log.debug("alternative"); try { deployAlternativeServerSide(alternative,extMetaData); - ((XorCompositeAssertion) returnedPolicy.getTerms().get(0)).addTerm(alternative); + returnedPolicyTerms.add(alternative); } catch (UnsupportedAlternative e) { + log.debug("Unsupported Alternative"); //policy is unsupported only if it have all alternative unsupported } } - if (((XorCompositeAssertion) returnedPolicy.getTerms().get(0)).getTerms().size() == 0) + if (returnedPolicyTerms.size() == 0) { + if (log.isDebugEnabled()) + { + log.debug("XorComposite zero element...Policy not supported"); + } throw new UnsupportedPolicy(); } - return returnedPolicy; + policy.getTerms().clear(); + policy.addTerms(returnedPolicyTerms); + return policy; } public void deployClientSide(Policy policy) @@ -123,6 +157,10 @@ } else { + if (log.isDebugEnabled()) + { + log.debug("Unknown Alternative type....Alternative not supported"); + } throw new UnsupportedAlternative(); } @@ -157,10 +195,15 @@ try { if (! domainDeployerMap.containsKey(namespace) ) { + if (log.isDebugEnabled()) + { + log.debug("Unknown namespace:"+namespace+"...Assertion not supported"); + } throw new UnsupportedAssertion(); } return (AssertionDeployer) (domainDeployerMap.get(namespace)).newInstance(); } catch (Exception e) { + throw new UnsupportedAssertion(); } } Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-07 21:57:25 UTC (rev 2998) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-08 08:00:49 UTC (rev 2999) @@ -1,5 +1,6 @@ package org.jboss.ws.extensions.policy.deployer; +import java.io.StringReader; import java.io.StringWriter; import javax.xml.stream.XMLOutputFactory; @@ -21,6 +22,7 @@ public void deploy(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion { + System.out.print("#########################"); StringWriter writer = new StringWriter(); if (extMetaData instanceof EndpointMetaData) { @@ -32,16 +34,21 @@ //GET XML of security assertion PrimitiveAssertionWriter.newInstance().writePrimitiveAssertion(assertion, writer); + StringReader reader = new StringReader(writer.toString()); + //Set security configuration - securityConfiguration = WSSecurityOMFactory.newInstance().parse(writer.toString()); + securityConfiguration = WSSecurityOMFactory.newInstance().parse(reader); WSSecurityConfigFactory.newInstance().initKeystorePath(ep.getRootFile(), securityConfiguration); ep.getServiceMetaData().setSecurityConfiguration(securityConfiguration); //set up handler chain as defined in standard file ep.setConfigName("Standard WSSecurity Endpoint"); ep.initEndpointConfig(); + + System.out.print("-----------#########################-------------"); } catch (Exception e) { + e.printStackTrace(); throw new UnsupportedAssertion(); } Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-05-07 21:57:25 UTC (rev 2998) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-05-08 08:00:49 UTC (rev 2999) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; import java.net.URL; import java.util.HashMap; @@ -114,7 +115,17 @@ return configuration; } + + public WSSecurityConfiguration parse(StringReader strReader) throws JBossXBException + { + if (strReader == null) + throw new IllegalArgumentException("Security InputStream cannot be null"); + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + WSSecurityConfiguration configuration = (WSSecurityConfiguration) unmarshaller.unmarshal(strReader, this, null); + return configuration; + } + /** * This method is called on the factory by the object model builder when the * parsing starts. Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 21:57:25 UTC (rev 2998) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-08 08:00:49 UTC (rev 2999) @@ -9,19 +9,23 @@ xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:jboss-ws-security> + <wsp:Policy wsu:Id="X509EndpointPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:jboss-ws-security xmlns:sp="mynamespace"> <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file> <sp:key-store-password>jbossws</sp:key-store-password> <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file> <sp:trust-store-password>jbossws</sp:trust-store-password> <sp:config> - <sp:encrypt type="x509v3" alias="wsse"/> + <sp:encrypt sp:type="x509v3" sp:alias="wsse"/> <sp:requires> <sp:encryption/> </sp:requires> </sp:config> - </sp:jboss-ws-security> + </sp:jboss-ws-security> + </wsp:All> + </wsp:ExactlyOne> </wsp:Policy> <binding name='HelloBinding' type='tns:Hello'> <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r2998 - in branches/JBWS-856: jbossws-core/src/java/org/jboss/ws/tools/wsdl and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: palin Date: 2007-05-07 17:57:25 -0400 (Mon, 07 May 2007) New Revision: 2998 Removed: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl Log: Bug fix on WSDL11Reader (namespace attribute adding with policy elements) Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-07 21:57:25 UTC (rev 2998) @@ -28,7 +28,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -482,44 +481,44 @@ } WSDLService wsdlService = wsdlDefinitions.getService(epMetaData.getServiceMetaData().getServiceName().getLocalPart()); - - System.out.println("****** getPortName="+epMetaData.getPortName()); - System.out.println("****** getPortTypeName="+epMetaData.getPortTypeName()); - System.out.println("****** get mio endpoint="+wsdlService.getEndpoint(epMetaData.getPortName())); - System.out.println("****** Endpoints: "); - for (int i=0;i<wsdlService.getEndpoints().length; i++) { - WSDLEndpoint end = wsdlService.getEndpoints()[i]; - System.out.println("****** "+i+") "+end); - System.out.println("****** "+i+") qname: "+end.getName()); - } - System.out.println("****** Interfaces: "); - for (int i=0;i<wsdlDefinitions.getInterfaces().length; i++) { - System.out.println("****** "+i+") "+wsdlDefinitions.getInterfaces()[i]); - } - System.out.println("****** Bindings: "); - for (int i=0;i<wsdlDefinitions.getBindings().length; i++) { - System.out.println("****** "+i+") "+wsdlDefinitions.getBindings()[i]); - } - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(epMetaData.getPortName()); WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName()); WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(epMetaData.getPortTypeName()); //Port scope - List<WSDLExtensibilityElement> portPolicyRefList = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); - deployPolicies(portPolicyRefList, PolicyScopeLevel.WSDL_PORT, localPolicyRegistry, epMetaData); + if (wsdlEndpoint != null) + { + List<WSDLExtensibilityElement> portPolicyRefList = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); + deployPolicies(portPolicyRefList, PolicyScopeLevel.WSDL_PORT, localPolicyRegistry, epMetaData); + } + else + { + log.warn("Cannot get port '"+epMetaData.getPortName()+"' from the given wsdl definitions!"); + } //Binding scope - List<WSDLExtensibilityElement> bindingPolicyRefList = wsdlBinding.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); - deployPolicies(bindingPolicyRefList, PolicyScopeLevel.WSDL_BINDING, localPolicyRegistry, epMetaData); + if (wsdlBinding != null) + { + List<WSDLExtensibilityElement> bindingPolicyRefList = wsdlBinding.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); + deployPolicies(bindingPolicyRefList, PolicyScopeLevel.WSDL_BINDING, localPolicyRegistry, epMetaData); + } + else + { + log.warn("Cannot get binding for portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions!"); + } //PortType scope - List<WSDLExtensibilityElement> portTypePolicyRefList = wsdlInterface.getExtensibilityElements(Constants.WSDL_PROPERTY_POLICYURIS); - deployPolicies(portTypePolicyRefList, PolicyScopeLevel.WSDL_PORT_TYPE, localPolicyRegistry, epMetaData); - + if (wsdlInterface != null) + { + List<WSDLExtensibilityElement> portTypePolicyRefList = wsdlInterface.getExtensibilityElements(Constants.WSDL_PROPERTY_POLICYURIS); + deployPolicies(portTypePolicyRefList, PolicyScopeLevel.WSDL_PORT_TYPE, localPolicyRegistry, epMetaData); + } + else + { + log.warn("Cannot get portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions!"); + } } - private void deployPolicies(List<WSDLExtensibilityElement> policyReferences, PolicyScopeLevel scope, PolicyRegistry localPolicies, ExtensibleMetaData extMetaData) { if (policyReferences != null && policyReferences.size() != 0 && extMetaData instanceof ServerEndpointMetaData) Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-05-07 21:57:25 UTC (rev 2998) @@ -367,7 +367,8 @@ } if (prefix!=null && nsUri == null) { - destElement.setAttribute("xmlns:"+prefix, srcElement.lookupNamespaceURI(prefix)); + destElement.setAttributeNS(Constants.NS_XMLNS,"xmlns:"+prefix,srcElement.lookupNamespaceURI(prefix)); + } NamedNodeMap attributes = destElement.getAttributes(); @@ -377,7 +378,7 @@ String attrPrefix = attr.getPrefix(); if (attrPrefix!=null && !attr.getName().startsWith("xmlns") && destElement.lookupNamespaceURI(attrPrefix) == null) { - destElement.setAttribute("xmlns:"+attrPrefix, srcElement.lookupNamespaceURI(attrPrefix)); + destElement.setAttributeNS(Constants.NS_XMLNS,"xmlns:"+attrPrefix,srcElement.lookupNamespaceURI(attrPrefix)); } } NodeList childrenList = destElement.getChildNodes(); Deleted: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/META-INF/wsdl/PolicyAttachmentFragment.wsdl 2007-05-07 21:57:25 UTC (rev 2998) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" - xmlns:tns="http://org.jboss.ws/jaxrpc" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." > - <wsp:Policy wsu:Id="X509EndpointPolicy" > - <sp:jboss-ws-security> - <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file> - <sp:key-store-password>jbossws</sp:key-store-password> - <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file> - <sp:trust-store-password>jbossws</sp:trust-store-password> - <sp:config> - <sp:encrypt type="x509v3" alias="wsse"/> - <sp:requires> - <sp:encryption/> - </sp:requires> - </sp:config> - </sp:jboss-ws-security> - </wsp:Policy> - <binding name='HelloBinding' type='tns:Hello'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> - <operation name='echoUserType'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> - </output> - </operation> - </binding> - <service name='HelloService'> - <port binding='tns:HelloBinding' name='HelloPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 21:42:10 UTC (rev 2997) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 21:57:25 UTC (rev 2998) @@ -6,8 +6,6 @@ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:fab="http://www.fabrikam123.example.com/stock" - xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...">

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r2997 - in branches/dlofthouse/JBWS-1597/jbossws-tests/src: java/org/jboss/test/ws/tools/jbws1597 and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-07 17:42:10 -0400 (Mon, 07 May 2007) New Revision: 2997 Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml Log: Initial test case. Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2007-05-07 21:42:10 UTC (rev 2997) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.tools.jbws1597; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 27 Apr 2007 + */ +public class JBWS1597TestCase extends JBossWSTest +{ + + public void testGenerateDocLitIn() throws Exception + { + generateScenario("doclit_in"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1597/" + scenario; + String toolsDir = "tools/jbws1597/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1597/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } + +} Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl 2007-05-07 21:42:10 UTC (rev 2997) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1597' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1597/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1597' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1597/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1597/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='BillingAccount'> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount' type='tns:BillingAccount'/> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/PhoneBook.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml (rev 0) +++ branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml 2007-05-07 21:42:10 UTC (rev 2997) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1597/doclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Property changes on: branches/dlofthouse/JBWS-1597/jbossws-tests/src/resources/tools/jbws1597/doclit_in/wstools-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r2996 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-07 17:32:11 -0400 (Mon, 07 May 2007) New Revision: 2996 Added: branches/dlofthouse/JBWS-1597/ Log: Recreate Copied: branches/dlofthouse/JBWS-1597 (from rev 2995, branches/jbossws-2.0)

17 years, 8 months

1
0
0 / 0

JBossWS SVN: r2995 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-07 17:31:36 -0400 (Mon, 07 May 2007) New Revision: 2995 Removed: branches/dlofthouse/JBWS-1597/ Log: Recreate

17 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007