JBossWS SVN: r8431 - stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 09:39:10 -0400 (Fri, 10 Oct 2008)
New Revision: 8431
Modified:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
Log:
[JBWS-2129] Fixing @SOAPBinding retrieval
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-10 13:01:06 UTC (rev 8430)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-10 13:39:10 UTC (rev 8431)
@@ -308,7 +308,7 @@
Invoker invoker = createInvoker(implementorClass);
//Generate wrappers
- if (isWrapperGenerationRequired(implementorClass))
+ if (isWrapperGenerationRequired(implementorClass, reader, this.classLoader))
{
WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
ClassLoader newClassLoader = wrapperGenerator.generate(implementationName, classLoader, archiveFile.toURL());
@@ -326,15 +326,26 @@
return adapters;
}
- private boolean isWrapperGenerationRequired(Class<?> endpoint)
+ private boolean isWrapperGenerationRequired(Class<?> endpoint, XMLStreamReader reader, ClassLoader classLoader)
{
WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class);
if (webServiceAnnotation == null)
return false;
String wsdlLocation = webServiceAnnotation.wsdlLocation();
+ String endpointInterface = webServiceAnnotation.endpointInterface();
if (wsdlLocation != null && !"".equals(wsdlLocation))
return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
- javax.jws.soap.SOAPBinding soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ javax.jws.soap.SOAPBinding soapBinding;
+ if (endpointInterface == null || "".equalsIgnoreCase(endpointInterface))
+ {
+ soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ }
+ else
+ {
+ //getting the annotation from the SEI
+ Class<?> sei = getImplementorClass(endpointInterface, reader, classLoader);
+ soapBinding = sei.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ }
if (soapBinding == null)
return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
17 years, 2 months
JBossWS SVN: r8430 - framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 09:01:06 -0400 (Fri, 10 Oct 2008)
New Revision: 8430
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
Log:
Fixing @WebService usage
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-10-10 12:54:01 UTC (rev 8429)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-10-10 13:01:06 UTC (rev 8430)
@@ -111,7 +111,7 @@
sb.append("import javax.ejb.Stateless;\n");
sb.append("import org.jboss.logging.Logger;\n");
sb.append("@Stateless\n");
- sb.append("@WebService(name=\"Endpoint\", serviceName=\"EndpointService\", endpointInterface = \"org.jboss.test.ws.projectGenerator.Endpoint\")\n");
+ sb.append("@WebService(serviceName=\"EndpointService\", endpointInterface = \"org.jboss.test.ws.projectGenerator.Endpoint\")\n");
sb.append("public class EndpointImpl {\n");
sb.append(" private static Logger log = Logger.getLogger(EndpointImpl.class);\n");
sb.append(" public String echo(String input) {\n");
17 years, 2 months
JBossWS SVN: r8429 - framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 08:54:01 -0400 (Fri, 10 Oct 2008)
New Revision: 8429
Modified:
framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml
Log:
[JBWS-2310] Running cleanup job on Saturday evening
Modified: framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml 2008-10-10 12:44:10 UTC (rev 8428)
+++ framework/trunk/hudson/hudson-home/jobs/Maven-Repository-Clean/config.xml 2008-10-10 12:54:01 UTC (rev 8429)
@@ -30,7 +30,11 @@
<canRoam>true</canRoam>
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
+ <triggers class="vector">
+ <hudson.triggers.TimerTrigger>
+ <spec>0 19 * * 6</spec>
+ </hudson.triggers.TimerTrigger>
+ </triggers>
<logRotator>
<daysToKeep>-1</daysToKeep>
<numToKeep>20</numToKeep>
17 years, 2 months
JBossWS SVN: r8428 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples: logicalhandler and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 08:44:10 -0400 (Fri, 10 Oct 2008)
New Revision: 8428
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
Log:
[JBWS-1672] Removing the FIXMEs
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-10-10 11:39:27 UTC (rev 8427)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-10-10 12:44:10 UTC (rev 8428)
@@ -91,15 +91,11 @@
Service service = Service.create(wsdlURL, serviceName);
EndpointWithHandlerChain port = (EndpointWithHandlerChain)service.getPort(EndpointWithHandlerChain.class);
- if (isIntegrationMetro())
+ if (isIntegrationCXF())
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else if (isIntegrationCXF())
- {
System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
}
- else
+ else if (isIntegrationNative()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
String resStr = port.echo("Kermit");
assertEquals("Kermit|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn|endpoint|LogOut|AuthOut|RoutOut|RoutIn|AuthIn|LogIn", resStr);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-10-10 11:39:27 UTC (rev 8427)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.java 2008-10-10 12:44:10 UTC (rev 8428)
@@ -58,12 +58,8 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Outbound:LogicalJAXBHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
@@ -75,12 +71,8 @@
expStr.append(":Outbound:LogicalJAXBHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Inbound:PortHandler");
expStr.append(":Inbound:ProtocolHandler");
expStr.append(":Inbound:LogicalJAXBHandler");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-10-10 11:39:27 UTC (rev 8427)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.java 2008-10-10 12:44:10 UTC (rev 8428)
@@ -54,12 +54,8 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
@@ -71,12 +67,8 @@
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Inbound:PortHandler");
expStr.append(":Inbound:ProtocolHandler");
expStr.append(":Inbound:LogicalSourceHandler");
@@ -95,12 +87,8 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
@@ -112,12 +100,8 @@
expStr.append(":Outbound:LogicalSourceHandler");
expStr.append(":Outbound:ProtocolHandler");
expStr.append(":Outbound:PortHandler");
- if (isIntegrationMetro())
+ if (!isIntegrationMetro()) //[JBWS-1672] Metro does not respect @HandlerChain on client SEI
{
- System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
- }
- else
- {
expStr.append(":Inbound:PortHandler");
expStr.append(":Inbound:ProtocolHandler");
expStr.append(":Inbound:LogicalSourceHandler");
17 years, 2 months
JBossWS SVN: r8427 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-10 07:39:27 -0400 (Fri, 10 Oct 2008)
New Revision: 8427
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
Log:
[JBWS-1773] won't fix
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2008-10-10 09:08:55 UTC (rev 8426)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2008-10-10 11:39:27 UTC (rev 8427)
@@ -251,7 +251,8 @@
*/
public void testAdditionalCompilerClassPath()
{
- System.out.println("FIXME [JBWS-1773] Verify isolated classloading with WSConsume");
+ // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task
+ // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested.
}
/**
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-10-10 09:08:55 UTC (rev 8426)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-10-10 11:39:27 UTC (rev 8427)
@@ -137,7 +137,8 @@
*/
public void testAdditionalCompilerClassPath()
{
- System.out.println("FIXME [JBWS-1773] Verify isolated classloading with WSConsume");
+ // JBWS-1773 WSContractConsumer.setAdditionalCompilerClassPath() method is tested in wsconsume ant task
+ // that is invoked on each test run. See WSConsumeTask.java for more information how this is tested.
}
/**
17 years, 2 months
JBossWS SVN: r8426 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 05:08:55 -0400 (Fri, 10 Oct 2008)
New Revision: 8426
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Log:
[JBWS-2129] Enabling some tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-10 08:57:33 UTC (rev 8425)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-10-10 09:08:55 UTC (rev 8426)
@@ -15,10 +15,9 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -38,7 +37,6 @@
org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
-org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-10 08:57:33 UTC (rev 8425)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-10-10 09:08:55 UTC (rev 8426)
@@ -12,10 +12,9 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -35,7 +34,6 @@
org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
-org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-10 08:57:33 UTC (rev 8425)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-10-10 09:08:55 UTC (rev 8426)
@@ -12,10 +12,9 @@
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
# [JBWS-2129] Wrapper class is not found
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/holder/**
org/jboss/test/ws/jaxws/jbws1283/**
org/jboss/test/ws/jaxws/jbws1357/**
org/jboss/test/ws/jaxws/jbws1422/**
@@ -35,7 +34,6 @@
org/jboss/test/ws/jaxws/jbws2000/**
org/jboss/test/ws/jaxws/jbws2218/**
org/jboss/test/ws/jaxws/jbws2250/**
-org/jboss/test/ws/jaxws/jbws860/**
org/jboss/test/ws/jaxws/webfault/**
# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
17 years, 2 months
JBossWS SVN: r8425 - in stack/metro/trunk/modules: server/src/main/java/org/jboss/wsf/stack/metro and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-10 04:57:33 -0400 (Fri, 10 Oct 2008)
New Revision: 8425
Added:
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
[JBWS-2129] svn merge -r 8388:HEAD https://svn.jboss.org/repos/jbossws/stack/metro/branches/asoldano
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-09 16:13:21 UTC (rev 8424)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-10 08:57:33 UTC (rev 8425)
@@ -74,6 +74,7 @@
<include name="**/http.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-local-transport.jar"/>
<include name="**/jaxws-rt.jar"/>
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-09 16:13:21 UTC (rev 8424)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/DeploymentDescriptorParserExt.java 2008-10-10 08:57:33 UTC (rev 8425)
@@ -36,6 +36,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.jws.soap.SOAPBinding.Use;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -45,6 +49,7 @@
import javax.xml.ws.soap.MTOMFeature;
import javax.xml.ws.soap.SOAPBinding;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.xml.sax.EntityResolver;
import com.sun.xml.ws.api.BindingID;
@@ -77,6 +82,7 @@
* @author WS Development Team
* @author Kohsuke Kawaguchi
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.org
* @since 10-May-2007
*/
public class DeploymentDescriptorParserExt<A>
@@ -103,6 +109,8 @@
private final ClassLoader classLoader;
private final ResourceLoader loader;
private final AdapterFactory<A> adapterFactory;
+
+ private UnifiedVirtualFile archiveFile;
private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DeploymentDescriptorParserExt.class);
@@ -298,6 +306,15 @@
ensureNoContent(reader);
Invoker invoker = createInvoker(implementorClass);
+
+ //Generate wrappers
+ if (isWrapperGenerationRequired(implementorClass))
+ {
+ WsgenWrapperGenerator wrapperGenerator = new WsgenWrapperGenerator(System.out);
+ ClassLoader newClassLoader = wrapperGenerator.generate(implementationName, classLoader, archiveFile.toURL());
+ Thread.currentThread().setContextClassLoader(newClassLoader);
+ }
+
WSEndpoint<?> endpoint = WSEndpoint.create(implementorClass, !handlersSetInDD, invoker,
serviceName, portName, container, binding, primaryWSDL, docs.values(), createEntityResolver(this.loader), false);
adapters.add(adapterFactory.createAdapter(name, urlPattern, endpoint));
@@ -308,6 +325,20 @@
}
return adapters;
}
+
+ private boolean isWrapperGenerationRequired(Class<?> endpoint)
+ {
+ WebService webServiceAnnotation = endpoint.getAnnotation(WebService.class);
+ if (webServiceAnnotation == null)
+ return false;
+ String wsdlLocation = webServiceAnnotation.wsdlLocation();
+ if (wsdlLocation != null && !"".equals(wsdlLocation))
+ return false; //provided wsdlLocation means a top-down (contract first) development is used, thus the user should use wsimport
+ javax.jws.soap.SOAPBinding soapBinding = endpoint.getAnnotation(javax.jws.soap.SOAPBinding.class);
+ if (soapBinding == null)
+ return true; //no @SOAPBinding means default settings, ie. doc/lit wrapped
+ return !(ParameterStyle.BARE.equals(soapBinding.parameterStyle()) || Style.RPC.equals(soapBinding.style()) || Use.ENCODED.equals(soapBinding.use()));
+ }
protected Invoker createInvoker(Class<?> implementorClass)
{
@@ -597,4 +628,9 @@
throw new LocatableWebServiceException(ServerMessages.RUNTIME_PARSER_CLASS_NOT_FOUND(name), e, reader);
}
}
+
+ public void setArchiveFile(UnifiedVirtualFile file)
+ {
+ this.archiveFile = file;
+ }
}
Copied: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java (from rev 8424, stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java)
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java (rev 0)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-10 08:57:33 UTC (rev 8425)
@@ -0,0 +1,221 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.metro;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.file.JarUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+
+import com.sun.tools.ws.wscompile.WsgenTool;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Oct-2008
+ */
+public class WsgenWrapperGenerator
+{
+ private static Logger log = Logger.getLogger(WsgenWrapperGenerator.class);
+
+ private OutputStream outputStream;
+ private ServerConfig serverConfig;
+
+ public WsgenWrapperGenerator(OutputStream outputStream)
+ {
+ this.outputStream = outputStream;
+ }
+
+ public ClassLoader generate(String endpoint, ClassLoader classLoader, URL archiveUrl)
+ {
+ log.debug("ImplementationName: " + endpoint);
+ log.debug("Archive file: " + archiveUrl);
+ File tempDir = getTempDir(archiveUrl);
+ log.debug("Temp directory: " + tempDir);
+
+ if (!checkWsgenRequirements())
+ {
+ return classLoader;
+ }
+
+ WsgenTool wsgen = new WsgenTool(outputStream);
+ List<String> args = new ArrayList<String>();
+ args.add("-cp");
+ args.add(getClasspath(classLoader, archiveUrl));
+ args.add("-d");
+ args.add(tempDir.getAbsolutePath());
+ args.add("-verbose");
+ args.add(endpoint);
+ try
+ {
+ log.debug("Invoking Wsgen with the following parameters: " + args);
+ if (!wsgen.run(args.toArray(new String[0])))
+ throw new WebServiceException("Wsgen invocation failed: see the logs for details.");
+
+ URLClassLoader newClassloader = new URLClassLoader(new URL[] { tempDir.toURL() }, classLoader);
+ return newClassloader;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException("Unable to generate wrapper classes", e);
+ }
+ }
+
+ private static boolean checkWsgenRequirements()
+ {
+ Class<?> epRef = EndpointReference.class;
+ Class<?> xmlSeeAlso = XmlSeeAlso.class;
+ String epRefUrl = epRef.getResource('/'+epRef.getName().replace('.','/')+".class").toExternalForm();
+ String xmlSeeAlsoUrl = xmlSeeAlso.getResource('/'+xmlSeeAlso.getName().replace('.','/')+".class").toExternalForm();
+ log.debug("EndpointReference.class loaded from: " + epRefUrl);
+ log.debug("XmlSeeAlso.class loaded from: " + xmlSeeAlsoUrl);
+ if (!epRefUrl.startsWith("jar:") || !xmlSeeAlsoUrl.startsWith("jar:"))
+ {
+ log.warn("[JBWS-2342] wsgen tool does not support jaxws-api and jaxb libraries loaded through vfszip. " +
+ "Try running this with JDK6 so that they're provided by the JDK runtime. Wrapper generation skipped.");
+ return false;
+ }
+ return true;
+ }
+
+ private ServerConfig getServerConfig()
+ {
+ if (serverConfig == null)
+ {
+ SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class);
+ serverConfig = spi.getServerConfig();
+ }
+ return serverConfig;
+ }
+
+ protected String getClasspath(ClassLoader classLoader, URL archiveUrl)
+ {
+ StringBuffer sb = new StringBuffer();
+ ServerConfig cfg = getServerConfig();
+ File clientDir = new File(cfg.getHomeDir(), "client");
+ File[] libs = clientDir.listFiles();
+ if (libs != null && libs.length > 0)
+ {
+ for (File lib : libs)
+ {
+ sb.append(lib.getAbsolutePath()).append(File.pathSeparator);
+ }
+ sb.delete(sb.length() - 1, sb.length());
+ }
+ URL[] urls = getURLs(classLoader, archiveUrl);
+ for (URL url : urls)
+ {
+ sb.append(File.pathSeparator);
+ sb.append(url.getPath());
+ }
+ return sb.toString();
+ }
+
+ protected File getTempDir(URL archiveUrl)
+ {
+ File tempJBossWSDir = new File(getServerConfig().getServerTempDir(), "jbossws");
+ if (!tempJBossWSDir.exists())
+ tempJBossWSDir.mkdir();
+ String archivePath = archiveUrl.getPath();
+ if (archivePath.endsWith(File.separator))
+ archivePath = archivePath.substring(0, archivePath.length() - 1);
+ String archiveName = archivePath.substring(archivePath.lastIndexOf(File.separator));
+ File tempDir = new File(tempJBossWSDir, archiveName + "-" + new Date().getTime());
+ if (!tempDir.exists())
+ tempDir.mkdir();
+ return tempDir;
+ }
+
+ private URL[] getURLs(ClassLoader classLoader, URL archiveUrl)
+ {
+ List<URL> urls = new LinkedList<URL>();
+ try
+ {
+ if (archiveUrl.toString().endsWith(".war"))
+ {
+ List<URL> innerUrlList = new LinkedList<URL>();
+ if (classLoader instanceof URLClassLoader)
+ {
+ innerUrlList.addAll(Arrays.asList(((URLClassLoader)classLoader).getURLs()));
+ }
+ if (innerUrlList.isEmpty())
+ {
+ File dest = getTempDir(archiveUrl);
+ JarUtils.unjar(archiveUrl.openStream(), dest);
+ File webInf = new File(dest, "WEB-INF");
+ if (webInf.exists())
+ {
+ innerUrlList.add(webInf.toURL());
+ innerUrlList.add(new File(webInf, "classes").toURL());
+ }
+ }
+ urls.addAll(innerUrlList);
+ }
+ else if (archiveUrl.toString().endsWith(".jar"))
+ {
+ if (new File(archiveUrl.getPath()).exists())
+ {
+ urls.add(archiveUrl);
+ }
+ else
+ {
+ File dest = getTempDir(archiveUrl);
+ JarUtils.unjar(archiveUrl.openStream(), dest);
+ urls.add(dest.toURL());
+ }
+ }
+ else if (archiveUrl.toString().endsWith(".war/"))
+ {
+ File webInf = new File(archiveUrl.getFile(), "WEB-INF");
+ if (webInf.exists())
+ {
+ urls.add(webInf.toURL());
+ urls.add(new File(webInf, "classes").toURL());
+ }
+ }
+ else
+ throw new WebServiceException("Unsupported deployment archive: " + archiveUrl);
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException("Cannot get classpath URLs for archive: " + archiveUrl, e);
+ }
+ return (URL[])urls.toArray(new URL[0]);
+ }
+}
Modified: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-09 16:13:21 UTC (rev 8424)
+++ stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-10 08:57:33 UTC (rev 8425)
@@ -104,11 +104,14 @@
// Parse the descriptor file and build endpoint infos
DeploymentDescriptorParserExt<ServletAdapter> parser =
createDeploymentDescriptorParser(runtimeLoader, container, resourceLoader, adapterList);
+
+ parser.setArchiveFile(vfsRoot);
URL sunJaxWsXml = getDDUrlFromContext(deployment);
List<ServletAdapter> adapters = parser.parse(sunJaxWsXml.toExternalForm(), sunJaxWsXml.openStream());
+
for(ServletAdapter adapter : adapters)
{
for(Endpoint ep : deployment.getService().getEndpoints())
17 years, 2 months
JBossWS SVN: r8424 - stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-09 12:13:21 -0400 (Thu, 09 Oct 2008)
New Revision: 8424
Modified:
stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2342][JBWS-2139] Adding wsgen requirements check
Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 15:43:22 UTC (rev 8423)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java 2008-10-09 16:13:21 UTC (rev 8424)
@@ -31,6 +31,8 @@
import java.util.LinkedList;
import java.util.List;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
@@ -61,11 +63,16 @@
public ClassLoader generate(String endpoint, ClassLoader classLoader, URL archiveUrl)
{
- log.info("ImplementationName: " + endpoint);
- log.info("Archive file: " + archiveUrl);
+ log.debug("ImplementationName: " + endpoint);
+ log.debug("Archive file: " + archiveUrl);
File tempDir = getTempDir(archiveUrl);
- log.info("Temp directory: " + tempDir);
-
+ log.debug("Temp directory: " + tempDir);
+
+ if (!checkWsgenRequirements())
+ {
+ return classLoader;
+ }
+
WsgenTool wsgen = new WsgenTool(outputStream);
List<String> args = new ArrayList<String>();
args.add("-cp");
@@ -76,7 +83,7 @@
args.add(endpoint);
try
{
- log.info("Invoking Wsgen with the following parameters: " + args);
+ log.debug("Invoking Wsgen with the following parameters: " + args);
if (!wsgen.run(args.toArray(new String[0])))
throw new WebServiceException("Wsgen invocation failed: see the logs for details.");
@@ -88,6 +95,22 @@
throw new WebServiceException("Unable to generate wrapper classes", e);
}
}
+
+ private static boolean checkWsgenRequirements()
+ {
+ Class<?> epRef = EndpointReference.class;
+ Class<?> xmlSeeAlso = XmlSeeAlso.class;
+ String epRefUrl = epRef.getResource('/'+epRef.getName().replace('.','/')+".class").toExternalForm();
+ String xmlSeeAlsoUrl = xmlSeeAlso.getResource('/'+xmlSeeAlso.getName().replace('.','/')+".class").toExternalForm();
+ log.debug("EndpointReference.class loaded from: " + epRefUrl);
+ log.debug("XmlSeeAlso.class loaded from: " + xmlSeeAlsoUrl);
+ if (!epRefUrl.startsWith("jar:") || !xmlSeeAlsoUrl.startsWith("jar:"))
+ {
+ log.warn("[JBWS-2342] wsgen tool does not support jaxws-api and jaxb library loaded through vfszip. Try running this with JDK6. Wrapper generation skipped.");
+ return false;
+ }
+ return true;
+ }
private ServerConfig getServerConfig()
{
17 years, 2 months
JBossWS SVN: r8423 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-09 11:43:22 -0400 (Thu, 09 Oct 2008)
New Revision: 8423
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring JBossWS libs from deploy to deployers directory
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-09 15:42:09 UTC (rev 8422)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-09 15:43:22 UTC (rev 8423)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-09 15:42:09 UTC (rev 8422)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-09 15:43:22 UTC (rev 8423)
@@ -285,26 +285,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
<unzip dest="@{targetdir}/jbossws-management.war">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -321,6 +306,21 @@
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2263] -->
@@ -393,7 +393,7 @@
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<!-- [JBWS-2263] -->
<!-- START -->
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deployers/jbossws.deployer/META-INF" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<!-- END -->
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
17 years, 2 months
JBossWS SVN: r8422 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-09 11:42:09 -0400 (Thu, 09 Oct 2008)
New Revision: 8422
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring JBossWS libs from deploy to deployers directory
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-09 15:41:27 UTC (rev 8421)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-10-09 15:42:09 UTC (rev 8422)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-09 15:41:27 UTC (rev 8421)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-09 15:42:09 UTC (rev 8422)
@@ -298,21 +298,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
<unzip dest="@{targetdir}/jbossws-management.war">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-metro-management.war"/>
</fileset>
</unzip>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -329,6 +319,16 @@
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<!-- JBWS-2263 -->
@@ -401,7 +401,7 @@
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<!-- JBWS-2263 -->
<!-- START -->
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deployers/jbossws.deployer/META-INF" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<!-- END -->
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
17 years, 2 months