[jboss-svn-commits] JBossWS SVN: r743 - in branches/tdiesler/trunk/src/main: java/org/jboss/ws/metadata/jaxrpcmapping java/org/jboss/ws/tools/helpers resources/jbossws.sar/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 14 05:52:59 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-14 05:52:54 -0400 (Mon, 14 Aug 2006)
New Revision: 743
Modified:
branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMapping.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
Log:
merge from head
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMapping.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMapping.java 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/jaxrpcmapping/JavaWsdlMapping.java 2006-08-14 09:52:54 UTC (rev 743)
@@ -314,14 +314,4 @@
{
serviceEndpointInterfaceMappings.add(serviceEndpointInterfaceMapping);
}
-
- public void removePackageMappingsByPackageType(String packageType)
- {
- for (int i = 0; i < packageMappings.size(); i++)
- {
- PackageMapping mapping = (PackageMapping)packageMappings.get(i);
- if (packageType.equals(mapping.getPackageType()))
- packageMappings.remove(i--);
- }
- }
}
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-08-14 09:52:54 UTC (rev 743)
@@ -213,7 +213,7 @@
for (OperationMetaData opMetaData : epMetaData.getOperations())
{
- if (opMetaData.isDocumentWrapped() == false)
+ if (opMetaData.isDocumentWrapped())
{
for (ParameterMetaData parameter : opMetaData.getParameters())
{
@@ -229,9 +229,6 @@
}
}
}
-
- // Filter generated wrapper type package (org.jboss.ws)
- mapping.removePackageMappingsByPackageType("org.jboss.ws.jaxrpc");
}
private void createWrapperType(ParameterMetaData parameter, String name, String packageName, Map<QName, JavaXmlTypeMapping> mappingIndex, ClassLoader classLoader,
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2006-08-14 09:52:54 UTC (rev 743)
@@ -2,9 +2,7 @@
<!-- $Id$ -->
-<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"
+<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>
@@ -12,23 +10,23 @@
</client-config>
<client-config>
- <config-name>Standard Secure Client</config-name>
+ <config-name>Standard WSAddressing Client</config-name>
<post-handler-chain>
- <handler-chain-name>PostHandlerChain</handler-chain-name>
+ <handler-chain-name>WSAddressing Handlers</handler-chain-name>
<handler>
- <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name>
- <j2ee:handler-class>org.jboss.ws.wsse.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class>
+ <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name>
+ <j2ee:handler-class>org.jboss.ws.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class>
</handler>
</post-handler-chain>
</client-config>
<client-config>
- <config-name>Standard Addressing Client</config-name>
+ <config-name>Standard WSSecurity Client</config-name>
<post-handler-chain>
- <handler-chain-name>PostHandlerChain</handler-chain-name>
+ <handler-chain-name>WSSecurity Handlers</handler-chain-name>
<handler>
- <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name>
- <j2ee:handler-class>org.jboss.ws.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class>
+ <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name>
+ <j2ee:handler-class>org.jboss.ws.wsse.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class>
</handler>
</post-handler-chain>
</client-config>
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2006-08-14 09:52:54 UTC (rev 743)
@@ -2,9 +2,7 @@
<!-- $Id$ -->
-<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"
+<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>
@@ -12,14 +10,25 @@
</endpoint-config>
<endpoint-config>
- <config-name>Standard Secure Endpoint</config-name>
+ <config-name>Standard WSAddressing Endpoint</config-name>
<pre-handler-chain>
- <handler-chain-name>PreHandlerChain</handler-chain-name>
+ <handler-chain-name>WSAddressing Handlers</handler-chain-name>
<handler>
+ <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name>
+ <j2ee:handler-class>org.jboss.ws.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.wsse.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class>
</handler>
</pre-handler-chain>
- </endpoint-config>
+ </endpoint-config>
</jaxrpc-config>
\ No newline at end of file
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2006-08-14 09:52:54 UTC (rev 743)
@@ -2,9 +2,7 @@
<!-- $Id$ -->
-<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"
+<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>
@@ -22,7 +20,7 @@
</javaee:handler>
</javaee:handler-chain>
</post-handler-chains>
- </client-config>
+ </client-config>
<client-config>
<config-name>Standard WSSecurity Client</config-name>
@@ -37,17 +35,4 @@
</post-handler-chains>
</client-config>
- <client-config>
- <config-name>Standard Addressing Client</config-name>
- <post-handler-chains>
- <javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
- <javaee:handler>
- <javaee:handler-name>SOAPClientHandler</javaee:handler-name>
- <javaee:handler-class>org.jboss.ws.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class>
- </javaee:handler>
- </javaee:handler-chain>
- </post-handler-chains>
- </client-config>
-
</jaxws-config>
\ No newline at end of file
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-08-14 09:49:19 UTC (rev 742)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2006-08-14 09:52:54 UTC (rev 743)
@@ -2,9 +2,7 @@
<!-- $Id$ -->
-<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"
+<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>
@@ -22,7 +20,7 @@
</javaee:handler>
</javaee:handler-chain>
</pre-handler-chains>
- </endpoint-config>
+ </endpoint-config>
<endpoint-config>
<config-name>Standard WSSecurity Endpoint</config-name>
@@ -35,6 +33,6 @@
</javaee:handler>
</javaee:handler-chain>
</pre-handler-chains>
- </endpoint-config>
+ </endpoint-config>
</jaxws-config>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list