March 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6004 - framework/trunk/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-03-18 11:02:52 -0400 (Tue, 18 Mar 2008) New Revision: 6004 Modified: framework/trunk/src/main/etc/wsconsume.bat framework/trunk/src/main/etc/wsprovide.bat Log: [JBWS-1996] create stack dependent classpath Modified: framework/trunk/src/main/etc/wsconsume.bat =================================================================== --- framework/trunk/src/main/etc/wsconsume.bat 2008-03-18 15:01:50 UTC (rev 6003) +++ framework/trunk/src/main/etc/wsconsume.bat 2008-03-18 15:02:52 UTC (rev 6004) @@ -49,16 +49,22 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar -rem JBossWS-Metro stack libraries -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar +rem stack specific dependencies +if exist %JBOSS_HOME%/client/jbossws-client.jar goto else + rem JBossWS-Metro stack libraries + echo JBossWS-Metro stack deployed + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar + goto endif +:else + rem JBossWS-Native stack libraries + echo JBossWS-Native stack deployed + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar + set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar +:endif -rem JBossWS-Native stack libraries -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/javassist.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-client.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxws.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar - rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: framework/trunk/src/main/etc/wsprovide.bat =================================================================== --- framework/trunk/src/main/etc/wsprovide.bat 2008-03-18 15:01:50 UTC (rev 6003) +++ framework/trunk/src/main/etc/wsprovide.bat 2008-03-18 15:02:52 UTC (rev 6004) @@ -47,23 +47,29 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/streambuffer.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-ex.jar -rem JBossWS-Metro stack libraries -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar +rem stack specific dependencies +if exist %JBOSS_HOME%/client/jbossws-client.jar goto else + rem JBossWS-Metro stack libraries + echo JBossWS-Metro stack deployed + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-metro-client.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar + goto endif +:else + rem JBossWS-Native stack libraries + echo JBossWS-Native stack deployed + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.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/policy.jar + set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar +:endif -rem JBossWS-Native stack libraries -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/javassist.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/policy.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar - rem Execute the JVM "%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %*

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r6003 - framework/trunk/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-03-18 11:01:50 -0400 (Tue, 18 Mar 2008) New Revision: 6003 Modified: framework/trunk/src/main/etc/wsconsume.sh framework/trunk/src/main/etc/wsprovide.sh Log: use correct shell 'if file exists' test statement Modified: framework/trunk/src/main/etc/wsconsume.sh =================================================================== --- framework/trunk/src/main/etc/wsconsume.sh 2008-03-18 14:50:47 UTC (rev 6002) +++ framework/trunk/src/main/etc/wsconsume.sh 2008-03-18 15:01:50 UTC (rev 6003) @@ -66,7 +66,7 @@ fi # is it a JBossWS-native or SunRI installation? -if [ -a $LIBDIR/jbossws-client.jar ]; then +if [ -f $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi Modified: framework/trunk/src/main/etc/wsprovide.sh =================================================================== --- framework/trunk/src/main/etc/wsprovide.sh 2008-03-18 14:50:47 UTC (rev 6002) +++ framework/trunk/src/main/etc/wsprovide.sh 2008-03-18 15:01:50 UTC (rev 6003) @@ -66,7 +66,7 @@ fi # is it a JBossWS-native or SunRI installation? -if [ -a $LIBDIR/jbossws-client.jar ]; then +if [ -f $LIBDIR/jbossws-client.jar ]; then JBOSSWS_NATIVE="true" fi

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r6002 - in stack/native/trunk: src/main/resources and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-18 10:50:47 -0400 (Tue, 18 Mar 2008) New Revision: 6002 Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory stack/native/trunk/src/main/resources/jbossws-jboss42.sar/ stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/ stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml Modified: stack/native/trunk/build.xml Log: Fixing broken build Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-03-18 14:32:23 UTC (rev 6001) +++ stack/native/trunk/build.xml 2008-03-18 14:50:47 UTC (rev 6002) @@ -210,6 +210,10 @@ <fileset dir="${core.resources.dir}/standard-config"> <include name="standard-*-config.xml"/> </fileset> + <fileset dir="${core.resources.dir}"> + <include name="jbossws-jboss42.jar/**"/> + <include name="jbossws-jboss42.sar/**"/> + </fileset> </copy> </target> Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl \ No newline at end of file Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.SecurityAdaptorFactory 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.SecurityAdapterFactoryImpl \ No newline at end of file Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.WebServiceContextFactoryImpl \ No newline at end of file Added: stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Added: stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml 2008-03-18 14:50:47 UTC (rev 6002) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + +</server> Property changes on: stack/native/trunk/src/main/resources/jbossws-jboss42.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r6001 - in stack/native/trunk/src: main/java/org/jboss/ws/extensions/json and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-18 10:32:23 -0400 (Tue, 18 Mar 2008) New Revision: 6001 Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentSerializer.java Removed: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentParser.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentSerializer.java Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/json/JsonAPITestCase.java Log: [JBWS-1165] Add initial JSON support Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageMarshaller.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -34,7 +34,7 @@ import org.jboss.remoting.marshal.Marshaller; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.json.DOMDocumentSerializer; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; /** * @author Thomas.Diesler(a)jboss.org @@ -71,7 +71,7 @@ SOAPMessage soapMessage = (SOAPMessage)dataObject; SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); SOAPBodyElement payload = soapBody.getBodyElement(); - new DOMDocumentSerializer(output).serialize(payload); + new BadgerFishDOMDocumentSerializer(output).serialize(payload); } catch (SOAPException ex) { Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/binding/JsonMessageUnMarshaller.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -36,7 +36,7 @@ import org.jboss.logging.Logger; import org.jboss.remoting.marshal.UnMarshaller; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.extensions.json.DOMDocumentParser; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; import org.w3c.dom.Document; /** @@ -60,7 +60,7 @@ { MessageFactoryImpl factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(); - Document doc = new DOMDocumentParser().parse(inputStream); + Document doc = new BadgerFishDOMDocumentParser().parse(inputStream); soapMsg.getSOAPBody().addDocument(doc); return soapMsg; } Added: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.ws.extensions.json; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLEventWriter; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory; +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +/** + * An JSON BadgerFish DOM parser + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class BadgerFishDOMDocumentParser +{ + public Document parse(InputStream input) throws IOException + { + try + { + BadgerFishXMLInputFactory inputFactory = new BadgerFishXMLInputFactory(); + XMLStreamReader streamReader = inputFactory.createXMLStreamReader(input); + XMLInputFactory readerFactory = XMLInputFactory.newInstance(); + XMLEventReader eventReader = readerFactory.createXMLEventReader(streamReader); + + // Can not create a STaX writer for a DOMResult in woodstox-3.1.1 + // DOMResult result = new DOMResult(); + // XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(result); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); + XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(baos); + eventWriter.add(eventReader); + eventWriter.close(); + + // This parsing step should not be necessary, if we could output to a DOMResult + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + return getDocumentBuilder().parse(bais); + } + catch (XMLStreamException ex) + { + IOException ioex = new IOException("Cannot parse input stream"); + ioex.initCause(ex); + throw ioex; + } + catch (SAXException ex) + { + IOException ioex = new IOException("Cannot import in target document"); + ioex.initCause(ex); + throw ioex; + } + } + + private DocumentBuilder getDocumentBuilder() + { + try + { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setValidating(false); + factory.setNamespaceAware(true); + DocumentBuilder builder = factory.newDocumentBuilder(); + return builder; + } + catch (ParserConfigurationException e) + { + throw new RuntimeException("Failed to create DocumentBuilder", e); + } + } +} \ No newline at end of file Property changes on: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentParser.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentSerializer.java (from rev 5988, stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentSerializer.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentSerializer.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/BadgerFishDOMDocumentSerializer.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.ws.extensions.json; + +import java.io.IOException; +import java.io.OutputStream; + +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLEventWriter; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; + +import org.codehaus.jettison.badgerfish.BadgerFishXMLOutputFactory; +import org.w3c.dom.Element; + +/** + * An JSON BadgerFish DOM serializer + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class BadgerFishDOMDocumentSerializer +{ + private OutputStream output; + + public BadgerFishDOMDocumentSerializer(OutputStream output) + { + this.output = output; + } + + public void serialize(Element el) throws IOException + { + if (output == null) + throw new IllegalStateException("OutputStream cannot be null"); + + try + { + DOMSource source = new DOMSource(el); + XMLInputFactory readerFactory = XMLInputFactory.newInstance(); + XMLStreamReader streamReader = readerFactory.createXMLStreamReader(source); + XMLEventReader eventReader = readerFactory.createXMLEventReader(streamReader); + + BadgerFishXMLOutputFactory writerFactory = new BadgerFishXMLOutputFactory(); + XMLStreamWriter streamWriter = writerFactory.createXMLStreamWriter(output); + // Not implemented in jettison-1.0-RC2 + // XMLEventWriter eventWriter = writerFactory.createXMLEventWriter(output); + XMLEventWriter eventWriter = new BadgerFishXMLEventWriter(streamWriter); + eventWriter.add(eventReader); + eventWriter.close(); + } + catch (XMLStreamException ex) + { + IOException ioex = new IOException("Cannot serialize: " + el); + ioex.initCause(ex); + throw ioex; + } + } +} \ No newline at end of file Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentParser.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentParser.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentParser.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.extensions.json; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; - -import org.codehaus.jettison.badgerfish.BadgerFishXMLInputFactory; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -/** - * An JSON BadgerFish DOM parser - * - * @author Thomas.Diesler(a)jboss.com - * @since 12-Mar-2008 - */ -public class DOMDocumentParser -{ - public Document parse(InputStream input) throws IOException - { - try - { - BadgerFishXMLInputFactory inputFactory = new BadgerFishXMLInputFactory(); - XMLStreamReader streamReader = inputFactory.createXMLStreamReader(input); - XMLInputFactory readerFactory = XMLInputFactory.newInstance(); - XMLEventReader eventReader = readerFactory.createXMLEventReader(streamReader); - - // Can not create a STaX writer for a DOMResult in woodstox-3.1.1 - // DOMResult result = new DOMResult(); - // XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(result); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); - XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(baos); - eventWriter.add(eventReader); - eventWriter.close(); - - // This parsing step should not be necessary, if we could output to a DOMResult - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - return getDocumentBuilder().parse(bais); - } - catch (XMLStreamException ex) - { - IOException ioex = new IOException("Cannot parse input stream"); - ioex.initCause(ex); - throw ioex; - } - catch (SAXException ex) - { - IOException ioex = new IOException("Cannot import in target document"); - ioex.initCause(ex); - throw ioex; - } - } - - private DocumentBuilder getDocumentBuilder() - { - try - { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setValidating(false); - factory.setNamespaceAware(true); - DocumentBuilder builder = factory.newDocumentBuilder(); - return builder; - } - catch (ParserConfigurationException e) - { - throw new RuntimeException("Failed to create DocumentBuilder", e); - } - } -} \ No newline at end of file Deleted: stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentSerializer.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentSerializer.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/json/DOMDocumentSerializer.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.extensions.json; - -import java.io.IOException; -import java.io.OutputStream; - -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; - -import org.codehaus.jettison.badgerfish.BadgerFishXMLOutputFactory; -import org.w3c.dom.Element; - -/** - * An JSON BadgerFish DOM serializer - * - * @author Thomas.Diesler(a)jboss.com - * @since 12-Mar-2008 - */ -public class DOMDocumentSerializer -{ - private OutputStream output; - - public DOMDocumentSerializer(OutputStream output) - { - this.output = output; - } - - public void serialize(Element el) throws IOException - { - if (output == null) - throw new IllegalStateException("OutputStream cannot be null"); - - try - { - DOMSource source = new DOMSource(el); - XMLInputFactory readerFactory = XMLInputFactory.newInstance(); - XMLStreamReader streamReader = readerFactory.createXMLStreamReader(source); - XMLEventReader eventReader = readerFactory.createXMLEventReader(streamReader); - - BadgerFishXMLOutputFactory writerFactory = new BadgerFishXMLOutputFactory(); - XMLStreamWriter streamWriter = writerFactory.createXMLStreamWriter(output); - // Not implemented in jettison-1.0-RC2 - // XMLEventWriter eventWriter = writerFactory.createXMLEventWriter(output); - XMLEventWriter eventWriter = new BadgerFishXMLEventWriter(streamWriter); - eventWriter.add(eventReader); - eventWriter.close(); - } - catch (XMLStreamException ex) - { - IOException ioex = new IOException("Cannot serialize: " + el); - ioex.initCause(ex); - throw ioex; - } - } -} \ No newline at end of file Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -80,7 +80,8 @@ import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.json.DOMDocumentParser; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.feature.FastInfosetFeature; @@ -102,6 +103,8 @@ import org.jboss.wsf.common.IOUtils; import org.w3c.dom.Document; +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + /** * A request handler * @@ -369,7 +372,7 @@ throw new IllegalStateException("Attachments not supported with FastInfoset"); SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); - com.sun.xml.fastinfoset.dom.DOMDocumentSerializer serializer = new com.sun.xml.fastinfoset.dom.DOMDocumentSerializer(); + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); serializer.setOutputStream(output); serializer.serialize(soapEnv); } @@ -381,8 +384,8 @@ throw new IllegalStateException("Attachments not supported with JSON"); SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); - SOAPBodyElement payload = soapBody.getBodyElement(); - new org.jboss.ws.extensions.json.DOMDocumentSerializer(output).serialize(payload); + BadgerFishDOMDocumentSerializer serializer = new BadgerFishDOMDocumentSerializer(output); + serializer.serialize(soapBody.getBodyElement()); } else { @@ -431,7 +434,7 @@ { MessageFactoryImpl factory = new MessageFactoryImpl(); SOAPMessageImpl soapMsg = (SOAPMessageImpl)factory.createMessage(); - Document doc = new DOMDocumentParser().parse(inputStream); + Document doc = new BadgerFishDOMDocumentParser().parse(inputStream); soapMsg.getSOAPBody().addDocument(doc); reqMessage = soapMsg; } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/json/JsonAPITestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/json/JsonAPITestCase.java 2008-03-18 14:31:26 UTC (rev 6000) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/json/JsonAPITestCase.java 2008-03-18 14:32:23 UTC (rev 6001) @@ -24,8 +24,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import org.jboss.ws.extensions.json.DOMDocumentParser; -import org.jboss.ws.extensions.json.DOMDocumentSerializer; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentParser; +import org.jboss.ws.extensions.json.BadgerFishDOMDocumentSerializer; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; import org.jboss.wsf.test.JBossWSTest; @@ -98,14 +98,14 @@ private String toJSON(Element srcDOM) throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - new DOMDocumentSerializer(baos).serialize(srcDOM); + new BadgerFishDOMDocumentSerializer(baos).serialize(srcDOM); return new String(baos.toByteArray()); } private String toXML(String jsonStr) throws Exception { ByteArrayInputStream bais = new ByteArrayInputStream(jsonStr.getBytes()); - Document resDOM = new DOMDocumentParser().parse(bais); + Document resDOM = new BadgerFishDOMDocumentParser().parse(bais); return DOMWriter.printNode(resDOM, false); } }

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r6000 - in framework/trunk/hudson/hudson-home/jobs: Native-Core-AS-4.2.3 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 10:31:26 -0400 (Tue, 18 Mar 2008) New Revision: 6000 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml Log: Enable public interop server for hudson runs Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-03-18 14:28:31 UTC (rev 5999) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.2/config.xml 2008-03-18 14:31:26 UTC (rev 6000) @@ -13,7 +13,7 @@ STACKNATIVE=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE -Dinterop=true" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-03-18 14:28:31 UTC (rev 5999) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.3/config.xml 2008-03-18 14:31:26 UTC (rev 6000) @@ -13,7 +13,7 @@ STACKNATIVE=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE -Dinterop=true" # # stop jbossas Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-03-18 14:28:31 UTC (rev 5999) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-03-18 14:31:26 UTC (rev 6000) @@ -13,7 +13,7 @@ STACKNATIVE=$WORKSPACE/stack-native JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE -Dinterop=true" # # stop jbossas

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r5999 - in stack/native/trunk/src/test: resources and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 10:28:31 -0400 (Tue, 18 Mar 2008) New Revision: 5999 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java stack/native/trunk/src/test/resources/test-excludes-jboss500.txt Log: JBWS-2069: Monitor interop endpoints Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2008-03-18 14:27:13 UTC (rev 5998) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2008-03-18 14:28:31 UTC (rev 5999) @@ -146,6 +146,22 @@ } */ } + + public String getServerHost() + { + String host = null; + if("true".equals( System.getProperty("interop") ) ) + { + host = "jbossws.demo.jboss.com"; // ask heiko about details for this service + System.out.println("Using interop host: jbossws.demo.jboss.com" ); + } + else + { + host = super.getServerHost(); + } + return host; + } + /** * Certain MSFT testcases require the connection to be closed * since remoting cannot work with particluar HTTP response codes. Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-18 14:27:13 UTC (rev 5998) +++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-18 14:28:31 UTC (rev 5999) @@ -17,7 +17,7 @@ org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.* # [JBAS-5114] MessageDriven EJB3 does not create destination automatically -org/jboss/test/ws/jaxws/samples/jmstransport/** +#org/jboss/test/ws/jaxws/samples/jmstransport/** # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r5998 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 10:27:13 -0400 (Tue, 18 Mar 2008) New Revision: 5998 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: toggle interop system property Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-03-18 13:43:42 UTC (rev 5997) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-03-18 14:27:13 UTC (rev 5998) @@ -393,6 +393,7 @@ <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> + <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> @@ -439,6 +440,7 @@ <sysproperty key="test.execution.dir" value="${tests.output.dir}"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> + <sysproperty key="interop" value="${interop}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r5997 - framework/trunk/src/main/etc.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 09:43:42 -0400 (Tue, 18 Mar 2008) New Revision: 5997 Modified: framework/trunk/src/main/etc/wsconsume.sh framework/trunk/src/main/etc/wsprovide.sh Log: Dynamic classpath depends on the deployed stack Modified: framework/trunk/src/main/etc/wsconsume.sh =================================================================== --- framework/trunk/src/main/etc/wsconsume.sh 2008-03-18 11:03:23 UTC (rev 5996) +++ framework/trunk/src/main/etc/wsconsume.sh 2008-03-18 13:43:42 UTC (rev 5997) @@ -65,6 +65,17 @@ LIBDIR=$PARENT/lib fi +# is it a JBossWS-native or SunRI installation? +if [ -a $LIBDIR/jbossws-client.jar ]; then + JBOSSWS_NATIVE="true" +fi + +### +# Setup the wsprovide classpath +# The classpath is dynamically build depending on the stack that +# is deployed. See $JBOSSWS_NATIVE above. +### + # shared libs WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JAVA_HOME/lib/tools.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/activation.jar" @@ -85,16 +96,24 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/streambuffer.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-ex.jar" -# JBossWS-Metro stack libraries -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" +### +# Stack specific dependencies +### -# JBossWS-Native stack libraries -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar" +if [ "x$JBOSSWS_NATIVE" = "x" ]; then + # JBossWS-Metro stack libraries + echo "JBossWS-Metro stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" +else + # JBossWS-Native stack libraries + echo "JBossWS-Native stack deployed" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/javassist.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-saaj.jar" +fi ### # Execute the JVM Modified: framework/trunk/src/main/etc/wsprovide.sh =================================================================== --- framework/trunk/src/main/etc/wsprovide.sh 2008-03-18 11:03:23 UTC (rev 5996) +++ framework/trunk/src/main/etc/wsprovide.sh 2008-03-18 13:43:42 UTC (rev 5997) @@ -65,6 +65,17 @@ LIBDIR=$PARENT/lib fi +# is it a JBossWS-native or SunRI installation? +if [ -a $LIBDIR/jbossws-client.jar ]; then + JBOSSWS_NATIVE="true" +fi + +### +# Setup the wsprovide classpath +# The classpath is dynamically build depending on the stack that +# is deployed. See $JBOSSWS_NATIVE above. +### + # shared libs WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JAVA_HOME/lib/tools.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar" @@ -83,23 +94,31 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/streambuffer.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-ex.jar" -# JBossWS-Metro stack libraries -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar" +### +# stack specific dependencies +### -# JBossWS-Native stack libraries -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" +if [ "x$JBOSSWS_NATIVE" = "x" ]; then + # JBossWS-Metro stack libraries + echo "JBossWS-Metro stack deployed" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-metro-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar" +else + # JBossWS-Native stack libraries + echo "JBossWS-Native stack deployed" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-xml-binding.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/javassist.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-client.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxws.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-jaxrpc.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-saaj.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/policy.jar" + WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar" +fi ### # Execute the JVM

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r5996 - in stack/cxf/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-18 07:03:23 -0400 (Tue, 18 Mar 2008) New Revision: 5996 Added: stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml Log: Moving AS42 container config to the stack code base Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-18 11:02:36 UTC (rev 5995) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-18 11:03:23 UTC (rev 5996) @@ -54,7 +54,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" 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-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-03-18 11:02:36 UTC (rev 5995) +++ stack/cxf/trunk/build.xml 2008-03-18 11:03:23 UTC (rev 5996) @@ -114,13 +114,12 @@ </concat>  - <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> - <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/> + <fileset file="${cxf.resources.dir}/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-03-18 11:02:36 UTC (rev 5995) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2008-03-18 11:03:23 UTC (rev 5996) @@ -24,11 +24,6 @@ --> </bean> -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> -  <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> <property name="namespaces"> Added: stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 11:03:23 UTC (rev 5996) @@ -0,0 +1,288 @@ + +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/> + +  + <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + +  + +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +  + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  +  + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Property changes on: stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 3 months

1
0
0 / 0

JBossWS SVN: r5995 - in stack/metro/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-18 07:02:36 -0400 (Tue, 18 Mar 2008) New Revision: 5995 Added: stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml Modified: stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/build.xml stack/metro/trunk/src/main/resources/jbossws-metro-config.xml Log: Moving AS42 container config to the stack code base Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:55:56 UTC (rev 5994) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 11:02:36 UTC (rev 5995) @@ -46,7 +46,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" 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-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-03-18 10:55:56 UTC (rev 5994) +++ stack/metro/trunk/build.xml 2008-03-18 11:02:36 UTC (rev 5995) @@ -116,13 +116,12 @@ </concat>  - <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/> - <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/> + <fileset file="${metro.resources.dir}/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> Added: stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml (rev 0) +++ stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 11:02:36 UTC (rev 5995) @@ -0,0 +1,288 @@ + +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/> + +  + <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + +  + +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +  + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  +  + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Property changes on: stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/src/main/resources/jbossws-metro-config.xml =================================================================== --- stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-03-18 10:55:56 UTC (rev 5994) +++ stack/metro/trunk/src/main/resources/jbossws-metro-config.xml 2008-03-18 11:02:36 UTC (rev 5995) @@ -24,11 +24,6 @@ --> </bean> -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> -  <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> <property name="namespaces">

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2008