From jbossws-commits at lists.jboss.org Mon Oct  3 09:05:58 2011
Content-Type: multipart/mixed; boundary="===============5588621422460976411=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15029 -
 spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
Date: Mon, 03 Oct 2011 09:05:58 -0400
Message-ID: <201110031305.p93D5wst017893@svn01.web.mwc.hst.phx2.redhat.com>

--===============5588621422460976411==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-03 09:05:58 -0400 (Mon, 03 Oct 2011)
New Revision: 15029

Added:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.ja=
va
Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
Log:
[JBWS-3363] extending SPI - providing hook for instances retrieval

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java	2011=
-09-27 11:57:59 UTC (rev 15028)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java	2011=
-10-03 13:05:58 UTC (rev 15029)
@@ -135,4 +135,10 @@
    /** Set security domain context */
    void setSecurityDomainContext(SecurityDomainContext context);
 =

+   /** Get instance provider */
+   InstanceProvider getInstanceProvider();
+
+   /** Set instance provider */
+   void setInstanceProvider(InstanceProvider provider);
+
 }

Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvide=
r.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.j=
ava	                        (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.j=
ava	2011-10-03 13:05:58 UTC (rev 15029)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.spi.deployment;
+
+/**
+ * Instance provider.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public interface InstanceProvider
+{
+
+    Object getInstance(String className);
+    =

+}


--===============5588621422460976411==--

From jbossws-commits at lists.jboss.org Mon Oct  3 09:10:27 2011
Content-Type: multipart/mixed; boundary="===============2844449373577045632=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15030 - in
 common/trunk/src/main/java/org/jboss/ws/common: invocation and 1 other
 directory.
Date: Mon, 03 Oct 2011 09:10:27 -0400
Message-ID: <201110031310.p93DARp9018260@svn01.web.mwc.hst.phx2.redhat.com>

--===============2844449373577045632==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-03 09:10:26 -0400 (Mon, 03 Oct 2011)
New Revision: 15030

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaul=
tEndpoint.java
   common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandle=
rDeploymentAspect.java
   common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHand=
lerJAXWS.java
Log:
[JBWS-3363] extending SPI - providing hook for instances retrieval

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Abstrac=
tDefaultEndpoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefau=
ltEndpoint.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefau=
ltEndpoint.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -38,6 +38,7 @@
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.EndpointState;
 import org.jboss.wsf.spi.deployment.EndpointType;
+import org.jboss.wsf.spi.deployment.InstanceProvider;
 import org.jboss.wsf.spi.deployment.LifecycleHandler;
 import org.jboss.wsf.spi.deployment.Service;
 import org.jboss.wsf.spi.deployment.WSFDeploymentException;
@@ -70,6 +71,7 @@
    protected String address;
    protected List<RecordProcessor> recordProcessors =3D new Vector<RecordP=
rocessor>();
    protected SecurityDomainContext securityDomainContext;
+   protected InstanceProvider instanceProvider;
    =

    AbstractDefaultEndpoint(String targetBean)
    {
@@ -308,4 +310,15 @@
       this.securityDomainContext =3D securityDomainContext;
    }
 =

+   public InstanceProvider getInstanceProvider()
+   {
+      return instanceProvider;
+   }
+
+   public void setInstanceProvider(final InstanceProvider instanceProvider)
+   {
+      assertEndpointSetterAccess();
+      this.instanceProvider =3D instanceProvider;
+   }
+
 }

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Endpoin=
tHandlerDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandl=
erDeploymentAspect.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointHandl=
erDeploymentAspect.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -54,18 +54,18 @@
    {
       for (final Endpoint ep : dep.getService().getEndpoints())
       {
-         ep.setRequestHandler(getRequestHandler(dep));
-         ep.setLifecycleHandler(getLifecycleHandler(dep));
+         ep.setRequestHandler(getRequestHandler());
+         ep.setLifecycleHandler(getLifecycleHandler());
          ep.setInvocationHandler(getInvocationHandler(ep));
       }
    }
 =

-   private RequestHandler getRequestHandler(final Deployment dep)
+   private RequestHandler getRequestHandler()
    {
       return spiProvider.getSPI(RequestHandlerFactory.class).newRequestHan=
dler();
    }
 =

-   private LifecycleHandler getLifecycleHandler(final Deployment dep)
+   private LifecycleHandler getLifecycleHandler()
    {
       return spiProvider.getSPI(LifecycleHandlerFactory.class).newLifecycl=
eHandler();
    }

Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/Invocat=
ionHandlerJAXWS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-03 13:05:58 UTC (rev 15029)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-03 13:10:26 UTC (rev 15030)
@@ -59,7 +59,9 @@
    public void onEndpointInstantiated(final Endpoint endpoint, final Invoc=
ation invocation)
    {
       final InjectionsMetaData injectionsMD =3D endpoint.getAttachment(Inj=
ectionsMetaData.class);
-      final Object targetBean =3D this.getTargetBean(invocation);
+      final Object _targetBean =3D this.getTargetBean(invocation);
+      // TODO: refactor injection to AS IL
+      final Object targetBean =3D endpoint.getInstanceProvider().getInstan=
ce(_targetBean.getClass().getName());
 =

       this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targe=
tBean);
       if (injectionsMD !=3D null)


--===============2844449373577045632==--

From jbossws-commits at lists.jboss.org Mon Oct  3 09:47:54 2011
Content-Type: multipart/mixed; boundary="===============1677243424763725496=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15031 - in
 stack/native/trunk/modules/core/src/main:
 java/org/jboss/ws/core/jaxws/handler and 4 other directories.
Date: Mon, 03 Oct 2011 09:47:54 -0400
Message-ID: <201110031347.p93DlsxW021125@svn01.web.mwc.hst.phx2.redhat.com>

--===============1677243424763725496==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-03 09:47:54 -0400 (Mon, 03 Oct 2011)
New Revision: 15031

Added:
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/N=
ativeInstanceProvider.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/N=
ativeInstanceProviderDeploymentAspect.java
Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/h=
andler/HandlerChainBaseImpl.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/ha=
ndler/HandlerResolverImpl.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/sp=
i/http/NettyHttpServerAdapter.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/S=
erviceEndpointInvoker.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/M=
essage.properties
   stack/native/trunk/modules/core/src/main/resources/jbossws-native-config=
-as6.xml
   stack/native/trunk/modules/core/src/main/resources/jbossws-native-config=
-as7.xml
Log:
[JBWS-3363] extending SPI - providing hook for instances retrieval

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axrpc/handler/HandlerChainBaseImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/=
handler/HandlerChainBaseImpl.java	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/=
handler/HandlerChainBaseImpl.java	2011-10-03 13:47:54 UTC (rev 15031)
@@ -48,6 +48,8 @@
 import org.jboss.ws.core.soap.SOAPElementImpl;
 import org.jboss.ws.core.soap.SOAPElementWriter;
 import org.jboss.ws.core.soap.SOAPEnvelopeImpl;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.H=
andlerType;
 =

 /**
@@ -128,7 +130,7 @@
          {
             for (HandlerInfo info : infos)
             {
-               HandlerWrapper handler =3D new HandlerWrapper((Handler)info=
.getHandlerClass().newInstance());
+               HandlerWrapper handler =3D new HandlerWrapper(getInstance(i=
nfo));
                HandlerType type =3D (HandlerType)info.getHandlerConfig().g=
et(HandlerType.class.getName());
                handlers.add(new HandlerEntry(handler, info, type));
             }
@@ -151,6 +153,21 @@
       state =3D STATE_CREATED;
    }
 =

+   private Handler getInstance(final HandlerInfo info) throws Exception
+   {
+       final Endpoint ep =3D EndpointAssociation.getEndpoint();
+       final Handler handler;
+       if (ep !=3D null)
+       {
+           handler =3D (Handler)ep.getInstanceProvider().getInstance(info.=
getHandlerClass().getName());
+       }
+       else
+       {
+           handler =3D (Handler)info.getHandlerClass().newInstance();
+       }
+       return handler;
+   }
+
    /**
     * Get the state of this handler chain
     */

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axws/handler/HandlerResolverImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-03 13:47:54 UTC (rev 15031)
@@ -168,14 +168,13 @@
       try
       {
          // Load the handler class using the deployments top level CL
-         Class hClass =3D classLoader.loadClass(className);
-         Handler handler =3D (Handler)hClass.newInstance();
+         Handler<?> handler =3D getInstance(classLoader, className);
 =

          if (handler instanceof GenericHandler)
             ((GenericHandler)handler).setHandlerName(handlerName);
 =

          if (handler instanceof GenericSOAPHandler)
-            ((GenericSOAPHandler)handler).setHeaders(soapHeaders);
+            ((GenericSOAPHandler<?>)handler).setHeaders(soapHeaders);
 =

          if (injections !=3D null)
          {
@@ -197,6 +196,22 @@
       }
    }
 =

+   private Handler<?> getInstance(final ClassLoader fallbackLoader, final =
String className) throws Exception
+   {
+       final Endpoint ep =3D EndpointAssociation.getEndpoint();
+       final Handler<?> handler;
+       if (ep !=3D null)
+       {
+           handler =3D (Handler<?>)ep.getInstanceProvider().getInstance(cl=
assName);
+       }
+       else
+       {
+           final Class<?> hClass =3D fallbackLoader.loadClass(className);
+           handler =3D (Handler<?>)hClass.newInstance();
+       }
+       return handler;
+   }
+
    private boolean addHandler(HandlerMetaDataJAXWS hmd, Handler handler, H=
andlerType type)
    {
       if (log.isDebugEnabled())

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axws/spi/http/NettyHttpServerAdapter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/s=
pi/http/NettyHttpServerAdapter.java	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/s=
pi/http/NettyHttpServerAdapter.java	2011-10-03 13:47:54 UTC (rev 15031)
@@ -51,6 +51,7 @@
 import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
 import org.jboss.wsf.spi.deployment.HttpEndpoint;
 import org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect;
+import org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect;
 import org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect;
 import org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect;
 import org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect;
@@ -221,6 +222,7 @@
          retVal.add(new EndpointAddressDeploymentAspect());
          retVal.add(new EndpointNameDeploymentAspect());
          retVal.add(new UnifiedMetaDataDeploymentAspect());
+         retVal.add(new NativeInstanceProviderDeploymentAspect());
          retVal.add(new ServiceEndpointInvokerDeploymentAspect());
          retVal.add(new PublishContractDeploymentAspect());
          retVal.add(new EagerInitializeDeploymentAspect());

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/s=
erver/ServiceEndpointInvoker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/=
ServiceEndpointInvoker.java	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/=
ServiceEndpointInvoker.java	2011-10-03 13:47:54 UTC (rev 15031)
@@ -371,7 +371,7 @@
             {
                // create endpoint instance
                final Class<?> endpointImplClass =3D endpoint.getTargetBean=
Class();
-               endpointImpl =3D endpointImplClass.newInstance();
+               endpointImpl =3D endpoint.getInstanceProvider().getInstance=
(endpointImplClass.getName());
                endpoint.addAttachment(Object.class, endpointImpl);
             }
             catch (Exception ex)

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack=
/jbws/Message.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
Message.properties	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
Message.properties	2011-10-03 13:47:54 UTC (rev 15031)
@@ -26,3 +26,5 @@
 CANNOT_PROCESS_METRICS=3DCannot process metrics
 INVALID_ENDPOINT_ADDRESS=3DInvalid endpoint address: {0}
 ERROR_PROCESSING_WEB_SERVICE_REQUEST=3DError processing web service request
+
+CANNOT_LOAD_CLASS=3DCannot load class: {0}

Added: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jb=
ws/NativeInstanceProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProvider.java	                        (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProvider.java	2011-10-03 13:47:54 UTC (rev 15031)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.jbws;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.InstanceProvider;
+
+/**
+ * Native instance provider.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+final class NativeInstanceProvider implements InstanceProvider {
+
+    private static final ResourceBundle bundle =3D BundleUtils.getBundle(N=
ativeInstanceProvider.class);
+    private final ClassLoader loader;
+    private final Map<String, Object> cache =3D new HashMap<String, Object=
>();
+
+    NativeInstanceProvider(final ClassLoader loader)
+    {
+        this.loader =3D loader;
+    }
+
+    public synchronized Object getInstance(final String className) {
+        Object instance =3D cache.get(className);
+        if (instance =3D=3D null) {
+            try {
+                instance =3D loader.loadClass(className).newInstance();
+                cache.put(className, instance);
+            } catch (Exception e) {
+                throw new WSException(BundleUtils.getMessage(bundle, "CANN=
OT_LOAD_CLASS",  className),  e);
+            }
+        }
+        return instance;
+    }
+
+}

Added: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jb=
ws/NativeInstanceProviderDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProviderDeploymentAspect.java	                        (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProviderDeploymentAspect.java	2011-10-03 13:47:54 UTC (rev 15=
031)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.jbws;
+
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.ws.common.utils.DelegateClassLoader;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+
+/**
+ * Instance provider DA.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class NativeInstanceProviderDeploymentAspect extends Abstract=
DeploymentAspect
+{
+
+    @Override
+    public void start(final Deployment dep)
+    {
+       final ClassLoader loader =3D dep.getRuntimeClassLoader();
+       final ClassLoader integrationCL =3D ClassLoaderProvider.getDefaultP=
rovider().getServerIntegrationClassLoader();
+       final ClassLoader newCL =3D new DelegateClassLoader(integrationCL, =
loader);
+       for (final Endpoint ep : dep.getService().getEndpoints())
+       {
+          ep.setInstanceProvider(new NativeInstanceProvider(newCL));
+       }
+    }
+
+    @Override
+    public void stop(final Deployment dep)
+    {
+        for (final Endpoint ep : dep.getService().getEndpoints())
+        {
+           ep.setInstanceProvider(null);
+        }
+    }
+
+}

Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native=
-config-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as6.xml	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as6.xml	2011-10-03 13:47:54 UTC (rev 15031)
@@ -43,6 +43,11 @@
     <property name=3D"provides">StackEndpointHandler</property>
   </bean>
 =

+  <bean name=3D"WSNativeInstanceProviderDeploymentAspect" class=3D"org.jbo=
ss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
+    <property name=3D"requires">ContainerMetaData</property>
+    <property name=3D"provides">StackInstanceProvider</property>
+  </bean>
+
   <bean name=3D"WSNativeEndpointRecordProcessorDeploymentAspect" class=3D"=
org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect">
     <property name=3D"mbeanServer"><inject bean=3D"WSMBeanServerLocator" p=
roperty=3D"mbeanServer"/></property>
     <property name=3D"requires">RegisteredEndpoint</property>

Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native=
-config-as7.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as7.xml	2011-10-03 13:10:26 UTC (rev 15030)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as7.xml	2011-10-03 13:47:54 UTC (rev 15031)
@@ -46,6 +46,11 @@
     <property name=3D"provides" class=3D"java.lang.String">StackEndpointHa=
ndler</property>
   </deploymentAspect>
 =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.NativeInstanceProvid=
erDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackInstancePr=
ovider</property>
+  </deploymentAspect>
+
   <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.PublishContractDeplo=
ymentAspect">
     <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model, JAXBIntros</property>
     <property name=3D"provides" class=3D"java.lang.String">PublishedContra=
ct</property>


--===============1677243424763725496==--

From jbossws-commits at lists.jboss.org Mon Oct  3 10:22:36 2011
Content-Type: multipart/mixed; boundary="===============0262662513040326321=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15032 - in
 stack/cxf/trunk/modules/server/src/main:
 java/org/jboss/wsf/stack/cxf/deployment/aspect and 2 other directories.
Date: Mon, 03 Oct 2011 10:22:36 -0400
Message-ID: <201110031422.p93EMa00024022@svn01.web.mwc.hst.phx2.redhat.com>

--===============0262662513040326321==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-03 10:22:36 -0400 (Mon, 03 Oct 2011)
New Revision: 15032

Added:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXF=
InstanceProvider.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/dep=
loyment/aspect/CXFInstanceProviderDeploymentAspect.java
Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/Mes=
sage.properties
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tra=
nsport/ServletHelper.java
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6=
.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7=
.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-=
as6.xml
Log:
[JBWS-3363] extending SPI - providing hook for instances retrieval

Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf=
/CXFInstanceProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CX=
FInstanceProvider.java	                        (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CX=
FInstanceProvider.java	2011-10-03 14:22:36 UTC (rev 15032)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.cxf;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.xml.ws.handler.Handler;
+
+import org.apache.cxf.frontend.ServerFactoryBean;
+import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.InstanceProvider;
+
+/**
+ * CXF instance provider.
+ * =

+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class CXFInstanceProvider implements InstanceProvider {
+
+    private static final ResourceBundle bundle =3D BundleUtils.getBundle(C=
XFInstanceProvider.class);
+    private final ServerFactoryBean factory;
+    private final Map<String, Object> cache =3D new HashMap<String, Object=
>();
+
+    public CXFInstanceProvider(final ServerFactoryBean factory) {
+        this.factory =3D factory;
+    }
+
+    public synchronized Object getInstance(final String className) {
+        Object instance =3D cache.get(className);
+        if (instance =3D=3D null) {
+            final Object serviceBean =3D factory.getServiceBean();
+            if (className.equals(factory.getServiceBean().getClass().getNa=
me())) {
+                cache.put(className, instance =3D serviceBean);
+            }
+            if (instance =3D=3D null)
+            {
+                List<Handler> chain =3D ((JaxWsEndpointImpl) factory.getSe=
rver().getEndpoint()).getJaxwsBinding().getHandlerChain();
+                if (chain !=3D null) {
+                    for (Handler handler : chain) {
+                        if (className.equals(handler.getClass().getName())=
) {
+                            cache.put(className, instance =3D handler);
+                        }
+                    }
+                }
+            }
+        }
+        if (instance =3D=3D null)
+            throw new IllegalStateException(BundleUtils.getMessage(bundle,=
 "CANNOT_LOAD_CLASS",  className));
+        return instance;
+    }
+
+}

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/Message.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/Me=
ssage.properties	2011-10-03 13:47:54 UTC (rev 15031)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/Me=
ssage.properties	2011-10-03 14:22:36 UTC (rev 15032)
@@ -1,3 +1,4 @@
 CANNOT_OBTAIN_REGISTRY=3DCannot obtain DestinationRegistry!
 CANNOT_OBTAIN_DESTINATION=3DCannot obtain destination for: {0}
 CANNOT_GET_DESTINATIONFACTORY=3DCannot get DestinationFactory for http tra=
nsport!
+CANNOT_LOAD_CLASS=3DCannot load class: {0}

Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf=
/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/CXFInstanceProviderDeploymentAspect.java	                  =
      (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/CXFInstanceProviderDeploymentAspect.java	2011-10-03 14:22:3=
6 UTC (rev 15032)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.cxf.deployment.aspect;
+
+import org.apache.cxf.frontend.ServerFactoryBean;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.stack.cxf.CXFInstanceProvider;
+
+/**
+ * Instance provider DA.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class CXFInstanceProviderDeploymentAspect extends AbstractDep=
loymentAspect
+{
+
+    @Override
+    public void start(final Deployment dep)
+    {
+       for (final Endpoint ep : dep.getService().getEndpoints())
+       {
+          final ServerFactoryBean factory =3D ep.getAttachment(ServerFacto=
ryBean.class);
+          ep.setInstanceProvider(new CXFInstanceProvider(factory));
+       }
+    }
+
+}

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/transport/ServletHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-03 13:47:54 UTC (rev 15031)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-03 14:22:36 UTC (rev 15032)
@@ -119,6 +119,7 @@
    private static void injectServiceAndHandlerResources(Endpoint endpoint)
    {
       ServerFactoryBean factory =3D endpoint.getAttachment(ServerFactoryBe=
an.class);
+      if (factory =3D=3D null) throw new UnsupportedOperationException(); =
// TODO: move injection to ASIL
       if (factory !=3D null)
       {
          InjectionsMetaData metadata =3D endpoint.getAttachment(Injections=
MetaData.class);
@@ -129,8 +130,9 @@
          {
             for (Handler handler : chain)
             {
-               InjectionHelper.injectResources(handler, metadata, jndiCont=
ext);
-               InjectionHelper.callPostConstructMethod(handler);
+               final Object handlerInstance =3D endpoint.getInstanceProvid=
er().getInstance(handler.getClass().getName());
+               InjectionHelper.injectResources(handlerInstance, metadata, =
jndiContext);
+               InjectionHelper.callPostConstructMethod(handlerInstance);
             }
          }
       }
@@ -143,7 +145,8 @@
       {
          if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() !=3D=
 null)
          {
-            InjectionHelper.callPreDestroyMethod(factory.getServiceBean());
+            final Object epInstance =3D endpoint.getInstanceProvider().get=
Instance(factory.getServiceBean().getClass().getName());
+            InjectionHelper.callPreDestroyMethod(epInstance);
          }
       }
    }

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-con=
fig-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-03 13:47:54 UTC (rev 15031)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-03 14:22:36 UTC (rev 15032)
@@ -64,6 +64,12 @@
     <property name=3D"forJaxRpc">false</property>
   </bean>
 =

+  <bean name=3D"WSCXFInstanceProviderDeploymentAspect" class=3D"org.jboss.=
wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
+    <property name=3D"requires">ContainerMetaData,BusHolder</property>
+    <property name=3D"provides">StackInstanceProvider</property>
+    <property name=3D"forJaxRpc">false</property>
+  </bean>
+
   <bean name=3D"WSCXFEndpointRecordProcessorDeploymentAspect" class=3D"org=
.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect">
     <property name=3D"mbeanServer"><inject bean=3D"WSMBeanServerLocator" p=
roperty=3D"mbeanServer"/></property>
     <property name=3D"requires">RegisteredEndpoint</property>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-con=
fig-as7.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
7.xml	2011-10-03 13:47:54 UTC (rev 15031)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
7.xml	2011-10-03 14:22:36 UTC (rev 15032)
@@ -55,6 +55,12 @@
     <property name=3D"forJaxRpc" class=3D"boolean">false</property>
   </deploymentAspect>
 =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.cxf.deployment.aspect.CXF=
InstanceProviderDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta,BusHolder</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackInstancePr=
ovider</property>
+    <property name=3D"forJaxRpc" class=3D"boolean">false</property>
+  </deploymentAspect>
+
   <deploymentAspect class=3D"org.jboss.ws.common.deployment.JAXBIntroDeplo=
ymentAspect">
     <property name=3D"provides" class=3D"java.lang.String">JAXBIntros</pro=
perty>
     <property name=3D"forJaxRpc" class=3D"boolean">false</property>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-=
config-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config=
-as6.xml	2011-10-03 13:47:54 UTC (rev 15031)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config=
-as6.xml	2011-10-03 14:22:36 UTC (rev 15032)
@@ -28,6 +28,12 @@
     <property name=3D"forJaxWs">false</property>
   </bean>
 =

+  <bean name=3D"WSNativeInstanceProviderDeploymentAspect" class=3D"org.jbo=
ss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
+    <property name=3D"requires">ContainerMetaData</property>
+    <property name=3D"provides">StackInstanceProvider</property>
+    <property name=3D"forJaxWs">false</property>
+  </bean>
+
   <bean name=3D"WSNativePublishContractDeploymentAspect" class=3D"org.jbos=
s.wsf.stack.jbws.PublishContractDeploymentAspect">
     <property name=3D"requires">UnifiedMetaDataModel, JAXBIntros</property>
     <property name=3D"provides">PublishedContract</property>


--===============0262662513040326321==--

From jbossws-commits at lists.jboss.org Tue Oct  4 02:35:53 2011
Content-Type: multipart/mixed; boundary="===============4159162545937910796=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15033 -
 stack/native/trunk/modules/testsuite.
Date: Tue, 04 Oct 2011 02:35:53 -0400
Message-ID: <201110040635.p946ZrZA007681@svn01.web.mwc.hst.phx2.redhat.com>

--===============4159162545937910796==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-04 02:35:53 -0400 (Tue, 04 Oct 2011)
New Revision: 15033

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling @WebServiceRef tests

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-03 14:22:36 UTC (r=
ev 15032)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-04 06:35:53 UTC (r=
ev 15033)
@@ -993,12 +993,6 @@
                  <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</=
exclude> <!-- [AS7-1407] affects this test -->
 =

-                 <!-- TODO: Native webserviceref stuff -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/=
**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec=
/**</exclude>
-
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>


--===============4159162545937910796==--

From jbossws-commits at lists.jboss.org Tue Oct  4 02:39:09 2011
Content-Type: multipart/mixed; boundary="===============9119683041640358006=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15034 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 04 Oct 2011 02:39:08 -0400
Message-ID: <201110040639.p946d805007709@svn01.web.mwc.hst.phx2.redhat.com>

--===============9119683041640358006==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-04 02:39:08 -0400 (Tue, 04 Oct 2011)
New Revision: 15034

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling @WebServiceRef tests

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-04 06:35:53 UTC (rev =
15033)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-04 06:39:08 UTC (rev =
15034)
@@ -1231,13 +1231,6 @@
                  <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</=
exclude> <!-- [AS7-1407] affects this test -->
 =

-                 <!-- @WebServiceRef / webserviceref not implemented / rea=
dy yet on AS7 -->
-                 <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebSer=
viceRefServletTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/=
**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec=
/**</exclude>
-
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1263,6 +1256,7 @@
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 =

                  <!-- TODO: investigate -->
+                 <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebSer=
viceRefServletTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbT=
estCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>


--===============9119683041640358006==--

From jbossws-commits at lists.jboss.org Tue Oct  4 10:13:03 2011
Content-Type: multipart/mixed; boundary="===============2817893801818196173=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15035 - in
 common/trunk/src/main/java/org/jboss/ws/common: utils and 1 other directory.
Date: Tue, 04 Oct 2011 10:13:03 -0400
Message-ID: <201110041413.p94ED3MD029407@svn01.web.mwc.hst.phx2.redhat.com>

--===============2817893801818196173==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-04 10:13:03 -0400 (Tue, 04 Oct 2011)
New Revision: 15035

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
   common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePub=
lisher.java
Log:
[JBWS-3365] Use a dedicated DocumentBuilfer for WSDL file publishing


Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java	2011-10-04=
 06:39:08 UTC (rev 15034)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java	2011-10-04=
 14:13:03 UTC (rev 15035)
@@ -142,40 +142,41 @@
          }
       }
       =

-      @SuppressWarnings("deprecation")
-      private void setEntityResolver(DocumentBuilder builder)
+   };
+   =

+   @SuppressWarnings("deprecation")
+   private static void setEntityResolver(DocumentBuilder builder)
+   {
+      EntityResolver entityResolver =3D null;
+      try
       {
-         EntityResolver entityResolver =3D null;
-         try
+         entityResolver =3D new JBossWSEntityResolver();
+      }
+      catch (Throwable t)
+      {
+         boolean debugEnabled =3D log.isDebugEnabled();
+         if (debugEnabled)
+            log.debug("Cannot load JBossWSEntityResolver");
+         String[] resolvers =3D new String[] { "org.jboss.util.xml.JBossEn=
tityResolver" };
+         ClassLoader loader =3D SecurityActions.getContextClassLoader();
+         for (String resolver : resolvers)
          {
-            entityResolver =3D new JBossWSEntityResolver();
-         }
-         catch (Throwable t)
-         {
-            boolean debugEnabled =3D log.isDebugEnabled();
-            if (debugEnabled)
-               log.debug("Cannot load JBossWSEntityResolver");
-            String[] resolvers =3D new String[] { "org.jboss.util.xml.JBos=
sEntityResolver" };
-            ClassLoader loader =3D SecurityActions.getContextClassLoader();
-            for (String resolver : resolvers)
+            try
             {
-               try
-               {
-                  Class<?> resolverClass =3D SecurityActions.loadClass(loa=
der, resolver);
-                  entityResolver =3D (EntityResolver)resolverClass.newInst=
ance();
-                  break;
-               }
-               catch (Exception ex)
-               {
-                  if (debugEnabled)
-                     log.debug("Cannot load: " + resolver);
-               }
+               Class<?> resolverClass =3D SecurityActions.loadClass(loader=
, resolver);
+               entityResolver =3D (EntityResolver)resolverClass.newInstanc=
e();
+               break;
             }
+            catch (Exception ex)
+            {
+               if (debugEnabled)
+                  log.debug("Cannot load: " + resolver);
+            }
          }
-         if (entityResolver !=3D null)
-            builder.setEntityResolver(entityResolver);
       }
-   };
+      if (entityResolver !=3D null)
+         builder.setEntityResolver(entityResolver);
+   }
    =

    private static void initializeFactory(final DocumentBuilderFactory fact=
ory)
    {
@@ -211,6 +212,26 @@
    private DOMUtils()
    {
    }
+   =

+   /**
+    * Creates a new DocumentBuilder instance using the provided DocumentBu=
ilderFactory
+    * =

+    * @param factory
+    * @return
+    */
+   public static DocumentBuilder newDocumentBuilder(final DocumentBuilderF=
actory factory)
+   {
+      try
+      {
+         final DocumentBuilder builder =3D factory.newDocumentBuilder();
+         setEntityResolver(builder);
+         return builder;
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(BundleUtils.getMessage(bundle, "UNABLE=
_TO_CREATE_DOCUMENT_BUILDER"),  e);
+      }
+   }
 =

    /**
     * Initialize the DocumentBuilder, set the current thread association a=
nd returns it
@@ -239,14 +260,12 @@
 =

    /**
     * Parse the given XML stream and return the root Element
-    * This uses the document builder associated with the current thread.
     */
-   public static Element parse(InputStream xmlStream) throws IOException
+   public static Element parse(InputStream xmlStream, DocumentBuilder buil=
der) throws IOException
    {
       try
       {
          Document doc;
-         DocumentBuilder builder =3D getDocumentBuilder();
          synchronized (builder) //synchronize to prevent concurrent parsin=
g on the same DocumentBuilder
          {
             doc =3D builder.parse(xmlStream);
@@ -262,6 +281,16 @@
          xmlStream.close();
       }
    }
+   =

+   /**
+    * Parse the given XML stream and return the root Element
+    * This uses the document builder associated with the current thread.
+    */
+   public static Element parse(InputStream xmlStream) throws IOException
+   {
+      DocumentBuilder builder =3D getDocumentBuilder();
+      return parse(xmlStream, builder);
+   }
 =

    /**
     * Parse the given input source and return the root Element.

Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDL=
FilePublisher.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePu=
blisher.java	2011-10-04 06:39:08 UTC (rev 15034)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePu=
blisher.java	2011-10-04 14:13:03 UTC (rev 15035)
@@ -36,6 +36,10 @@
 import javax.wsdl.Definition;
 import javax.wsdl.Import;
 import javax.wsdl.factory.WSDLFactory;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 =

 import org.jboss.logging.Logger;
 import org.jboss.ws.api.util.BundleUtils;
@@ -67,6 +71,8 @@
    // The server config
    protected ServerConfig serverConfig;
    =

+   private static DocumentBuilder builder;
+   =

    public AbstractWSDLFilePublisher(ArchiveDeployment dep)
    {
       this.dep =3D dep;
@@ -88,6 +94,36 @@
       }
    }
    =

+   private static synchronized DocumentBuilder getDocumentBuilder()
+   {
+      if (builder =3D=3D null)
+      {
+         final ClassLoader classLoader =3D SecurityActions.getContextClass=
Loader();
+         SecurityActions.setContextClassLoader(AbstractWSDLFilePublisher.c=
lass.getClassLoader());
+         try
+         {
+            DocumentBuilderFactory factory =3D DocumentBuilderFactory.newI=
nstance();
+            factory.setValidating(false);
+            factory.setNamespaceAware(true);
+            factory.setExpandEntityReferences(false);
+            try
+            {
+               factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, =
true);
+            }
+            catch (ParserConfigurationException pce)
+            {
+               log.error(pce);
+            }
+            builder =3D DOMUtils.newDocumentBuilder(factory);
+         }
+         finally
+         {
+            SecurityActions.setContextClassLoader(classLoader);
+         }
+      }
+      return builder;
+   }
+   =

    /** Publish the wsdl imports for a given wsdl definition
     */
    @SuppressWarnings("unchecked")
@@ -132,7 +168,7 @@
                publishWsdlImports(targetURL, subdef, published);
 =

                // Publish XMLSchema imports
-               Element subdoc =3D DOMUtils.parse(targetURL.openStream());
+               Element subdoc =3D DOMUtils.parse(targetURL.openStream(), g=
etDocumentBuilder());
                publishSchemaImports(targetURL, subdoc, published);
             }
          }
@@ -203,7 +239,7 @@
                   log.debug("XMLSchema import published to: " + xsdURL);
 =

                   // recursively publish imports
-                  Element subdoc =3D DOMUtils.parse(xsdURL.openStream());
+                  Element subdoc =3D DOMUtils.parse(xsdURL.openStream(), g=
etDocumentBuilder());
                   publishSchemaImports(xsdURL, subdoc, published);
                }
             }
@@ -243,7 +279,7 @@
          else
          {
             if (file.delete() =3D=3D false)
-               log.warn(BundleUtils.getMessage(bundle, "CANNOT_DELETE_PUBL=
ISHED_WSDL_DOCUMENT",  file.toURL()));
+               log.warn(BundleUtils.getMessage(bundle, "CANNOT_DELETE_PUBL=
ISHED_WSDL_DOCUMENT",  file.toURI().toURL()));
          }
       }
 =



--===============2817893801818196173==--

From jbossws-commits at lists.jboss.org Wed Oct  5 04:07:56 2011
Content-Type: multipart/mixed; boundary="===============5753304769920351986=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15036 -
 stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.
Date: Wed, 05 Oct 2011 04:07:55 -0400
Message-ID: <201110050807.p9587tnF032633@svn01.web.mwc.hst.phx2.redhat.com>

--===============5753304769920351986==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-05 04:07:54 -0400 (Wed, 05 Oct 2011)
New Revision: 15036

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/main/module.xml
Log:
adding javax.ejb.api

Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/=
jboss/as/webservices/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
as/webservices/main/module.xml	2011-10-04 14:13:03 UTC (rev 15035)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
as/webservices/main/module.xml	2011-10-05 08:07:54 UTC (rev 15036)
@@ -31,6 +31,7 @@
     <dependencies>
         <module name=3D"javax.annotation.api"/>
         <module name=3D"javax.api"/>
+        <module name=3D"javax.ejb.api"/>
         <module name=3D"javax.jws.api"/>
         <module name=3D"javax.servlet.api"/>
         <module name=3D"javax.xml.ws.api"/>


--===============5753304769920351986==--

From jbossws-commits at lists.jboss.org Wed Oct  5 04:08:08 2011
Content-Type: multipart/mixed; boundary="===============5299805937298182392=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15037 -
 stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main.
Date: Wed, 05 Oct 2011 04:08:07 -0400
Message-ID: <201110050808.p95887PJ032683@svn01.web.mwc.hst.phx2.redhat.com>

--===============5299805937298182392==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-05 04:08:07 -0400 (Wed, 05 Oct 2011)
New Revision: 15037

Modified:
   stack/native/trunk/modules/resources/src/main/resources/modules/org/jbos=
s/as/webservices/main/module.xml
Log:
adding javax.ejb.api

Modified: stack/native/trunk/modules/resources/src/main/resources/modules/o=
rg/jboss/as/webservices/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/as/webservices/main/module.xml	2011-10-05 08:07:54 UTC (rev 15036)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/as/webservices/main/module.xml	2011-10-05 08:08:07 UTC (rev 15037)
@@ -31,6 +31,7 @@
     <dependencies>
         <module name=3D"javax.annotation.api"/>
         <module name=3D"javax.api"/>
+        <module name=3D"javax.ejb.api"/>
         <module name=3D"javax.jws.api"/>
         <module name=3D"javax.servlet.api"/>
         <module name=3D"javax.xml.ws.api"/>


--===============5299805937298182392==--

From jbossws-commits at lists.jboss.org Wed Oct  5 05:09:13 2011
Content-Type: multipart/mixed; boundary="===============2275255071434356167=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15038 -
 stack/native/trunk/modules/core/src/main/resources/schema.
Date: Wed, 05 Oct 2011 05:09:13 -0400
Message-ID: <201110050909.p9599DWn011329@svn01.web.mwc.hst.phx2.redhat.com>

--===============2275255071434356167==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-05 05:09:12 -0400 (Wed, 05 Oct 2011)
New Revision: 15038

Modified:
   stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metada=
ta-2007-02.xsd
   stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd
   stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-s=
chema.xsd
Log:
[JBWS-3365] Uncommenting some DOCTYPEs


Modified: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr=
-metadata-2007-02.xsd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metad=
ata-2007-02.xsd	2011-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metad=
ata-2007-02.xsd	2011-10-05 09:09:12 UTC (rev 15038)
@@ -1,5 +1,5 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://ww=
w.w3.org/2001/XMLSchema.dtd"-->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.=
w3.org/2001/XMLSchema.dtd">
 <!--
     W3C XML Schema defined in the Web Services Addressing 1.0 =

     - Metadata specification
@@ -63,4 +63,4 @@
         </xs:complexType>
     </xs:element>
     =

-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.=
xsd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd	20=
11-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/wsdl20.xsd	20=
11-10-05 09:09:12 UTC (rev 15038)
@@ -15,7 +15,7 @@
    [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 -->
 =

-<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://ww=
w.w3.org/2001/XMLSchema.dtd"-->
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.=
w3.org/2001/XMLSchema.dtd">
 =

 <xs:schema xmlns:xs=3D"http://www.w3.org/2001/XMLSchema" xmlns:wsdl=3D"htt=
p://www.w3.org/2003/11/wsdl" targetNamespace=3D"http://www.w3.org/2003/11/w=
sdl" elementFormDefault=3D"qualified" finalDefault=3D"" blockDefault=3D"" a=
ttributeFormDefault=3D"unqualified">
 =

@@ -325,4 +325,4 @@
     <xs:attribute ref=3D"wsdl:required" use=3D"optional"/>
   </xs:complexType>
 =

-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: stack/native/trunk/modules/core/src/main/resources/schema/xmldsig=
-core-schema.xsd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-=
schema.xsd	2011-10-05 08:08:07 UTC (rev 15037)
+++ stack/native/trunk/modules/core/src/main/resources/schema/xmldsig-core-=
schema.xsd	2011-10-05 09:09:12 UTC (rev 15038)
@@ -1,5 +1,5 @@
 <?xml version=3D"1.0" encoding=3D"utf-8"?>
-<!--DOCTYPE schema
+<!DOCTYPE schema
   PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSch=
ema.dtd"
  [
    <!ATTLIST schema =

@@ -7,7 +7,7 @@
    <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
    <!ENTITY % p ''>
    <!ENTITY % s ''>
-  ]-->
+  ]>
 =

 <!-- Schema for XML Signatures
     http://www.w3.org/2000/09/xmldsig#


--===============2275255071434356167==--

From jbossws-commits at lists.jboss.org Wed Oct  5 06:52:24 2011
Content-Type: multipart/mixed; boundary="===============5291156849066594108=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15039 -
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2268.
Date: Wed, 05 Oct 2011 06:52:24 -0400
Message-ID: <201110051052.p95AqOvX026126@svn01.web.mwc.hst.phx2.redhat.com>

--===============5291156849066594108==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-05 06:52:24 -0400 (Wed, 05 Oct 2011)
New Revision: 15039

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws2268/EndpointImpl.java
Log:
endpoints cannot be final classes

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws2268/EndpointImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2268/EndpointImpl.java	2011-10-05 09:09:12 UTC (rev 15038)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2268/EndpointImpl.java	2011-10-05 10:52:24 UTC (rev 15039)
@@ -38,7 +38,7 @@
    targetNamespace =3D "http://www.jboss.org/test/ws/jaxws/jbws2268",
    endpointInterface=3D"org.jboss.test.ws.jaxws.jbws2268.EndpointInterface"
 )
-public final class EndpointImpl
+public class EndpointImpl
 {
 =

    private StringBuilder builder =3D new StringBuilder();


--===============5291156849066594108==--

From jbossws-commits at lists.jboss.org Fri Oct  7 04:35:14 2011
Content-Type: multipart/mixed; boundary="===============5954285992004258168=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15040 - spi/branches.
Date: Fri, 07 Oct 2011 04:35:14 -0400
Message-ID: <201110070835.p978ZEh2012588@svn01.web.mwc.hst.phx2.redhat.com>

--===============5954285992004258168==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:35:14 -0400 (Fri, 07 Oct 2011)
New Revision: 15040

Added:
   spi/branches/JBWS-3366/
Log:
Branching for working on jaxrpc functionalities for AS7



--===============5954285992004258168==--

From jbossws-commits at lists.jboss.org Fri Oct  7 04:37:58 2011
Content-Type: multipart/mixed; boundary="===============6936738840197734176=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15041 - in
 spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi: deployment and 1
 other directory.
Date: Fri, 07 Oct 2011 04:37:57 -0400
Message-ID: <201110070837.p978bvwr012616@svn01.web.mwc.hst.phx2.redhat.com>

--===============6936738840197734176==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:37:57 -0400 (Fri, 07 Oct 2011)
New Revision: 15041

Modified:
   spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/Clas=
sLoaderProvider.java
   spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/Servle=
tDelegateFactory.java
   spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFSer=
vlet.java
Log:
- Adding jaxrpc integration classloader retrieval method in ClassLoaderProv=
ider
- Adding flag for deployment/classloader type in ServletDelegateFactory


Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloadi=
ng/ClassLoaderProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/Cla=
ssLoaderProvider.java	2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/classloading/Cla=
ssLoaderProvider.java	2011-10-07 08:37:57 UTC (rev 15041)
@@ -46,6 +46,12 @@
       {
          return getContextClassLoader();
       }
+
+      @Override
+      public ClassLoader getServerJAXRPCIntegrationClassLoader()
+      {
+         return getContextClassLoader();
+      }
    };
 =

    public static void setDefaultProvider(ClassLoaderProvider p)
@@ -66,12 +72,19 @@
    public abstract ClassLoader getWebServiceSubsystemClassLoader();
 =

    /**
-    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries
+    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries (for JAXWS usage)
     * =

     * @return
     */
    public abstract ClassLoader getServerIntegrationClassLoader();
 =

+   /**
+    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries (for JAXRPC usage)
+    * =

+    * @return
+    */
+   public abstract ClassLoader getServerJAXRPCIntegrationClassLoader();
+
    static ClassLoader getContextClassLoader()
    {
       if (System.getSecurityManager() =3D=3D null)

Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment=
/ServletDelegateFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/Servl=
etDelegateFactory.java	2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/Servl=
etDelegateFactory.java	2011-10-07 08:37:57 UTC (rev 15041)
@@ -30,5 +30,5 @@
  */
 public interface ServletDelegateFactory
 {
-   public ServletDelegate newServletDelegate(String delegateClassName);
+   public ServletDelegate newServletDelegate(String delegateClassName, boo=
lean isJaxWs);
 }

Modified: spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment=
/WSFServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFSe=
rvlet.java	2011-10-07 08:35:14 UTC (rev 15040)
+++ spi/branches/JBWS-3366/src/main/java/org/jboss/wsf/spi/deployment/WSFSe=
rvlet.java	2011-10-07 08:37:57 UTC (rev 15041)
@@ -43,6 +43,7 @@
 public class WSFServlet extends HttpServlet
 {
    public static final String STACK_SERVLET_DELEGATE_CLASS =3D "org.jboss.=
wsf.spi.deployment.stackServletDelegateClass";
+   public static final String INTEGRATION_CLASSLOADER =3D "org.jboss.wsf.s=
pi.deployment.integrationClassLoader";
 =

    private ServletDelegate delegate =3D null;
 =

@@ -73,7 +74,8 @@
       ClassLoader cl =3D clProvider.getWebServiceSubsystemClassLoader();
       ServiceLoader<ServletDelegateFactory> sl =3D ServiceLoader.load(Serv=
letDelegateFactory.class, cl);
       ServletDelegateFactory factory =3D sl.iterator().next();
-      return factory.newServletDelegate(servletConfig.getInitParameter(STA=
CK_SERVLET_DELEGATE_CLASS));
+      boolean isJaxWs =3D DeploymentType.JAXWS.toString().equals(servletCo=
nfig.getInitParameter(INTEGRATION_CLASSLOADER));
+      return factory.newServletDelegate(servletConfig.getInitParameter(STA=
CK_SERVLET_DELEGATE_CLASS), isJaxWs);
    }
    =

    @Override


--===============6936738840197734176==--

From jbossws-commits at lists.jboss.org Fri Oct  7 04:40:57 2011
Content-Type: multipart/mixed; boundary="===============7004105383294006591=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15042 -
 common/trunk/src/main/java/org/jboss/ws/common/deployment.
Date: Fri, 07 Oct 2011 04:40:57 -0400
Message-ID: <201110070840.p978evNn013041@svn01.web.mwc.hst.phx2.redhat.com>

--===============7004105383294006591==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:40:57 -0400 (Fri, 07 Oct 2011)
New Revision: 15042

Added:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityAction=
s.java
Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAspe=
ctManagerImpl.java
Log:
[JBWS-3366] Use DeploymentAspect::getLoader to set the TCCL before starting=
/stopping DA in DeploymentAspectManagerImpl


Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Deploym=
entAspectManagerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAsp=
ectManagerImpl.java	2011-10-07 08:37:57 UTC (rev 15041)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DeploymentAsp=
ectManagerImpl.java	2011-10-07 08:40:57 UTC (rev 15042)
@@ -123,8 +123,19 @@
          DeploymentAspect aspect =3D getDeploymentAspects().get(i);
          try
          {
-            logInvocation(aspect, "Start");
-            aspect.start(dep);
+            if (aspect.canHandle(dep)) {
+               logInvocation(aspect, "Start");
+               ClassLoader origClassLoader =3D SecurityActions.getContextC=
lassLoader();
+               try
+               {
+                  SecurityActions.setContextClassLoader(aspect.getLoader()=
);
+                  aspect.start(dep);
+               }
+               finally
+               {
+                  SecurityActions.setContextClassLoader(origClassLoader);
+               }
+            }
          }
          catch (RuntimeException rte)
          {

Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityAc=
tions.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActio=
ns.java	                        (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/SecurityActio=
ns.java	2011-10-07 08:40:57 UTC (rev 15042)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.ws.common.deployment;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Security actions for this package
+ * =

+ * @author alessio.soldano(a)jboss.com
+ * @since 06-Oct-2011
+ *
+ */
+class SecurityActions
+{
+   /**
+    * Get context classloader.
+    * =

+    * @return the current context classloader
+    */
+   static ClassLoader getContextClassLoader()
+   {
+      SecurityManager sm =3D System.getSecurityManager();
+      if (sm =3D=3D null)
+      {
+         return Thread.currentThread().getContextClassLoader();
+      }
+      else
+      {
+         return AccessController.doPrivileged(new PrivilegedAction<ClassLo=
ader>() {
+            public ClassLoader run()
+            {
+               return Thread.currentThread().getContextClassLoader();
+            }
+         });
+      }
+   }
+
+   /**
+    * Set context classloader.
+    * =

+    * @param classLoader the context classloader
+    */
+   static void setContextClassLoader(final ClassLoader classLoader)
+   {
+      SecurityManager sm =3D System.getSecurityManager();
+      if (sm =3D=3D null)
+      {
+         Thread.currentThread().setContextClassLoader(classLoader);
+      }
+      else
+      {
+         AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            public Object run()
+            {
+               Thread.currentThread().setContextClassLoader(classLoader);
+               return null;
+            }
+         });
+      }
+   }
+}
\ No newline at end of file


--===============7004105383294006591==--

From jbossws-commits at lists.jboss.org Fri Oct  7 04:43:22 2011
Content-Type: multipart/mixed; boundary="===============9179530608791542973=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15043 - stack/cxf/branches.
Date: Fri, 07 Oct 2011 04:43:22 -0400
Message-ID: <201110070843.p978hMtJ013122@svn01.web.mwc.hst.phx2.redhat.com>

--===============9179530608791542973==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:43:22 -0400 (Fri, 07 Oct 2011)
New Revision: 15043

Added:
   stack/cxf/branches/JBWS-3366/
Log:
Branching for working on jaxrpc functionalities on AS7



--===============9179530608791542973==--

From jbossws-commits at lists.jboss.org Fri Oct  7 04:45:34 2011
Content-Type: multipart/mixed; boundary="===============3879429943930262075=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15044 - in
 stack/cxf/branches/JBWS-3366: modules/server/src/main/resources and 2 other
 directories.
Date: Fri, 07 Oct 2011 04:45:33 -0400
Message-ID: <201110070845.p978jX7X013505@svn01.web.mwc.hst.phx2.redhat.com>

--===============3879429943930262075==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 04:45:33 -0400 (Fri, 07 Oct 2011)
New Revision: 15044

Added:
   stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jbossws-j=
axrpc-config-as7.xml
Modified:
   stack/cxf/branches/JBWS-3366/modules/server/src/main/scripts/antrun-bean=
s-config.xml
   stack/cxf/branches/JBWS-3366/modules/testsuite/pom.xml
   stack/cxf/branches/JBWS-3366/pom.xml
Log:
- Adding jaxrpc deployment aspects
- Fixing testsuite classpath / dependencies and enabling few jaxrpc tests (=
DII only)


Added: stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jboss=
ws-jaxrpc-config-as7.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jbossws-=
jaxrpc-config-as7.xml	                        (rev 0)
+++ stack/cxf/branches/JBWS-3366/modules/server/src/main/resources/jbossws-=
jaxrpc-config-as7.xml	2011-10-07 08:45:33 UTC (rev 15044)
@@ -0,0 +1,76 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., 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.
+  -->
+
+<deploymentAspects xmlns=3D"urn:jboss:ws:deployment:aspects:1.0">
+  =

+  <deploymentAspect class=3D"org.jboss.ws.common.deployment.ContextPropert=
iesDeploymentAspect">
+    <property name=3D"provides" class=3D"java.lang.String">ContextProperti=
es, StackDescriptor</property>
+    <property name=3D"contextProperties" class=3D"java.util.HashMap">
+      <map keyClass=3D"java.lang.String" valueClass=3D"java.lang.String">
+        <entry>
+          <key>stack.transport.class</key>
+          <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
+        </entry>
+      </map>
+    </property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.EagerInitializeDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"provides" class=3D"java.lang.String">InitializedMeta=
DataModel</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.ws.common.deployment.EndpointHandle=
rDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackEndpointHa=
ndler</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.NativeInstanceProvid=
erDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackInstancePr=
ovider</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.PublishContractDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model, JAXBIntros</property>
+    <property name=3D"provides" class=3D"java.lang.String">PublishedContra=
ct</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.ServiceEndpointInvok=
erDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.UnifiedMetaDataDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
+    <property name=3D"provides" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+</deploymentAspects>
+

Modified: stack/cxf/branches/JBWS-3366/modules/server/src/main/scripts/antr=
un-beans-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/server/src/main/scripts/antrun-bea=
ns-config.xml	2011-10-07 08:43:22 UTC (rev 15043)
+++ stack/cxf/branches/JBWS-3366/modules/server/src/main/scripts/antrun-bea=
ns-config.xml	2011-10-07 08:45:33 UTC (rev 15044)
@@ -41,9 +41,18 @@
       tofile=3D"${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-=
specific-deployment-aspects.xml"
     />
     <copy
+      file=3D"${src.dir}/jbossws-jaxrpc-config-as7.xml"
+      tofile=3D"${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc=
-deployment-aspects.xml"
+    />
+  	=

+    <copy
       file=3D"${src.dir}/jbossws-cxf-config-as7.xml"
       tofile=3D"${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-=
specific-deployment-aspects.xml"
     />
+    <copy
+      file=3D"${src.dir}/jbossws-jaxrpc-config-as7.xml"
+      tofile=3D"${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc=
-deployment-aspects.xml"
+    />
 =

   </target>
 =


Modified: stack/cxf/branches/JBWS-3366/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/testsuite/pom.xml	2011-10-07 08:43=
:22 UTC (rev 15043)
+++ stack/cxf/branches/JBWS-3366/modules/testsuite/pom.xml	2011-10-07 08:45=
:33 UTC (rev 15044)
@@ -1151,6 +1151,57 @@
               </exclusion>
           </exclusions>
         </dependency>
+        <dependency>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+          <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>xml-apis</groupId>
+                  <artifactId>xml-apis</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss</groupId>
+          <artifactId>jbossxb</artifactId>
+          <version>${jboss.xb.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>apache-xerces</groupId>
+              <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>apache-xerces</groupId>
+              <artifactId>xercesImpl</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>jboss</groupId>
+              <artifactId>jboss-common-core</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-spi</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-log4j</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>sun-jaxb</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>xml-apis</groupId>
+              <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>wutka-dtdparser</groupId>
+               <artifactId>dtdparser121</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -1167,8 +1218,6 @@
                 <phase>test-compile</phase>
                 <configuration>
                   <testExcludes>
-                    <!-- AS7 compilation excludes -->
-                    <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
                     <!-- EJB3 client API dependencies -->
                     <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
                     <exclude>org/jboss/test/ws/jaxws/samples/webserviceref=
/**</exclude>
@@ -1186,8 +1235,11 @@
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${project.build.directory}/endorsed</argLine>
               <!-- TODO: replace with maven dependencies -->
               <additionalClasspathElements>
-                 <!-- Lib below required just for jaxrpc tests; listed her=
e to prevent CXF stack from depending on Native stack -->
-                <additionalClasspathElement>${jboss.home}/common/lib/jboss=
ws-native-core.jar</additionalClasspathElement>
+                <!-- Lib below required just for jaxrpc tests; listed here=
 to prevent CXF stack from depending on Native stack -->
+                <!-- JBossWS Native Core version available on 710 -->
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar=
</additionalClasspathElement>
+                <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
               </additionalClasspathElements>
               <excludes>
                  <!--# UsernameTestCase requires trustore in jboss-web tom=
cat configuration-->
@@ -1249,7 +1301,6 @@
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>
 =

                  <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
-                 <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</e=
xclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
@@ -1275,6 +1326,20 @@
 =

                  <!-- JAXR not available -->
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+                 =

+                 <!-- appclient not available for JAXRPC clients -->
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</ex=
clude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exc=
lude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</=
exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/message/**</exc=
lude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclud=
e>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/**</excl=
ude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/**</ex=
clude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</=
exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
 =

                  <!-- Former JMS endpoint functionalities replaced by SOAP=
-over-JMS on AS7 -->
                  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/=
**</exclude>

Modified: stack/cxf/branches/JBWS-3366/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/pom.xml	2011-10-07 08:43:22 UTC (rev 15043)
+++ stack/cxf/branches/JBWS-3366/pom.xml	2011-10-07 08:45:33 UTC (rev 15044)
@@ -62,7 +62,7 @@
     <jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
     <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
     <jboss.security.sx.version>2.0.4</jboss.security.sx.version>
-    <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
+    <jboss.xb.version>2.0.3.GA</jboss.xb.version>
     <picketbox.version>3.0.0.Beta5</picketbox.version>
     <jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserv=
er-httpspi.version>
     <httpserver.version>1.0.0.Beta1</httpserver.version>


--===============3879429943930262075==--

From jbossws-commits at lists.jboss.org Fri Oct  7 09:05:14 2011
Content-Type: multipart/mixed; boundary="===============5886235525590569386=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15045 -
 stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main.
Date: Fri, 07 Oct 2011 09:05:14 -0400
Message-ID: <201110071305.p97D5EcV032707@svn01.web.mwc.hst.phx2.redhat.com>

--===============5886235525590569386==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 09:05:13 -0400 (Fri, 07 Oct 2011)
New Revision: 15045

Modified:
   stack/native/trunk/modules/resources/src/main/resources/modules/org/jbos=
s/ws/native/jbossws-native-core/main/module.xml
Log:
[JBWS-3366] Marking some jbossws-native-core module dependencies as optiona=
l and removing not-required org.jboss.ws.jaxws-client dependency


Modified: stack/native/trunk/modules/resources/src/main/resources/modules/o=
rg/jboss/ws/native/jbossws-native-core/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/ws/native/jbossws-native-core/main/module.xml	2011-10-07 08:45:33 UTC (r=
ev 15044)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/ws/native/jbossws-native-core/main/module.xml	2011-10-07 13:05:13 UTC (r=
ev 15045)
@@ -29,9 +29,9 @@
     </resources>
 =

     <dependencies>
-        <module name=3D"com.sun.tools.ws" services=3D"import"/>
+        <module name=3D"com.sun.tools.ws" services=3D"import" optional=3D"=
true"/>
         <module name=3D"com.sun.xml.bind" services=3D"import"/>
-        <module name=3D"com.sun.xml.fastinfoset"/>
+        <module name=3D"com.sun.xml.fastinfoset" optional=3D"true"/>
         <module name=3D"javax.api" />
         <module name=3D"javax.servlet.api" />
         <module name=3D"javax.jws.api" />
@@ -43,16 +43,15 @@
         <module name=3D"javax.xml.ws.api" />
         <module name=3D"org.picketbox"/>
         <module name=3D"org.apache.xerces" services=3D"import"/>
-        <module name=3D"org.apache.xmlsec"/>
-        <module name=3D"org.apache.ws.commons.policy"/>
+        <module name=3D"org.apache.xmlsec" optional=3D"true"/>
+        <module name=3D"org.apache.ws.commons.policy" optional=3D"true"/>
         <module name=3D"org.javassist" />
-        <module name=3D"org.codehaus.jettison"/>
+        <module name=3D"org.codehaus.jettison" optional=3D"true"/>
         <module name=3D"org.jboss.netty" />
         <module name=3D"org.jboss.xb" />
         <module name=3D"org.jboss.ws.api" />
         <module name=3D"org.jboss.ws.spi" />
         <module name=3D"org.jboss.ws.common" />
-        <module name=3D"org.jboss.ws.jaxws-client" services=3D"import"/>
         <module name=3D"org.jboss.ws.native.jbossws-native-factories" serv=
ices=3D"import"/>
         <module name=3D"org.jboss.ws.native.jbossws-native-services" servi=
ces=3D"import"/>
         <module name=3D"org.jboss.common-core" />


--===============5886235525590569386==--

From jbossws-commits at lists.jboss.org Fri Oct  7 10:43:45 2011
Content-Type: multipart/mixed; boundary="===============7814244106314758146=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15046 -
 stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/resources.
Date: Fri, 07 Oct 2011 10:43:45 -0400
Message-ID: <201110071443.p97EhjEK014336@svn01.web.mwc.hst.phx2.redhat.com>

--===============7814244106314758146==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 10:43:45 -0400 (Fri, 07 Oct 2011)
New Revision: 15046

Modified:
   stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/resour=
ces/modules-deploy.conf
Log:
Fixing list of modules do undeploy


Modified: stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources=
/resources/modules-deploy.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/resou=
rces/modules-deploy.conf	2011-10-07 13:05:13 UTC (rev 15045)
+++ stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/resou=
rces/modules-deploy.conf	2011-10-07 14:43:45 UTC (rev 15046)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/*=
*, org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/*=
*, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jb=
oss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org=
/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/spr=
ingframework/spring/**
\ No newline at end of file


--===============7814244106314758146==--

From jbossws-commits at lists.jboss.org Fri Oct  7 10:44:45 2011
Content-Type: multipart/mixed; boundary="===============6421507042360246450=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15047 - in
 stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server:
 jaxrpc-integration and 1 other directories.
Date: Fri, 07 Oct 2011 10:44:45 -0400
Message-ID: <201110071444.p97EijFm014347@svn01.web.mwc.hst.phx2.redhat.com>

--===============6421507042360246450==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 10:44:44 -0400 (Fri, 07 Oct 2011)
New Revision: 15047

Added:
   stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/module=
s/org/jboss/as/webservices/server/jaxrpc-integration/
   stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/module=
s/org/jboss/as/webservices/server/jaxrpc-integration/main/
   stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/module=
s/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
Log:
Adding jaxrpc-integration module


Added: stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/mo=
dules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modul=
es/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml	     =
                   (rev 0)
+++ stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modul=
es/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml	2011-=
10-07 14:44:44 UTC (rev 15047)
@@ -0,0 +1,56 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., 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.
+  -->
+
+<module xmlns=3D"urn:jboss:module:1.0" name=3D"org.jboss.as.webservices.se=
rver.jaxrpc-integration">
+
+    <resources>
+    </resources>
+
+    <dependencies>
+        <module name=3D"javax.api" export=3D"true"/>
+        <module name=3D"javax.xml.rpc.api" export=3D"true"/>
+        <module name=3D"javax.wsdl4j.api" export=3D"true"/>
+        <module name=3D"com.sun.xml.bind" services=3D"export" export=3D"tr=
ue"/>
+        <module name=3D"org.jboss.ws.api" export=3D"true"/>
+        <module name=3D"org.jboss.ws.spi" export=3D"true"/>
+        <module name=3D"org.jboss.ws.common" services=3D"import" export=3D=
"true"/>
+        <module name=3D"org.jboss.ws.native.jbossws-native-factories" serv=
ices=3D"export" export=3D"true"/>
+        <module name=3D"org.jboss.ws.native.jbossws-native-core" services=
=3D"export" export=3D"true">
+          <imports>
+            <include path=3D"META-INF"/>
+            <include path=3D"dtd"/>
+            <include path=3D"schema"/>
+          </imports>
+          <exports>
+            <include path=3D"META-INF"/>
+            <include path=3D"dtd"/>
+            <include path=3D"schema"/>
+          </exports>
+        </module>
+        <module name=3D"org.jboss.ws.native.jbossws-native-services" servi=
ces=3D"export" export=3D"true"/>
+        <module name=3D"org.apache.xalan" services=3D"export" export=3D"tr=
ue"/>
+        <module name=3D"org.apache.xerces" services=3D"export" export=3D"t=
rue"/>
+        <module name=3D"org.jboss.as.webservices" services=3D"export" expo=
rt=3D"true"/>
+    </dependencies>
+</module>


--===============6421507042360246450==--

From jbossws-commits at lists.jboss.org Fri Oct  7 11:30:49 2011
Content-Type: multipart/mixed; boundary="===============4560170472028160311=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15048 - spi/branches/JBWS-3366.
Date: Fri, 07 Oct 2011 11:30:49 -0400
Message-ID: <201110071530.p97FUndZ024454@svn01.web.mwc.hst.phx2.redhat.com>

--===============4560170472028160311==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 11:30:49 -0400 (Fri, 07 Oct 2011)
New Revision: 15048

Modified:
   spi/branches/JBWS-3366/pom.xml
Log:
Preparing for tagging jbossws-spi-2.0.0.Beta10


Modified: spi/branches/JBWS-3366/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/branches/JBWS-3366/pom.xml	2011-10-07 14:44:44 UTC (rev 15047)
+++ spi/branches/JBWS-3366/pom.xml	2011-10-07 15:30:49 UTC (rev 15048)
@@ -7,25 +7,25 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta10</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</=
connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
runk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta10</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta10</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta10</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
+    <jbossws.api.version>1.0.0.Beta2</jbossws.api.version>
     <jms.api.version>1.0.0.Final</jms.api.version>
     <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============4560170472028160311==--

From jbossws-commits at lists.jboss.org Fri Oct  7 11:31:48 2011
Content-Type: multipart/mixed; boundary="===============9137205890787816490=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15049 - in spi: tags and 1 other
 directory.
Date: Fri, 07 Oct 2011 11:31:48 -0400
Message-ID: <201110071531.p97FVmi6024512@svn01.web.mwc.hst.phx2.redhat.com>

--===============9137205890787816490==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 11:31:47 -0400 (Fri, 07 Oct 2011)
New Revision: 15049

Added:
   spi/tags/jbossws-spi-2.0.0.Beta10/
Removed:
   spi/branches/JBWS-3366/
Log:
Tagging jbossws-spi-2.0.0.Beta10



--===============9137205890787816490==--

From jbossws-commits at lists.jboss.org Fri Oct  7 11:33:56 2011
Content-Type: multipart/mixed; boundary="===============7793955060011853688=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15050 - common/tags.
Date: Fri, 07 Oct 2011 11:33:56 -0400
Message-ID: <201110071533.p97FXu8M024555@svn01.web.mwc.hst.phx2.redhat.com>

--===============7793955060011853688==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 11:33:56 -0400 (Fri, 07 Oct 2011)
New Revision: 15050

Added:
   common/tags/jbossws-common-2.0.0.Beta10/
Log:
Tagging jbossws-common-2.0.0.Beta10



--===============7793955060011853688==--

From jbossws-commits at lists.jboss.org Fri Oct  7 11:39:47 2011
Content-Type: multipart/mixed; boundary="===============7977691069232711431=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15051 -
 common/tags/jbossws-common-2.0.0.Beta10.
Date: Fri, 07 Oct 2011 11:39:46 -0400
Message-ID: <201110071539.p97Fdkws024923@svn01.web.mwc.hst.phx2.redhat.com>

--===============7977691069232711431==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 11:39:46 -0400 (Fri, 07 Oct 2011)
New Revision: 15051

Modified:
   common/tags/jbossws-common-2.0.0.Beta10/pom.xml
Log:
Updating pom.xml


Modified: common/tags/jbossws-common-2.0.0.Beta10/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/tags/jbossws-common-2.0.0.Beta10/pom.xml	2011-10-07 15:33:56 UTC=
 (rev 15050)
+++ common/tags/jbossws-common-2.0.0.Beta10/pom.xml	2011-10-07 15:39:46 UTC=
 (rev 15051)
@@ -9,25 +9,25 @@
   <packaging>jar</packaging>
   <description>JBossWS Common</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta10</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trun=
k</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags=
/jbossws-common-2.0.0.Beta10</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/tags/jbossws-common-2.0.0.Beta10</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-comm=
on-2.0.0.Beta10</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+    <jbossws.spi.version>2.0.0.Beta10</jbossws.spi.version>
     <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
     <jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============7977691069232711431==--

From jbossws-commits at lists.jboss.org Fri Oct  7 11:57:05 2011
Content-Type: multipart/mixed; boundary="===============1011321466608315607=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15052 - shared-testsuite/tags.
Date: Fri, 07 Oct 2011 11:57:05 -0400
Message-ID: <201110071557.p97Fv51v026627@svn01.web.mwc.hst.phx2.redhat.com>

--===============1011321466608315607==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 11:57:05 -0400 (Fri, 07 Oct 2011)
New Revision: 15052

Added:
   shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5/
Log:
Tagging jbossws-shared-testuite-4.0.0.Beta5



--===============1011321466608315607==--

From jbossws-commits at lists.jboss.org Fri Oct  7 12:05:30 2011
Content-Type: multipart/mixed; boundary="===============8466108429015731872=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15053 -
 shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5.
Date: Fri, 07 Oct 2011 12:05:30 -0400
Message-ID: <201110071605.p97G5UZU000957@svn01.web.mwc.hst.phx2.redhat.com>

--===============8466108429015731872==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 12:05:30 -0400 (Fri, 07 Oct 2011)
New Revision: 15053

Modified:
   shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5/pom.xml
Log:
Updating pom.xml


Modified: shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5/pom.xml	2011=
-10-07 15:57:05 UTC (rev 15052)
+++ shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Beta5/pom.xml	2011=
-10-07 16:05:30 UTC (rev 15053)
@@ -6,24 +6,24 @@
   <artifactId>jbossws-shared-testsuite</artifactId>
   <description>JBossWS Stack Agnostic Testsuite</description>
 =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta5</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-test=
suite/trunk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/share=
d-testsuite/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/trunk</=
url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/shared-test=
suite/tags/jbossws-shared-testuite-4.0.0.Beta5</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/share=
d-testsuite/tags/jbossws-shared-testuite-4.0.0.Beta5</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/shared-testsuite/tags/jb=
ossws-shared-testuite-4.0.0.Beta5</url>
   </scm>
 =

   <properties>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+    <jbossws.common.version>2.0.0.Beta10</jbossws.common.version>
     <jboss.logging.version>2.0.5.GA</jboss.logging.version>
     <junit.version>3.8.2</junit.version>
   </properties>


--===============8466108429015731872==--

From jbossws-commits at lists.jboss.org Fri Oct  7 12:10:39 2011
Content-Type: multipart/mixed; boundary="===============3974858962088548918=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15054 - stack/native/tags.
Date: Fri, 07 Oct 2011 12:10:39 -0400
Message-ID: <201110071610.p97GAdnk001409@svn01.web.mwc.hst.phx2.redhat.com>

--===============3974858962088548918==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 12:10:39 -0400 (Fri, 07 Oct 2011)
New Revision: 15054

Added:
   stack/native/tags/jbossws-native-core-4.0.0.Beta2/
Log:
Tagging jbossws-native-core-4.0.0.Beta2



--===============3974858962088548918==--

From jbossws-commits at lists.jboss.org Fri Oct  7 12:11:32 2011
Content-Type: multipart/mixed; boundary="===============3684287038457560961=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15055 - stack/native/tags.
Date: Fri, 07 Oct 2011 12:11:32 -0400
Message-ID: <201110071611.p97GBWMe001487@svn01.web.mwc.hst.phx2.redhat.com>

--===============3684287038457560961==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-07 12:11:32 -0400 (Fri, 07 Oct 2011)
New Revision: 15055

Added:
   stack/native/tags/jbossws-native-4.0.0.Beta2/
Removed:
   stack/native/tags/jbossws-native-core-4.0.0.Beta2/
Log:
Renaming tag



--===============3684287038457560961==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:38:36 2011
Content-Type: multipart/mixed; boundary="===============3903579102102339593=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15056 - container/jboss70/branches.
Date: Sat, 08 Oct 2011 16:38:36 -0400
Message-ID: <201110082038.p98Kcauc019668@svn01.web.mwc.hst.phx2.redhat.com>

--===============3903579102102339593==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:38:35 -0400 (Sat, 08 Oct 2011)
New Revision: 15056

Added:
   container/jboss70/branches/JBWS-3366/
Log:



--===============3903579102102339593==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:43:41 2011
Content-Type: multipart/mixed; boundary="===============3261574019804480370=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15057 - in
 container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webservices:
 util and 1 other directory.
Date: Sat, 08 Oct 2011 16:43:41 -0400
Message-ID: <201110082043.p98Khfl4020141@svn01.web.mwc.hst.phx2.redhat.com>

--===============3261574019804480370==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:43:41 -0400 (Sat, 08 Oct 2011)
New Revision: 15057

Modified:
   container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webservi=
ces/tomcat/ServletDelegateFactoryImpl.java
   container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webservi=
ces/util/ModuleClassLoaderProvider.java
Log:
Updating to latest spi


Modified: container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/w=
ebservices/tomcat/ServletDelegateFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webserv=
ices/tomcat/ServletDelegateFactoryImpl.java	2011-10-08 20:38:35 UTC (rev 15=
056)
+++ container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webserv=
ices/tomcat/ServletDelegateFactoryImpl.java	2011-10-08 20:43:41 UTC (rev 15=
057)
@@ -36,7 +36,7 @@
 public class ServletDelegateFactoryImpl implements ServletDelegateFactory {
 =

     @Override
-    public ServletDelegate newServletDelegate(String servletClassName) {
+    public ServletDelegate newServletDelegate(String servletClassName, boo=
lean isJaxWs) {
         try {
             ClassLoader classLoader =3D ClassLoaderProvider.getDefaultProv=
ider().getServerIntegrationClassLoader();
             Class<?> clazz =3D classLoader.loadClass(servletClassName);

Modified: container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/w=
ebservices/util/ModuleClassLoaderProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webserv=
ices/util/ModuleClassLoaderProvider.java	2011-10-08 20:38:35 UTC (rev 15056)
+++ container/jboss70/branches/JBWS-3366/src/main/java/org/jboss/as/webserv=
ices/util/ModuleClassLoaderProvider.java	2011-10-08 20:43:41 UTC (rev 15057)
@@ -61,4 +61,10 @@
         ClassLoaderProvider.setDefaultProvider(new ModuleClassLoaderProvid=
er());
     }
 =

+   @Override
+   public ClassLoader getServerJAXRPCIntegrationClassLoader()
+   {
+      throw new RuntimeException("JAXRPC Integration not available on AS 7=
.0.x");
+   }
+
 }


--===============3261574019804480370==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:43:55 2011
Content-Type: multipart/mixed; boundary="===============8910684024234102896=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15058 -
 container/jboss70/branches/JBWS-3366.
Date: Sat, 08 Oct 2011 16:43:55 -0400
Message-ID: <201110082043.p98Kht9m020152@svn01.web.mwc.hst.phx2.redhat.com>

--===============8910684024234102896==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:43:55 -0400 (Sat, 08 Oct 2011)
New Revision: 15058

Modified:
   container/jboss70/branches/JBWS-3366/pom.xml
Log:
Preparing for tagging


Modified: container/jboss70/branches/JBWS-3366/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/JBWS-3366/pom.xml	2011-10-08 20:43:41 UTC (r=
ev 15057)
+++ container/jboss70/branches/JBWS-3366/pom.xml	2011-10-08 20:43:55 UTC (r=
ev 15058)
@@ -7,27 +7,27 @@
   <artifactId>jbossws-jboss700</artifactId>
   <description>JBossWS Container integration for JBoss AS 7.0.0.Final</des=
cription>
 =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta1</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/j=
boss70/branches/jbossws-jboss700</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/conta=
iner/jboss70/branches/jbossws-jboss700</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss70/branch=
es/jbossws-jboss700</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/j=
boss70/tags/jbossws-jboss700-4.0.0.Beta1</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/conta=
iner/jboss70/tags/jbossws-jboss700-4.0.0.Beta1</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/container/jboss70/tags/j=
bossws-jboss700-4.0.0.Beta1</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+    <jbossws.api.version>1.0.0.Beta2</jbossws.api.version>
+    <jbossws.spi.version>2.0.0.Beta10</jbossws.spi.version>
+    <jbossws.common.version>2.0.0.Beta10</jbossws.common.version>
     <jboss.msc.version>1.0.0.GA</jboss.msc.version>
     <jboss.version>7.0.0.Final</jboss.version>
   </properties>


--===============8910684024234102896==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:45:51 2011
Content-Type: multipart/mixed; boundary="===============9150465436633391613=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15059 - in container/jboss70: tags
 and 1 other directory.
Date: Sat, 08 Oct 2011 16:45:51 -0400
Message-ID: <201110082045.p98Kjp8u020500@svn01.web.mwc.hst.phx2.redhat.com>

--===============9150465436633391613==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:45:51 -0400 (Sat, 08 Oct 2011)
New Revision: 15059

Added:
   container/jboss70/tags/jbossws-jboss700-4.0.0.Beta1/
Removed:
   container/jboss70/branches/JBWS-3366/
Log:
Tagging jbossws-jboss700-4.0.0.Beta1



--===============9150465436633391613==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:54:49 2011
Content-Type: multipart/mixed; boundary="===============0018091455211657351=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15060 - in
 stack/native/tags/jbossws-native-4.0.0.Beta2: modules/client and 9 other
 directories.
Date: Sat, 08 Oct 2011 16:54:49 -0400
Message-ID: <201110082054.p98KsnSl020990@svn01.web.mwc.hst.phx2.redhat.com>

--===============0018091455211657351==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:54:48 -0400 (Sat, 08 Oct 2011)
New Revision: 15060

Modified:
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/client/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/core/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/management/pom=
.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/endorsed/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/resources/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/services/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/native-te=
sts/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/shared-te=
sts/pom.xml
   stack/native/tags/jbossws-native-4.0.0.Beta2/pom.xml
Log:
Fixing poms


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/client/pom.x=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/client/pom.xml	201=
1-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/client/pom.xml	201=
1-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/core/pom.xml	2011-=
10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/core/pom.xml	2011-=
10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/managem=
ent/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/management/po=
m.xml	2011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/management/po=
m.xml	2011-10-08 20:54:48 UTC (rev 15060)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/pom.xml	2011-=
10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/dist/pom.xml	2011-=
10-08 20:54:48 UTC (rev 15060)
@@ -5,12 +5,12 @@
   <name>JBoss Web Services - Stack Native Distribution</name>
   <artifactId>jbossws-native-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta2</version>
 =

   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/endorsed/pom=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/endorsed/pom.xml	2=
011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/endorsed/pom.xml	2=
011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/resources/po=
m.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/resources/pom.xml	=
2011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/resources/pom.xml	=
2011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/services/pom=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/services/pom.xml	2=
011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/services/pom.xml	2=
011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/na=
tive-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/native-t=
ests/pom.xml	2011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/native-t=
ests/pom.xml	2011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/po=
m.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/pom.xml	=
2011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/pom.xml	=
2011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/sh=
ared-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/shared-t=
ests/pom.xml	2011-10-08 20:45:51 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/modules/testsuite/shared-t=
ests/pom.xml	2011-10-08 20:54:48 UTC (rev 15060)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/tags/jbossws-native-4.0.0.Beta2/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/tags/jbossws-native-4.0.0.Beta2/pom.xml	2011-10-08 20:45:5=
1 UTC (rev 15059)
+++ stack/native/tags/jbossws-native-4.0.0.Beta2/pom.xml	2011-10-08 20:54:4=
8 UTC (rev 15060)
@@ -18,20 +18,20 @@
   <packaging>pom</packaging>
   <description>JBossWS Native stack</description>
 =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta2</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/trunk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/tags/jbossws-native-4.0.0.Beta2</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/tags/jbossws-native-4.0.0.Beta2</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossw=
s-native-4.0.0.Beta2</url>
   </scm>
 =

   <!-- Modules -->
@@ -45,13 +45,13 @@
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
-    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
+    <jbossws.spi.version>2.0.0.Beta10</jbossws.spi.version>
+    <jbossws.common.version>2.0.0.Beta10</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
+    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
-    <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
+    <jbossws.jboss700.version>4.0.0.Beta1</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
     <ant.version>1.7.1</ant.version>
     <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>


--===============0018091455211657351==--

From jbossws-commits at lists.jboss.org Sat Oct  8 16:59:31 2011
Content-Type: multipart/mixed; boundary="===============5923260132837400135=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15061 - stack/cxf/tags.
Date: Sat, 08 Oct 2011 16:59:31 -0400
Message-ID: <201110082059.p98KxVtP021356@svn01.web.mwc.hst.phx2.redhat.com>

--===============5923260132837400135==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 16:59:31 -0400 (Sat, 08 Oct 2011)
New Revision: 15061

Added:
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/
Log:
Tagging jbossws-cxf-4.0.0.Beta5



--===============5923260132837400135==--

From jbossws-commits at lists.jboss.org Sat Oct  8 19:59:21 2011
Content-Type: multipart/mixed; boundary="===============8295462028474625474=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15062 - in
 stack/cxf/tags/jbossws-cxf-4.0.0.Beta5: modules/addons and 11 other
 directories.
Date: Sat, 08 Oct 2011 19:59:21 -0400
Message-ID: <201110082359.p98NxLHm021725@svn01.web.mwc.hst.phx2.redhat.com>

--===============8295462028474625474==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 19:59:21 -0400 (Sat, 08 Oct 2011)
New Revision: 15062

Modified:
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/transports/http/ht=
tpserver/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/client/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/management/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/endorsed/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/resources/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/server/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-spring-test=
s/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-tests/pom.x=
ml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/shared-tests/po=
m.xml
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/pom.xml
Log:
Fixing poms


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/pom.xml	2011-10-0=
8 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/pom.xml	2011-10-0=
8 23:59:21 UTC (rev 15062)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/transports/=
http/httpserver/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/transports/http/h=
ttpserver/pom.xml	2011-10-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/addons/transports/http/h=
ttpserver/pom.xml	2011-10-08 23:59:21 UTC (rev 15062)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-addons</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/client/pom.xml	2011-10-0=
8 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/client/pom.xml	2011-10-0=
8 23:59:21 UTC (rev 15062)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/management/po=
m.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/management/pom.xml	=
2011-10-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/management/pom.xml	=
2011-10-08 23:59:21 UTC (rev 15062)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <!-- Build -->

Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/pom.xml	2011-10-08 =
20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/dist/pom.xml	2011-10-08 =
23:59:21 UTC (rev 15062)
@@ -4,12 +4,12 @@
   <name>JBoss Web Services - Stack CXF Distrubiton</name>
   <artifactId>jbossws-cxf-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta5</version>
   =

   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/endorsed/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/endorsed/pom.xml	2011-10=
-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/endorsed/pom.xml	2011-10=
-08 23:59:21 UTC (rev 15062)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/resources/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/resources/pom.xml	2011-1=
0-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/resources/pom.xml	2011-1=
0-08 23:59:21 UTC (rev 15062)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/server/pom.xml	2011-10-0=
8 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/server/pom.xml	2011-10-0=
8 23:59:21 UTC (rev 15062)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-spri=
ng-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-spring-tes=
ts/pom.xml	2011-10-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-spring-tes=
ts/pom.xml	2011-10-08 23:59:21 UTC (rev 15062)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-test=
s/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-tests/pom.=
xml	2011-10-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/cxf-tests/pom.=
xml	2011-10-08 23:59:21 UTC (rev 15062)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml	2011-1=
0-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml	2011-1=
0-08 23:59:21 UTC (rev 15062)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/shared-t=
ests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/shared-tests/p=
om.xml	2011-10-08 20:59:31 UTC (rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/shared-tests/p=
om.xml	2011-10-08 23:59:21 UTC (rev 15062)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta5</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/pom.xml	2011-10-08 20:59:31 UTC =
(rev 15061)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/pom.xml	2011-10-08 23:59:21 UTC =
(rev 15062)
@@ -19,20 +19,20 @@
   <description>JBossWS CXF stack</description>
 =

   =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta5</version>
   =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
   =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
runk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
ags/jbossws-cxf-4.0.0.Beta5</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/tags/jbossws-cxf-4.0.0.Beta5</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-c=
xf-4.0.0.Beta5</url>
   </scm>
   =

   <!-- Modules -->
@@ -46,15 +46,15 @@
   =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
-    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
+    <jbossws.spi.version>2.0.0.Beta10</jbossws.spi.version>
+    <jbossws.common.version>2.0.0.Beta10</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
+    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
-    <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
+    <jbossws.jboss700.version>4.0.0.Beta1</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
-    <cxf.version>2.4.3-SNAPSHOT</cxf.version>
+    <cxf.version>2.4.2</cxf.version>
     <cxf.asm.version>3.3</cxf.asm.version>
     <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
     <fastinfoset.api.version>1.2.7</fastinfoset.api.version>


--===============8295462028474625474==--

From jbossws-commits at lists.jboss.org Sat Oct  8 20:17:02 2011
Content-Type: multipart/mixed; boundary="===============5237532520168833201=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15063 -
 stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite.
Date: Sat, 08 Oct 2011 20:17:02 -0400
Message-ID: <201110090017.p990H28s029326@svn01.web.mwc.hst.phx2.redhat.com>

--===============5237532520168833201==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-08 20:17:02 -0400 (Sat, 08 Oct 2011)
New Revision: 15063

Modified:
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
Log:
Fixing native core version from 710 in testsuite classpath


Modified: stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml	2011-1=
0-08 23:59:21 UTC (rev 15062)
+++ stack/cxf/tags/jbossws-cxf-4.0.0.Beta5/modules/testsuite/pom.xml	2011-1=
0-09 00:17:02 UTC (rev 15063)
@@ -1237,7 +1237,7 @@
               <additionalClasspathElements>
                 <!-- Lib below required just for jaxrpc tests; listed here=
 to prevent CXF stack from depending on Native stack -->
                 <!-- JBossWS Native Core version available on 710 -->
-                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar=
</additionalClasspathElement>
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</a=
dditionalClasspathElement>
                 <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
                 <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
               </additionalClasspathElements>


--===============5237532520168833201==--

From jbossws-commits at lists.jboss.org Mon Oct 10 09:10:47 2011
Content-Type: multipart/mixed; boundary="===============6050970920589332430=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15064 -
 spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
Date: Mon, 10 Oct 2011 09:10:47 -0400
Message-ID: <201110101310.p9ADAliF013123@svn01.web.mwc.hst.phx2.redhat.com>

--===============6050970920589332430==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-10 09:10:46 -0400 (Mon, 10 Oct 2011)
New Revision: 15064

Added:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.ja=
va
Log:
adding Reference abstraction

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProv=
ider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.j=
ava	2011-10-09 00:17:02 UTC (rev 15063)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/InstanceProvider.j=
ava	2011-10-10 13:10:46 UTC (rev 15064)
@@ -30,6 +30,6 @@
 public interface InstanceProvider
 {
 =

-    Object getInstance(String className);
+    Reference getInstance(String className);
     =

 }

Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java	   =
                     (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java	201=
1-10-10 13:10:46 UTC (rev 15064)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.spi.deployment;
+
+/**
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public interface Reference {
+
+    Object getValue();
+
+    boolean isInitialized();
+
+}


--===============6050970920589332430==--

From jbossws-commits at lists.jboss.org Mon Oct 10 09:14:02 2011
Content-Type: multipart/mixed; boundary="===============7853364528899200334=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15065 - in
 common/trunk/src/main/java/org/jboss/ws/common: invocation and 1 other
 directory.
Date: Mon, 10 Oct 2011 09:14:02 -0400
Message-ID: <201110101314.p9ADE2FD013200@svn01.web.mwc.hst.phx2.redhat.com>

--===============7853364528899200334==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-10 09:14:02 -0400 (Mon, 10 Oct 2011)
New Revision: 15065

Added:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFacto=
ry.java
Modified:
   common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHand=
lerJAXWS.java
Log:
adding Reference abstraction

Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceF=
actory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFact=
ory.java	                        (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFact=
ory.java	2011-10-10 13:14:02 UTC (rev 15065)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.ws.common.deployment;
+
+import org.jboss.wsf.spi.deployment.Reference;
+
+/**
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class ReferenceFactory {
+
+    private ReferenceFactory() {
+        // forbidden instantiation
+    }
+
+    public static Reference newInitializedReference(final Reference refere=
nce) {
+        if (reference =3D=3D null) throw new IllegalArgumentException();
+        return newInitializedReference(reference.getValue());
+    }
+
+    public static Reference newInitializedReference(final Object reference=
) {
+        if (reference =3D=3D null) throw new IllegalArgumentException();
+        return newReference(reference, true);
+    }
+
+    public static Reference newUninitializedReference(final Reference refe=
rence) {
+        if (reference =3D=3D null) throw new IllegalArgumentException();
+        return newUninitializedReference(reference.getValue());
+    }
+
+    public static Reference newUninitializedReference(final Object referen=
ce) {
+        if (reference =3D=3D null) throw new IllegalArgumentException();
+        return newReference(reference, false);
+    }
+
+    private static Reference newReference(final Object reference, final bo=
olean initialized) {
+        return new ReferenceImpl(reference, initialized);
+    }
+
+    private static final class ReferenceImpl implements Reference {
+
+        private final Object reference;
+        private final boolean initialized;
+        =

+        private ReferenceImpl(final Object reference, final boolean initia=
lized) {
+            this.reference =3D reference;
+            this.initialized =3D initialized;
+        }
+
+        @Override
+        public Object getValue() {
+            return reference;
+        }
+
+        @Override
+        public boolean isInitialized() {
+            return initialized;
+        }
+
+    }
+
+}

Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/Invocat=
ionHandlerJAXWS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-10 13:10:46 UTC (rev 15064)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-10 13:14:02 UTC (rev 15065)
@@ -27,6 +27,7 @@
 import org.jboss.ws.common.injection.PreDestroyHolder;
 import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Reference;
 import org.jboss.wsf.spi.invocation.Invocation;
 import org.jboss.wsf.spi.invocation.InvocationContext;
 import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
@@ -61,16 +62,22 @@
       final InjectionsMetaData injectionsMD =3D endpoint.getAttachment(Inj=
ectionsMetaData.class);
       final Object _targetBean =3D this.getTargetBean(invocation);
       // TODO: refactor injection to AS IL
-      final Object targetBean =3D endpoint.getInstanceProvider().getInstan=
ce(_targetBean.getClass().getName());
+      final Reference reference =3D endpoint.getInstanceProvider().getInst=
ance(_targetBean.getClass().getName());
+      final Object targetBean =3D reference.getValue();
 =

-      this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targe=
tBean);
-      if (injectionsMD !=3D null)
+      if (!reference.isInitialized() && injectionsMD !=3D null)
+      {
+         this.log.debug("Injecting resources on JAXWS JSE endpoint: " + ta=
rgetBean);
          InjectionHelper.injectResources(targetBean, injectionsMD, endpoin=
t.getJNDIContext());
+      }
 =

-      InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAware=
WebServiceContext.getInstance());
+      if (!reference.isInitialized())
+      {
+         InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAw=
areWebServiceContext.getInstance());
 =

-      this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: =
" + targetBean);
-      InjectionHelper.callPostConstructMethod(targetBean);
+         this.log.debug("Calling postConstruct method on JAXWS JSE endpoin=
t: " + targetBean);
+         InjectionHelper.callPostConstructMethod(targetBean);
+      }
 =

       endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(=
targetBean));
    }


--===============7853364528899200334==--

From jbossws-commits at lists.jboss.org Mon Oct 10 10:19:58 2011
Content-Type: multipart/mixed; boundary="===============2587644717471638575=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15066 - in
 stack/native/trunk/modules/core/src/main/java/org/jboss:
 ws/core/jaxws/handler and 2 other directories.
Date: Mon, 10 Oct 2011 10:19:58 -0400
Message-ID: <201110101419.p9AEJwn7024663@svn01.web.mwc.hst.phx2.redhat.com>

--===============2587644717471638575==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-10 10:19:58 -0400 (Mon, 10 Oct 2011)
New Revision: 15066

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/h=
andler/HandlerChainBaseImpl.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/ha=
ndler/HandlerResolverImpl.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/S=
erviceEndpointInvoker.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/N=
ativeInstanceProvider.java
Log:
switch to Reference instead of Object

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axrpc/handler/HandlerChainBaseImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/=
handler/HandlerChainBaseImpl.java	2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/=
handler/HandlerChainBaseImpl.java	2011-10-10 14:19:58 UTC (rev 15066)
@@ -159,7 +159,7 @@
        final Handler handler;
        if (ep !=3D null)
        {
-           handler =3D (Handler)ep.getInstanceProvider().getInstance(info.=
getHandlerClass().getName());
+           handler =3D (Handler)ep.getInstanceProvider().getInstance(info.=
getHandlerClass().getName()).getValue();
        }
        else
        {

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axws/handler/HandlerResolverImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-10 14:19:58 UTC (rev 15066)
@@ -50,6 +50,7 @@
 import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
 import org.jboss.ws.metadata.umdm.ServiceMetaData;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Reference;
 import org.jboss.wsf.spi.invocation.EndpointAssociation;
 import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.H=
andlerType;
@@ -168,7 +169,7 @@
       try
       {
          // Load the handler class using the deployments top level CL
-         Handler<?> handler =3D getInstance(classLoader, className);
+         Handler<?> handler =3D getInstance(classLoader, className, inject=
ions);
 =

          if (handler instanceof GenericHandler)
             ((GenericHandler)handler).setHandlerName(handlerName);
@@ -176,14 +177,6 @@
          if (handler instanceof GenericSOAPHandler)
             ((GenericSOAPHandler<?>)handler).setHeaders(soapHeaders);
 =

-         if (injections !=3D null)
-         {
-            Endpoint ep =3D EndpointAssociation.getEndpoint();
-            Context ctx =3D ep =3D=3D null ? null : ep.getJNDIContext();
-            InjectionHelper.injectResources(handler, injections, ctx);
-         }
-         InjectionHelper.callPostConstructMethod(handler);
-
          addHandler(jaxwsMetaData, handler, type);
       }
       catch (RuntimeException rte)
@@ -196,18 +189,26 @@
       }
    }
 =

-   private Handler<?> getInstance(final ClassLoader fallbackLoader, final =
String className) throws Exception
+   private Handler<?> getInstance(final ClassLoader fallbackLoader, final =
String className, InjectionsMetaData injections) throws Exception
    {
        final Endpoint ep =3D EndpointAssociation.getEndpoint();
        final Handler<?> handler;
        if (ep !=3D null)
        {
-           handler =3D (Handler<?>)ep.getInstanceProvider().getInstance(cl=
assName);
+           final Reference handlerReference =3D ep.getInstanceProvider().g=
etInstance(className); =

+           handler =3D (Handler<?>)handlerReference.getValue();
+           if (!handlerReference.isInitialized() && injections !=3D null)
+           {
+              Context ctx =3D ep =3D=3D null ? null : ep.getJNDIContext();
+              InjectionHelper.injectResources(handler, injections, ctx);
+              InjectionHelper.callPostConstructMethod(handler);
+           }
        }
        else
        {
            final Class<?> hClass =3D fallbackLoader.loadClass(className);
            handler =3D (Handler<?>)hClass.newInstance();
+           InjectionHelper.callPostConstructMethod(handler);
        }
        return handler;
    }

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/s=
erver/ServiceEndpointInvoker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/=
ServiceEndpointInvoker.java	2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/=
ServiceEndpointInvoker.java	2011-10-10 14:19:58 UTC (rev 15066)
@@ -371,7 +371,7 @@
             {
                // create endpoint instance
                final Class<?> endpointImplClass =3D endpoint.getTargetBean=
Class();
-               endpointImpl =3D endpoint.getInstanceProvider().getInstance=
(endpointImplClass.getName());
+               endpointImpl =3D endpoint.getInstanceProvider().getInstance=
(endpointImplClass.getName()).getValue();
                endpoint.addAttachment(Object.class, endpointImpl);
             }
             catch (Exception ex)

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack=
/jbws/NativeInstanceProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProvider.java	2011-10-10 13:14:02 UTC (rev 15065)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeInstanceProvider.java	2011-10-10 14:19:58 UTC (rev 15066)
@@ -28,7 +28,9 @@
 =

 import org.jboss.ws.WSException;
 import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.deployment.ReferenceFactory;
 import org.jboss.wsf.spi.deployment.InstanceProvider;
+import org.jboss.wsf.spi.deployment.Reference;
 =

 /**
  * Native instance provider.
@@ -39,18 +41,18 @@
 =

     private static final ResourceBundle bundle =3D BundleUtils.getBundle(N=
ativeInstanceProvider.class);
     private final ClassLoader loader;
-    private final Map<String, Object> cache =3D new HashMap<String, Object=
>();
+    private final Map<String, Reference> cache =3D new HashMap<String, Ref=
erence>();
 =

     NativeInstanceProvider(final ClassLoader loader)
     {
         this.loader =3D loader;
     }
 =

-    public synchronized Object getInstance(final String className) {
-        Object instance =3D cache.get(className);
+    public synchronized Reference getInstance(final String className) {
+        Reference instance =3D cache.get(className);
         if (instance =3D=3D null) {
             try {
-                instance =3D loader.loadClass(className).newInstance();
+                instance =3D ReferenceFactory.newUninitializedReference(lo=
ader.loadClass(className).newInstance());
                 cache.put(className, instance);
             } catch (Exception e) {
                 throw new WSException(BundleUtils.getMessage(bundle, "CANN=
OT_LOAD_CLASS",  className),  e);


--===============2587644717471638575==--

From jbossws-commits at lists.jboss.org Mon Oct 10 10:23:56 2011
Content-Type: multipart/mixed; boundary="===============8162054075848308414=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15067 - in
 stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf:
 transport and 1 other directory.
Date: Mon, 10 Oct 2011 10:23:55 -0400
Message-ID: <201110101423.p9AENtH6025133@svn01.web.mwc.hst.phx2.redhat.com>

--===============8162054075848308414==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-10 10:23:55 -0400 (Mon, 10 Oct 2011)
New Revision: 15067

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXF=
InstanceProvider.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tra=
nsport/ServletHelper.java
Log:
switch to Reference instead of Object

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/CXFInstanceProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CX=
FInstanceProvider.java	2011-10-10 14:19:58 UTC (rev 15066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CX=
FInstanceProvider.java	2011-10-10 14:23:55 UTC (rev 15067)
@@ -32,7 +32,9 @@
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
 import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.ws.common.deployment.ReferenceFactory;
 import org.jboss.wsf.spi.deployment.InstanceProvider;
+import org.jboss.wsf.spi.deployment.Reference;
 =

 /**
  * CXF instance provider.
@@ -43,18 +45,18 @@
 =

     private static final ResourceBundle bundle =3D BundleUtils.getBundle(C=
XFInstanceProvider.class);
     private final ServerFactoryBean factory;
-    private final Map<String, Object> cache =3D new HashMap<String, Object=
>();
+    private final Map<String, Reference> cache =3D new HashMap<String, Ref=
erence>();
 =

     public CXFInstanceProvider(final ServerFactoryBean factory) {
         this.factory =3D factory;
     }
 =

-    public synchronized Object getInstance(final String className) {
-        Object instance =3D cache.get(className);
+    public synchronized Reference getInstance(final String className) {
+        Reference instance =3D cache.get(className);
         if (instance =3D=3D null) {
             final Object serviceBean =3D factory.getServiceBean();
             if (className.equals(factory.getServiceBean().getClass().getNa=
me())) {
-                cache.put(className, instance =3D serviceBean);
+                cache.put(className, instance =3D ReferenceFactory.newUnin=
itializedReference(serviceBean));
             }
             if (instance =3D=3D null)
             {
@@ -62,7 +64,7 @@
                 if (chain !=3D null) {
                     for (Handler handler : chain) {
                         if (className.equals(handler.getClass().getName())=
) {
-                            cache.put(className, instance =3D handler);
+                            cache.put(className, instance =3D ReferenceFac=
tory.newUninitializedReference(handler));
                         }
                     }
                 }

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/transport/ServletHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-10 14:19:58 UTC (rev 15066)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-10 14:23:55 UTC (rev 15067)
@@ -130,7 +130,7 @@
          {
             for (Handler handler : chain)
             {
-               final Object handlerInstance =3D endpoint.getInstanceProvid=
er().getInstance(handler.getClass().getName());
+               final Object handlerInstance =3D endpoint.getInstanceProvid=
er().getInstance(handler.getClass().getName()).getValue();
                InjectionHelper.injectResources(handlerInstance, metadata, =
jndiContext);
                InjectionHelper.callPostConstructMethod(handlerInstance);
             }
@@ -145,7 +145,7 @@
       {
          if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() !=3D=
 null)
          {
-            final Object epInstance =3D endpoint.getInstanceProvider().get=
Instance(factory.getServiceBean().getClass().getName());
+            final Object epInstance =3D endpoint.getInstanceProvider().get=
Instance(factory.getServiceBean().getClass().getName()).getValue();
             InjectionHelper.callPreDestroyMethod(epInstance);
          }
       }


--===============8162054075848308414==--

From jbossws-commits at lists.jboss.org Tue Oct 11 02:50:42 2011
Content-Type: multipart/mixed; boundary="===============4267576712173818950=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15068 - in
 spi/trunk/src/main/java/org/jboss/wsf/spi: deployment and 1 other directory.
Date: Tue, 11 Oct 2011 02:50:41 -0400
Message-ID: <201110110650.p9B6ofqp008439@svn01.web.mwc.hst.phx2.redhat.com>

--===============4267576712173818950==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 02:50:41 -0400 (Tue, 11 Oct 2011)
New Revision: 15068

Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvid=
er.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFact=
ory.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java
Log:
[JBWS-3366] Merging changes from 2.0.0.Beta10 tag
- Adding jaxrpc integration classloader retrieval method in ClassLoaderProv=
ider
- Adding flag for deployment/classloader type in ServletDelegateFactory



Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoade=
rProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvi=
der.java	2011-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvi=
der.java	2011-10-11 06:50:41 UTC (rev 15068)
@@ -46,6 +46,12 @@
       {
          return getContextClassLoader();
       }
+
+      @Override
+      public ClassLoader getServerJAXRPCIntegrationClassLoader()
+      {
+         return getContextClassLoader();
+      }
    };
 =

    public static void setDefaultProvider(ClassLoaderProvider p)
@@ -66,12 +72,19 @@
    public abstract ClassLoader getWebServiceSubsystemClassLoader();
 =

    /**
-    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries
+    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries (for JAXWS usage)
     * =

     * @return
     */
    public abstract ClassLoader getServerIntegrationClassLoader();
 =

+   /**
+    * Return the ClassLoader instance having visibility over the all serve=
r side ws libraries (for JAXRPC usage)
+    * =

+    * @return
+    */
+   public abstract ClassLoader getServerJAXRPCIntegrationClassLoader();
+
    static ClassLoader getContextClassLoader()
    {
       if (System.getSecurityManager() =3D=3D null)

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDeleg=
ateFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFac=
tory.java	2011-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFac=
tory.java	2011-10-11 06:50:41 UTC (rev 15068)
@@ -30,5 +30,5 @@
  */
 public interface ServletDelegateFactory
 {
-   public ServletDelegate newServletDelegate(String delegateClassName);
+   public ServletDelegate newServletDelegate(String delegateClassName, boo=
lean isJaxWs);
 }

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.j=
ava
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java	20=
11-10-10 14:23:55 UTC (rev 15067)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java	20=
11-10-11 06:50:41 UTC (rev 15068)
@@ -43,6 +43,7 @@
 public class WSFServlet extends HttpServlet
 {
    public static final String STACK_SERVLET_DELEGATE_CLASS =3D "org.jboss.=
wsf.spi.deployment.stackServletDelegateClass";
+   public static final String INTEGRATION_CLASSLOADER =3D "org.jboss.wsf.s=
pi.deployment.integrationClassLoader";
 =

    private ServletDelegate delegate =3D null;
 =

@@ -73,7 +74,8 @@
       ClassLoader cl =3D clProvider.getWebServiceSubsystemClassLoader();
       ServiceLoader<ServletDelegateFactory> sl =3D ServiceLoader.load(Serv=
letDelegateFactory.class, cl);
       ServletDelegateFactory factory =3D sl.iterator().next();
-      return factory.newServletDelegate(servletConfig.getInitParameter(STA=
CK_SERVLET_DELEGATE_CLASS));
+      boolean isJaxWs =3D DeploymentType.JAXWS.toString().equals(servletCo=
nfig.getInitParameter(INTEGRATION_CLASSLOADER));
+      return factory.newServletDelegate(servletConfig.getInitParameter(STA=
CK_SERVLET_DELEGATE_CLASS), isJaxWs);
    }
    =

    @Override


--===============4267576712173818950==--

From jbossws-commits at lists.jboss.org Tue Oct 11 02:58:57 2011
Content-Type: multipart/mixed; boundary="===============1128527121776184042=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15069 - in
 container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices:
 util and 1 other directory.
Date: Tue, 11 Oct 2011 02:58:57 -0400
Message-ID: <201110110658.p9B6wvWx008877@svn01.web.mwc.hst.phx2.redhat.com>

--===============1128527121776184042==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 02:58:56 -0400 (Tue, 11 Oct 2011)
New Revision: 15069

Modified:
   container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/w=
ebservices/tomcat/ServletDelegateFactoryImpl.java
   container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/w=
ebservices/util/ModuleClassLoaderProvider.java
Log:
[JBWS-3366] Merging changes from 4.0.0.Beta1 tag:
- updating to latest spi


Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jbo=
ss/as/webservices/tomcat/ServletDelegateFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/tomcat/ServletDelegateFactoryImpl.java	2011-10-11 06:50:41 UTC =
(rev 15068)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/tomcat/ServletDelegateFactoryImpl.java	2011-10-11 06:58:56 UTC =
(rev 15069)
@@ -36,7 +36,7 @@
 public class ServletDelegateFactoryImpl implements ServletDelegateFactory {
 =

     @Override
-    public ServletDelegate newServletDelegate(String servletClassName) {
+    public ServletDelegate newServletDelegate(String servletClassName, boo=
lean isJaxWs) {
         try {
             ClassLoader classLoader =3D ClassLoaderProvider.getDefaultProv=
ider().getServerIntegrationClassLoader();
             Class<?> clazz =3D classLoader.loadClass(servletClassName);

Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jbo=
ss/as/webservices/util/ModuleClassLoaderProvider.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/util/ModuleClassLoaderProvider.java	2011-10-11 06:50:41 UTC (re=
v 15068)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/util/ModuleClassLoaderProvider.java	2011-10-11 06:58:56 UTC (re=
v 15069)
@@ -61,4 +61,10 @@
         ClassLoaderProvider.setDefaultProvider(new ModuleClassLoaderProvid=
er());
     }
 =

+   @Override
+   public ClassLoader getServerJAXRPCIntegrationClassLoader()
+   {
+      throw new RuntimeException("JAXRPC Integration not available on AS 7=
.0.x");
+   }
+
 }


--===============1128527121776184042==--

From jbossws-commits at lists.jboss.org Tue Oct 11 03:09:02 2011
Content-Type: multipart/mixed; boundary="===============5783274905258746832=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15070 - in stack/cxf/trunk:
 modules/resources/src/main/resources/modules/org/jboss/as/webservices/server
 and 6 other directories.
Date: Tue, 11 Oct 2011 03:09:02 -0400
Message-ID: <201110110709.p9B792lD015708@svn01.web.mwc.hst.phx2.redhat.com>

--===============5783274905258746832==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 03:09:02 -0400 (Tue, 11 Oct 2011)
New Revision: 15070

Added:
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/server/jaxrpc-integration/
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/server/jaxrpc-integration/main/
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/server/jaxrpc-integration/main/module.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-=
as7.xml
Removed:
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/server/jaxrpc-integration/main/
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/a=
s/webservices/server/jaxrpc-integration/main/module.xml
Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-d=
eploy.conf
   stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/pom.xml
Log:
[JBWS-3366] Merging changes from JBWS-3366 branch:
------------------------------------------------------------------------
r15047 | alessio.soldano(a)jboss.com | 2011-10-07 16:44:44 +0200 (Fri, 07 O=
ct 2011) | 2 lines

Adding jaxrpc-integration module

------------------------------------------------------------------------
r15046 | alessio.soldano(a)jboss.com | 2011-10-07 16:43:45 +0200 (Fri, 07 O=
ct 2011) | 2 lines

Fixing list of modules do undeploy

------------------------------------------------------------------------
r15044 | alessio.soldano(a)jboss.com | 2011-10-07 10:45:33 +0200 (Fri, 07 O=
ct 2011) | 3 lines

- Adding jaxrpc deployment aspects
- Fixing testsuite classpath / dependencies and enabling few jaxrpc tests (=
DII only)

------------------------------------------------------------------------


Deleted: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/j=
boss/as/webservices/server/jaxrpc-integration/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/modul=
es/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml	2011-=
10-07 14:44:44 UTC (rev 15047)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
as/webservices/server/jaxrpc-integration/main/module.xml	2011-10-11 07:09:0=
2 UTC (rev 15070)
@@ -1,56 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., 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.
-  -->
-
-<module xmlns=3D"urn:jboss:module:1.0" name=3D"org.jboss.as.webservices.se=
rver.jaxrpc-integration">
-
-    <resources>
-    </resources>
-
-    <dependencies>
-        <module name=3D"javax.api" export=3D"true"/>
-        <module name=3D"javax.xml.rpc.api" export=3D"true"/>
-        <module name=3D"javax.wsdl4j.api" export=3D"true"/>
-        <module name=3D"com.sun.xml.bind" services=3D"export" export=3D"tr=
ue"/>
-        <module name=3D"org.jboss.ws.api" export=3D"true"/>
-        <module name=3D"org.jboss.ws.spi" export=3D"true"/>
-        <module name=3D"org.jboss.ws.common" services=3D"import" export=3D=
"true"/>
-        <module name=3D"org.jboss.ws.native.jbossws-native-factories" serv=
ices=3D"export" export=3D"true"/>
-        <module name=3D"org.jboss.ws.native.jbossws-native-core" services=
=3D"export" export=3D"true">
-          <imports>
-            <include path=3D"META-INF"/>
-            <include path=3D"dtd"/>
-            <include path=3D"schema"/>
-          </imports>
-          <exports>
-            <include path=3D"META-INF"/>
-            <include path=3D"dtd"/>
-            <include path=3D"schema"/>
-          </exports>
-        </module>
-        <module name=3D"org.jboss.ws.native.jbossws-native-services" servi=
ces=3D"export" export=3D"true"/>
-        <module name=3D"org.apache.xalan" services=3D"export" export=3D"tr=
ue"/>
-        <module name=3D"org.apache.xerces" services=3D"export" export=3D"t=
rue"/>
-        <module name=3D"org.jboss.as.webservices" services=3D"export" expo=
rt=3D"true"/>
-    </dependencies>
-</module>

Copied: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jb=
oss/as/webservices/server/jaxrpc-integration/main/module.xml (from rev 1504=
7, stack/cxf/branches/JBWS-3366/modules/resources/src/main/resources/module=
s/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
as/webservices/server/jaxrpc-integration/main/module.xml	                  =
      (rev 0)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
as/webservices/server/jaxrpc-integration/main/module.xml	2011-10-11 07:09:0=
2 UTC (rev 15070)
@@ -0,0 +1,56 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., 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.
+  -->
+
+<module xmlns=3D"urn:jboss:module:1.0" name=3D"org.jboss.as.webservices.se=
rver.jaxrpc-integration">
+
+    <resources>
+    </resources>
+
+    <dependencies>
+        <module name=3D"javax.api" export=3D"true"/>
+        <module name=3D"javax.xml.rpc.api" export=3D"true"/>
+        <module name=3D"javax.wsdl4j.api" export=3D"true"/>
+        <module name=3D"com.sun.xml.bind" services=3D"export" export=3D"tr=
ue"/>
+        <module name=3D"org.jboss.ws.api" export=3D"true"/>
+        <module name=3D"org.jboss.ws.spi" export=3D"true"/>
+        <module name=3D"org.jboss.ws.common" services=3D"import" export=3D=
"true"/>
+        <module name=3D"org.jboss.ws.native.jbossws-native-factories" serv=
ices=3D"export" export=3D"true"/>
+        <module name=3D"org.jboss.ws.native.jbossws-native-core" services=
=3D"export" export=3D"true">
+          <imports>
+            <include path=3D"META-INF"/>
+            <include path=3D"dtd"/>
+            <include path=3D"schema"/>
+          </imports>
+          <exports>
+            <include path=3D"META-INF"/>
+            <include path=3D"dtd"/>
+            <include path=3D"schema"/>
+          </exports>
+        </module>
+        <module name=3D"org.jboss.ws.native.jbossws-native-services" servi=
ces=3D"export" export=3D"true"/>
+        <module name=3D"org.apache.xalan" services=3D"export" export=3D"tr=
ue"/>
+        <module name=3D"org.apache.xerces" services=3D"export" export=3D"t=
rue"/>
+        <module name=3D"org.jboss.as.webservices" services=3D"export" expo=
rt=3D"true"/>
+    </dependencies>
+</module>

Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/mo=
dules-deploy.conf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-=
deploy.conf	2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-=
deploy.conf	2011-10-11 07:09:02 UTC (rev 15070)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/*=
*, org/jboss/ws/cxf/**, org/jboss/ws/**, org/springframework/spring/**
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/*=
*, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jb=
oss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org=
/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/spr=
ingframework/spring/**
\ No newline at end of file

Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-co=
nfig-as7.xml (from rev 15047, stack/cxf/branches/JBWS-3366/modules/server/s=
rc/main/resources/jbossws-jaxrpc-config-as7.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config=
-as7.xml	                        (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config=
-as7.xml	2011-10-11 07:09:02 UTC (rev 15070)
@@ -0,0 +1,76 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., 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.
+  -->
+
+<deploymentAspects xmlns=3D"urn:jboss:ws:deployment:aspects:1.0">
+  =

+  <deploymentAspect class=3D"org.jboss.ws.common.deployment.ContextPropert=
iesDeploymentAspect">
+    <property name=3D"provides" class=3D"java.lang.String">ContextProperti=
es, StackDescriptor</property>
+    <property name=3D"contextProperties" class=3D"java.util.HashMap">
+      <map keyClass=3D"java.lang.String" valueClass=3D"java.lang.String">
+        <entry>
+          <key>stack.transport.class</key>
+          <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
+        </entry>
+      </map>
+    </property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.EagerInitializeDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"provides" class=3D"java.lang.String">InitializedMeta=
DataModel</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.ws.common.deployment.EndpointHandle=
rDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackEndpointHa=
ndler</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.NativeInstanceProvid=
erDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta</property>
+    <property name=3D"provides" class=3D"java.lang.String">StackInstancePr=
ovider</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.PublishContractDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model, JAXBIntros</property>
+    <property name=3D"provides" class=3D"java.lang.String">PublishedContra=
ct</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.ServiceEndpointInvok=
erDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.wsf.stack.jbws.UnifiedMetaDataDeplo=
ymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">ContainerMetaDa=
ta, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
+    <property name=3D"provides" class=3D"java.lang.String">UnifiedMetaData=
Model</property>
+    <property name=3D"forJaxWs" class=3D"boolean">false</property>
+  </deploymentAspect>
+
+</deploymentAspects>
+

Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-conf=
ig.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml=
	2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml=
	2011-10-11 07:09:02 UTC (rev 15070)
@@ -41,9 +41,18 @@
       tofile=3D"${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-=
specific-deployment-aspects.xml"
     />
     <copy
+      file=3D"${src.dir}/jbossws-jaxrpc-config-as7.xml"
+      tofile=3D"${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/jaxrpc=
-deployment-aspects.xml"
+    />
+  	=

+    <copy
       file=3D"${src.dir}/jbossws-cxf-config-as7.xml"
       tofile=3D"${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-=
specific-deployment-aspects.xml"
     />
+    <copy
+      file=3D"${src.dir}/jbossws-jaxrpc-config-as7.xml"
+      tofile=3D"${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc=
-deployment-aspects.xml"
+    />
 =

   </target>
 =


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-11 06:58:56 UTC (rev =
15069)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-11 07:09:02 UTC (rev =
15070)
@@ -1151,6 +1151,57 @@
               </exclusion>
           </exclusions>
         </dependency>
+        <dependency>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+          <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>xml-apis</groupId>
+                  <artifactId>xml-apis</artifactId>
+              </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss</groupId>
+          <artifactId>jbossxb</artifactId>
+          <version>${jboss.xb.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>apache-xerces</groupId>
+              <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>apache-xerces</groupId>
+              <artifactId>xercesImpl</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>jboss</groupId>
+              <artifactId>jboss-common-core</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-spi</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.logging</groupId>
+              <artifactId>jboss-logging-log4j</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>sun-jaxb</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>xml-apis</groupId>
+              <artifactId>xml-apis</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>wutka-dtdparser</groupId>
+               <artifactId>dtdparser121</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -1167,8 +1218,6 @@
                 <phase>test-compile</phase>
                 <configuration>
                   <testExcludes>
-                    <!-- AS7 compilation excludes -->
-                    <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
                     <!-- EJB3 client API dependencies -->
                     <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
                     <exclude>org/jboss/test/ws/jaxws/samples/webserviceref=
/**</exclude>
@@ -1186,8 +1235,11 @@
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${project.build.directory}/endorsed</argLine>
               <!-- TODO: replace with maven dependencies -->
               <additionalClasspathElements>
-                 <!-- Lib below required just for jaxrpc tests; listed her=
e to prevent CXF stack from depending on Native stack -->
-                <additionalClasspathElement>${jboss.home}/common/lib/jboss=
ws-native-core.jar</additionalClasspathElement>
+                <!-- Lib below required just for jaxrpc tests; listed here=
 to prevent CXF stack from depending on Native stack -->
+                <!-- JBossWS Native Core version available on 710 -->
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar=
</additionalClasspathElement>
+                <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
               </additionalClasspathElements>
               <excludes>
                  <!--# UsernameTestCase requires trustore in jboss-web tom=
cat configuration-->
@@ -1249,7 +1301,6 @@
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>
 =

                  <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
-                 <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</e=
xclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
@@ -1275,6 +1326,20 @@
 =

                  <!-- JAXR not available -->
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+                 =

+                 <!-- appclient not available for JAXRPC clients -->
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</ex=
clude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exc=
lude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</=
exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/message/**</exc=
lude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclud=
e>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/**</excl=
ude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/**</ex=
clude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</=
exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
 =

                  <!-- Former JMS endpoint functionalities replaced by SOAP=
-over-JMS on AS7 -->
                  <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/=
**</exclude>

Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-11 06:58:56 UTC (rev 15069)
+++ stack/cxf/trunk/pom.xml	2011-10-11 07:09:02 UTC (rev 15070)
@@ -62,7 +62,7 @@
     <jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
     <jboss.security.spi.version>2.0.4.SP4</jboss.security.spi.version>
     <jboss.security.sx.version>2.0.4</jboss.security.sx.version>
-    <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
+    <jboss.xb.version>2.0.3.GA</jboss.xb.version>
     <picketbox.version>3.0.0.Beta5</picketbox.version>
     <jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserv=
er-httpspi.version>
     <httpserver.version>1.0.0.Beta1</httpserver.version>


--===============5783274905258746832==--

From jbossws-commits at lists.jboss.org Tue Oct 11 03:11:06 2011
Content-Type: multipart/mixed; boundary="===============8776498483159780180=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15071 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 11 Oct 2011 03:11:06 -0400
Message-ID: <201110110711.p9B7B6kV016136@svn01.web.mwc.hst.phx2.redhat.com>

--===============8776498483159780180==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-11 03:11:06 -0400 (Tue, 11 Oct 2011)
New Revision: 15071

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3366] Fixing native core version from 710 in testsuite classpath


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-11 07:09:02 UTC (rev =
15070)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-11 07:11:06 UTC (rev =
15071)
@@ -1237,7 +1237,7 @@
               <additionalClasspathElements>
                 <!-- Lib below required just for jaxrpc tests; listed here=
 to prevent CXF stack from depending on Native stack -->
                 <!-- JBossWS Native Core version available on 710 -->
-                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0-SNAPSHOT.jar=
</additionalClasspathElement>
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</a=
dditionalClasspathElement>
                 <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
                 <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
               </additionalClasspathElements>


--===============8776498483159780180==--

From jbossws-commits at lists.jboss.org Tue Oct 11 04:36:04 2011
Content-Type: multipart/mixed; boundary="===============8336136180938267490=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15072 -
 spi/trunk/src/main/java/org/jboss/wsf/spi/deployment.
Date: Tue, 11 Oct 2011 04:36:03 -0400
Message-ID: <201110110836.p9B8a3OA029458@svn01.web.mwc.hst.phx2.redhat.com>

--===============8336136180938267490==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-11 04:36:03 -0400 (Tue, 11 Oct 2011)
New Revision: 15072

Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java
Log:
initialization flag is modifyable

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java	201=
1-10-11 07:11:06 UTC (rev 15071)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Reference.java	201=
1-10-11 08:36:03 UTC (rev 15072)
@@ -31,4 +31,6 @@
 =

     boolean isInitialized();
 =

+    void setInitialized();
+
 }


--===============8336136180938267490==--

From jbossws-commits at lists.jboss.org Tue Oct 11 04:36:52 2011
Content-Type: multipart/mixed; boundary="===============7573137824698776149=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15073 - in
 common/trunk/src/main/java/org/jboss/ws/common: invocation and 1 other
 directory.
Date: Tue, 11 Oct 2011 04:36:52 -0400
Message-ID: <201110110836.p9B8aqmS029470@svn01.web.mwc.hst.phx2.redhat.com>

--===============7573137824698776149==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-11 04:36:52 -0400 (Tue, 11 Oct 2011)
New Revision: 15073

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFacto=
ry.java
   common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHand=
lerJAXWS.java
Log:
initialization flag is modifyable

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Referen=
ceFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFact=
ory.java	2011-10-11 08:36:03 UTC (rev 15072)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ReferenceFact=
ory.java	2011-10-11 08:36:52 UTC (rev 15073)
@@ -60,7 +60,7 @@
     private static final class ReferenceImpl implements Reference {
 =

         private final Object reference;
-        private final boolean initialized;
+        private volatile boolean initialized;
         =

         private ReferenceImpl(final Object reference, final boolean initia=
lized) {
             this.reference =3D reference;
@@ -77,6 +77,11 @@
             return initialized;
         }
 =

+        @Override
+        public void setInitialized() {
+            initialized =3D true;
+        }
+
     }
 =

 }

Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/Invocat=
ionHandlerJAXWS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-11 08:36:03 UTC (rev 15072)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-11 08:36:52 UTC (rev 15073)
@@ -65,20 +65,18 @@
       final Reference reference =3D endpoint.getInstanceProvider().getInst=
ance(_targetBean.getClass().getName());
       final Object targetBean =3D reference.getValue();
 =

-      if (!reference.isInitialized() && injectionsMD !=3D null)
+      if (!reference.isInitialized())
       {
          this.log.debug("Injecting resources on JAXWS JSE endpoint: " + ta=
rgetBean);
          InjectionHelper.injectResources(targetBean, injectionsMD, endpoin=
t.getJNDIContext());
-      }
 =

-      if (!reference.isInitialized())
-      {
-         InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAw=
areWebServiceContext.getInstance());
-
          this.log.debug("Calling postConstruct method on JAXWS JSE endpoin=
t: " + targetBean);
          InjectionHelper.callPostConstructMethod(targetBean);
+         reference.setInitialized();
       }
 =

+      InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAware=
WebServiceContext.getInstance());
+
       endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(=
targetBean));
    }
 =



--===============7573137824698776149==--

From jbossws-commits at lists.jboss.org Tue Oct 11 04:38:46 2011
Content-Type: multipart/mixed; boundary="===============0858984450713532572=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15074 -
 stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler.
Date: Tue, 11 Oct 2011 04:38:45 -0400
Message-ID: <201110110838.p9B8cj1c029495@svn01.web.mwc.hst.phx2.redhat.com>

--===============0858984450713532572==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-11 04:38:45 -0400 (Tue, 11 Oct 2011)
New Revision: 15074

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/ha=
ndler/HandlerResolverImpl.java
Log:
initialization flag is modifyable

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/j=
axws/handler/HandlerResolverImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-11 08:36:52 UTC (rev 15073)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/h=
andler/HandlerResolverImpl.java	2011-10-11 08:38:45 UTC (rev 15074)
@@ -197,11 +197,12 @@
        {
            final Reference handlerReference =3D ep.getInstanceProvider().g=
etInstance(className); =

            handler =3D (Handler<?>)handlerReference.getValue();
-           if (!handlerReference.isInitialized() && injections !=3D null)
+           if (!handlerReference.isInitialized())
            {
-              Context ctx =3D ep =3D=3D null ? null : ep.getJNDIContext();
+              Context ctx =3D ep.getJNDIContext();
               InjectionHelper.injectResources(handler, injections, ctx);
               InjectionHelper.callPostConstructMethod(handler);
+              handlerReference.setInitialized();
            }
        }
        else


--===============0858984450713532572==--

From jbossws-commits at lists.jboss.org Tue Oct 11 04:39:27 2011
Content-Type: multipart/mixed; boundary="===============1302370984525356613=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15075 -
 stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport.
Date: Tue, 11 Oct 2011 04:39:26 -0400
Message-ID: <201110110839.p9B8dQC7029508@svn01.web.mwc.hst.phx2.redhat.com>

--===============1302370984525356613==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-11 04:39:26 -0400 (Tue, 11 Oct 2011)
New Revision: 15075

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tra=
nsport/ServletHelper.java
Log:
initialization flag is modifyable

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/transport/ServletHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-11 08:38:45 UTC (rev 15074)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-11 08:39:26 UTC (rev 15075)
@@ -53,6 +53,7 @@
 import org.jboss.wsf.spi.SPIProviderResolver;
 import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Reference;
 import org.jboss.wsf.spi.invocation.EndpointAssociation;
 import org.jboss.wsf.spi.invocation.RequestHandler;
 import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -130,9 +131,13 @@
          {
             for (Handler handler : chain)
             {
-               final Object handlerInstance =3D endpoint.getInstanceProvid=
er().getInstance(handler.getClass().getName()).getValue();
-               InjectionHelper.injectResources(handlerInstance, metadata, =
jndiContext);
-               InjectionHelper.callPostConstructMethod(handlerInstance);
+               final Reference handlerReference =3D endpoint.getInstancePr=
ovider().getInstance(handler.getClass().getName());
+               if (!handlerReference.isInitialized()) {
+                   final Object handlerInstance =3D handlerReference.getVa=
lue();
+                   InjectionHelper.injectResources(handlerInstance, metada=
ta, jndiContext);
+                   InjectionHelper.callPostConstructMethod(handlerInstance=
);
+                   handlerReference.setInitialized();
+               }
             }
          }
       }


--===============1302370984525356613==--

From jbossws-commits at lists.jboss.org Tue Oct 11 08:09:34 2011
Content-Type: multipart/mixed; boundary="===============4684201342769436692=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15076 - in
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws:
 jbws2074/usecase3/service and 1 other directories.
Date: Tue, 11 Oct 2011 08:09:33 -0400
Message-ID: <201110111209.p9BC9XRu006185@svn01.web.mwc.hst.phx2.redhat.com>

--===============4684201342769436692==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-11 08:09:33 -0400 (Tue, 11 Oct 2011)
New Revision: 15076

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws2074/handler/DescriptorResourcesHandler.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws2074/handler/JavaResourcesHandler.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws2074/usecase3/service/POJOImpl.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws2634/shared/handlers/TestHandler.java
Log:
fixing tests - JAXWS handlers cannot be final classes

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws2074/handler/DescriptorResourcesHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/handler/DescriptorResourcesHandler.java	2011-10-11 08:39:26 UTC (r=
ev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/handler/DescriptorResourcesHandler.java	2011-10-11 12:09:33 UTC (r=
ev 15076)
@@ -40,7 +40,7 @@
  *
  * @author ropalka(a)redhat.com
  */
-public final class DescriptorResourcesHandler extends GenericSOAPHandler
+public class DescriptorResourcesHandler extends GenericSOAPHandler
 {
    // provide logging
    private static final Logger log =3D Logger.getLogger(DescriptorResource=
sHandler.class);
@@ -172,12 +172,12 @@
    // XML driven injection
    private String string0;
 =

-   private String _string1;
+   private String string1;
 =

    // XML driven injection
    private void setString1(String s)
    {
-      this._string1 =3D s;
+      this.string1 =3D s;
    }
 =

    /**
@@ -292,7 +292,7 @@
          log.error("Descriptor driven initialization for string0 failed");
          correctInitialization =3D false;
       }
-      if ("s".equals(this._string1) =3D=3D false)
+      if ("s".equals(this.string1) =3D=3D false)
       {
          log.error("Descriptor driven initialization for string1 failed");
          correctInitialization =3D false;

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws2074/handler/JavaResourcesHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/handler/JavaResourcesHandler.java	2011-10-11 08:39:26 UTC (rev 150=
75)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/handler/JavaResourcesHandler.java	2011-10-11 12:09:33 UTC (rev 150=
76)
@@ -41,7 +41,7 @@
  *
  * @author ropalka(a)redhat.com
  */
-public final class JavaResourcesHandler extends GenericSOAPHandler
+public class JavaResourcesHandler extends GenericSOAPHandler
 {
    // provide logging
    private static final Logger log =3D Logger.getLogger(JavaResourcesHandl=
er.class);
@@ -170,12 +170,12 @@
     * java.lang.String
     */
 =

-   @Resource
+   @Resource(name =3D "string")
    private String string;
 =

    private String _string1;
 =

-   @Resource
+   @Resource(name =3D "string")
    private void setString(String s)
    {
       this._string1 =3D s;

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws2074/usecase3/service/POJOImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/usecase3/service/POJOImpl.java	2011-10-11 08:39:26 UTC (rev 15075)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2074/usecase3/service/POJOImpl.java	2011-10-11 12:09:33 UTC (rev 15076)
@@ -164,12 +164,12 @@
     * java.lang.String
     */
 =

-   @Resource
-   private String string;
+   @Resource(name =3D "string")
+   private String string0;
 =

    private String _string1;
 =

-   @Resource
+   @Resource(name =3D "string")
    private void setString(String s)
    {
       this._string1 =3D s;
@@ -282,7 +282,7 @@
       }
 =

       // java.lang.String
-      if ("s".equals(this.string) =3D=3D false)
+      if ("s".equals(this.string0) =3D=3D false)
       {
          log.error("@Resource initialization for string0 failed");
          correctInitialization =3D false;

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws2634/shared/handlers/TestHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2634/shared/handlers/TestHandler.java	2011-10-11 08:39:26 UTC (rev 1507=
5)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws2634/shared/handlers/TestHandler.java	2011-10-11 12:09:33 UTC (rev 1507=
6)
@@ -40,12 +40,12 @@
  *
  * @author <a href=3D"mailto:richard.opalka(a)jboss.org">Richard Opalka</a>
  */
-public final class TestHandler extends GenericSOAPHandler
+public class TestHandler extends GenericSOAPHandler
 {
    // provide logging
    private static final Logger log =3D Logger.getLogger(TestHandler.class);
 =

-   @Resource
+   @Resource(name=3D"boolean1")
    private Boolean boolean1;
 =

    @EJB


--===============4684201342769436692==--

From jbossws-commits at lists.jboss.org Wed Oct 12 03:44:24 2011
Content-Type: multipart/mixed; boundary="===============9013376942446973322=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15077 - stack/cxf/trunk.
Date: Wed, 12 Oct 2011 03:44:23 -0400
Message-ID: <201110120744.p9C7iN5L007400@svn01.web.mwc.hst.phx2.redhat.com>

--===============9013376942446973322==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 03:44:22 -0400 (Wed, 12 Oct 2011)
New Revision: 15077

Modified:
   stack/cxf/trunk/pom.xml
Log:
[JBWS-3340] upgrade to Apache CXF 2.4.3

Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-11 12:09:33 UTC (rev 15076)
+++ stack/cxf/trunk/pom.xml	2011-10-12 07:44:22 UTC (rev 15077)
@@ -54,7 +54,7 @@
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
-    <cxf.version>2.4.3-SNAPSHOT</cxf.version>
+    <cxf.version>2.4.3</cxf.version>
     <cxf.asm.version>3.3</cxf.asm.version>
     <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
     <fastinfoset.api.version>1.2.7</fastinfoset.api.version>


--===============9013376942446973322==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:23:50 2011
Content-Type: multipart/mixed; boundary="===============4965561950001492716=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15078 - spi/trunk.
Date: Wed, 12 Oct 2011 09:23:50 -0400
Message-ID: <201110121323.p9CDNoIY010639@svn01.web.mwc.hst.phx2.redhat.com>

--===============4965561950001492716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:23:50 -0400 (Wed, 12 Oct 2011)
New Revision: 15078

Modified:
   spi/trunk/pom.xml
Log:
prepare for release

Modified: spi/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/pom.xml	2011-10-12 07:44:22 UTC (rev 15077)
+++ spi/trunk/pom.xml	2011-10-12 13:23:50 UTC (rev 15078)
@@ -7,25 +7,25 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta10</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</=
connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
runk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta10</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta10</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta10</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
+    <jbossws.api.version>1.0.0.Beta2</jbossws.api.version>
     <jms.api.version>1.0.0.Final</jms.api.version>
     <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============4965561950001492716==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:27:59 2011
Content-Type: multipart/mixed; boundary="===============5623541366042456636=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15079 - spi/trunk.
Date: Wed, 12 Oct 2011 09:27:59 -0400
Message-ID: <201110121327.p9CDRxMY011004@svn01.web.mwc.hst.phx2.redhat.com>

--===============5623541366042456636==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:27:59 -0400 (Wed, 12 Oct 2011)
New Revision: 15079

Modified:
   spi/trunk/pom.xml
Log:
prepare for release

Modified: spi/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/pom.xml	2011-10-12 13:23:50 UTC (rev 15078)
+++ spi/trunk/pom.xml	2011-10-12 13:27:59 UTC (rev 15079)
@@ -7,7 +7,7 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0.Beta10</version>
+  <version>2.0.0.Beta11</version>
 =

   <!-- Parent -->
   <parent>
@@ -18,9 +18,9 @@
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta10</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta10</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta10</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta11</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta11</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta11</url>
   </scm>
 =

   <!-- Properties -->
@@ -41,7 +41,7 @@
       <artifactId>jbossws-api</artifactId>
       <version>${jbossws.api.version}</version>
     </dependency>
-    =

+
     <!-- provided apis -->
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>


--===============5623541366042456636==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:28:47 2011
Content-Type: multipart/mixed; boundary="===============1472979926484447561=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15080 - spi/tags.
Date: Wed, 12 Oct 2011 09:28:46 -0400
Message-ID: <201110121328.p9CDSkJb011015@svn01.web.mwc.hst.phx2.redhat.com>

--===============1472979926484447561==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:28:46 -0400 (Wed, 12 Oct 2011)
New Revision: 15080

Added:
   spi/tags/jbossws-spi-2.0.0.Beta11/
Log:
tagging SPI 2.0.0.Beta11


--===============1472979926484447561==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:32:52 2011
Content-Type: multipart/mixed; boundary="===============6836606178965130290=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15081 - spi/trunk.
Date: Wed, 12 Oct 2011 09:32:52 -0400
Message-ID: <201110121332.p9CDWqdf011504@svn01.web.mwc.hst.phx2.redhat.com>

--===============6836606178965130290==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:32:52 -0400 (Wed, 12 Oct 2011)
New Revision: 15081

Modified:
   spi/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: spi/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/pom.xml	2011-10-12 13:28:46 UTC (rev 15080)
+++ spi/trunk/pom.xml	2011-10-12 13:32:52 UTC (rev 15081)
@@ -7,27 +7,26 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0.Beta11</version>
+  <version>2.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta11</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta11</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta11</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</=
connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
runk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0.Beta2</jbossws.api.version>
+    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
     <jms.api.version>1.0.0.Final</jms.api.version>
-    <jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
     <servlet.api.version>1.0.0.Final</servlet.api.version>
     <junit.version>3.8.2</junit.version>


--===============6836606178965130290==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:34:21 2011
Content-Type: multipart/mixed; boundary="===============3156389199354442195=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15082 -
 common/trunk/src/main/java/org/jboss/ws/common/invocation.
Date: Wed, 12 Oct 2011 09:34:20 -0400
Message-ID: <201110121334.p9CDYKal011517@svn01.web.mwc.hst.phx2.redhat.com>

--===============3156389199354442195==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:34:20 -0400 (Wed, 12 Oct 2011)
New Revision: 15082

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHand=
lerJAXWS.java
Log:
always inject WebServiceContext before post construct is called

Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/Invocat=
ionHandlerJAXWS.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-12 13:32:52 UTC (rev 15081)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHan=
dlerJAXWS.java	2011-10-12 13:34:20 UTC (rev 15082)
@@ -65,6 +65,8 @@
       final Reference reference =3D endpoint.getInstanceProvider().getInst=
ance(_targetBean.getClass().getName());
       final Object targetBean =3D reference.getValue();
 =

+      InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAware=
WebServiceContext.getInstance());
+
       if (!reference.isInitialized())
       {
          this.log.debug("Injecting resources on JAXWS JSE endpoint: " + ta=
rgetBean);
@@ -75,8 +77,6 @@
          reference.setInitialized();
       }
 =

-      InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAware=
WebServiceContext.getInstance());
-
       endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(=
targetBean));
    }
 =



--===============3156389199354442195==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:37:42 2011
Content-Type: multipart/mixed; boundary="===============2413899763851359164=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15083 - common/trunk.
Date: Wed, 12 Oct 2011 09:37:41 -0400
Message-ID: <201110121337.p9CDbfeA011875@svn01.web.mwc.hst.phx2.redhat.com>

--===============2413899763851359164==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:37:41 -0400 (Wed, 12 Oct 2011)
New Revision: 15083

Modified:
   common/trunk/pom.xml
Log:
prepare for release

Modified: common/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/pom.xml	2011-10-12 13:34:20 UTC (rev 15082)
+++ common/trunk/pom.xml	2011-10-12 13:37:41 UTC (rev 15083)
@@ -9,25 +9,25 @@
   <packaging>jar</packaging>
   <description>JBossWS Common</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta11</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trun=
k</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags=
/jbossws-common-2.0.0.Beta11</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/tags/jbossws-common-2.0.0.Beta11</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-comm=
on-2.0.0.Beta11</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
     <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
     <jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============2413899763851359164==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:40:38 2011
Content-Type: multipart/mixed; boundary="===============8478331660824959955=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15084 - common/tags.
Date: Wed, 12 Oct 2011 09:40:38 -0400
Message-ID: <201110121340.p9CDecC0012277@svn01.web.mwc.hst.phx2.redhat.com>

--===============8478331660824959955==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:40:37 -0400 (Wed, 12 Oct 2011)
New Revision: 15084

Added:
   common/tags/jbossws-common-2.0.0.Beta11/
Log:
tagging JBossWS 2.0.0.Beta11


--===============8478331660824959955==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:41:19 2011
Content-Type: multipart/mixed; boundary="===============3295948205819950911=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15085 - common/trunk.
Date: Wed, 12 Oct 2011 09:41:19 -0400
Message-ID: <201110121341.p9CDfJpI012330@svn01.web.mwc.hst.phx2.redhat.com>

--===============3295948205819950911==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:41:19 -0400 (Wed, 12 Oct 2011)
New Revision: 15085

Modified:
   common/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: common/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/pom.xml	2011-10-12 13:40:37 UTC (rev 15084)
+++ common/trunk/pom.xml	2011-10-12 13:41:19 UTC (rev 15085)
@@ -9,25 +9,25 @@
   <packaging>jar</packaging>
   <description>JBossWS Common</description>
 =

-  <version>2.0.0.Beta11</version>
+  <version>2.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags=
/jbossws-common-2.0.0.Beta11</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/tags/jbossws-common-2.0.0.Beta11</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-comm=
on-2.0.0.Beta11</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trun=
k</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/trunk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
+    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
     <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
     <jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============3295948205819950911==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:53:25 2011
Content-Type: multipart/mixed; boundary="===============1099734487475659046=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15086 - in stack/native/trunk:
 modules/client and 9 other directories.
Date: Wed, 12 Oct 2011 09:53:25 -0400
Message-ID: <201110121353.p9CDrPkp013532@svn01.web.mwc.hst.phx2.redhat.com>

--===============1099734487475659046==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:53:25 -0400 (Wed, 12 Oct 2011)
New Revision: 15086

Modified:
   stack/native/trunk/modules/client/pom.xml
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/dist/management/pom.xml
   stack/native/trunk/modules/dist/pom.xml
   stack/native/trunk/modules/endorsed/pom.xml
   stack/native/trunk/modules/resources/pom.xml
   stack/native/trunk/modules/services/pom.xml
   stack/native/trunk/modules/testsuite/native-tests/pom.xml
   stack/native/trunk/modules/testsuite/pom.xml
   stack/native/trunk/modules/testsuite/shared-tests/pom.xml
   stack/native/trunk/pom.xml
Log:
prepare for tagging

Modified: stack/native/trunk/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/client/pom.xml	2011-10-12 13:41:19 UTC (rev =
15085)
+++ stack/native/trunk/modules/client/pom.xml	2011-10-12 13:53:25 UTC (rev =
15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/pom.xml	2011-10-12 13:41:19 UTC (rev 15=
085)
+++ stack/native/trunk/modules/core/pom.xml	2011-10-12 13:53:25 UTC (rev 15=
086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/dist/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/dist/management/pom.xml	2011-10-12 13:41:19 =
UTC (rev 15085)
+++ stack/native/trunk/modules/dist/management/pom.xml	2011-10-12 13:53:25 =
UTC (rev 15086)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/dist/pom.xml	2011-10-12 13:41:19 UTC (rev 15=
085)
+++ stack/native/trunk/modules/dist/pom.xml	2011-10-12 13:53:25 UTC (rev 15=
086)
@@ -5,12 +5,12 @@
   <name>JBoss Web Services - Stack Native Distribution</name>
   <artifactId>jbossws-native-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta3</version>
 =

   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/endorsed/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/endorsed/pom.xml	2011-10-12 13:41:19 UTC (re=
v 15085)
+++ stack/native/trunk/modules/endorsed/pom.xml	2011-10-12 13:53:25 UTC (re=
v 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/resources/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/resources/pom.xml	2011-10-12 13:41:19 UTC (r=
ev 15085)
+++ stack/native/trunk/modules/resources/pom.xml	2011-10-12 13:53:25 UTC (r=
ev 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/native/trunk/modules/services/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/services/pom.xml	2011-10-12 13:41:19 UTC (re=
v 15085)
+++ stack/native/trunk/modules/services/pom.xml	2011-10-12 13:53:25 UTC (re=
v 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-10-12 13=
:41:19 UTC (rev 15085)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-10-12 13=
:53:25 UTC (rev 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-12 13:41:19 UTC (r=
ev 15085)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-12 13:53:25 UTC (r=
ev 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 13=
:41:19 UTC (rev 15085)
+++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 13=
:53:25 UTC (rev 15086)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/pom.xml	2011-10-12 13:41:19 UTC (rev 15085)
+++ stack/native/trunk/pom.xml	2011-10-12 13:53:25 UTC (rev 15086)
@@ -18,20 +18,20 @@
   <packaging>pom</packaging>
   <description>JBossWS Native stack</description>
 =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta3</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/trunk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/tags/jbossws-native-4.0.0.Beta3</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/tags/jbossws-native-4.0.0.Beta3</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossw=
s-native-4.0.0.Beta3</url>
   </scm>
 =

   <!-- Modules -->
@@ -45,10 +45,10 @@
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
-    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
+    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
+    <jbossws.common.version>2.0.0.Beta11</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
+    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>


--===============1099734487475659046==--

From jbossws-commits at lists.jboss.org Wed Oct 12 09:59:40 2011
Content-Type: multipart/mixed; boundary="===============2090435071744136980=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15087 - stack/native/tags.
Date: Wed, 12 Oct 2011 09:59:40 -0400
Message-ID: <201110121359.p9CDxeDH013902@svn01.web.mwc.hst.phx2.redhat.com>

--===============2090435071744136980==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 09:59:40 -0400 (Wed, 12 Oct 2011)
New Revision: 15087

Added:
   stack/native/tags/jbossws-native-4.0.0.Beta3/
Log:
tagging JBossWS Native 4.0.0.Beta3


--===============2090435071744136980==--

From jbossws-commits at lists.jboss.org Wed Oct 12 10:03:28 2011
Content-Type: multipart/mixed; boundary="===============4090869483224748583=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15088 - in stack/native/trunk:
 modules/client and 9 other directories.
Date: Wed, 12 Oct 2011 10:03:28 -0400
Message-ID: <201110121403.p9CE3SNI020353@svn01.web.mwc.hst.phx2.redhat.com>

--===============4090869483224748583==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 10:03:26 -0400 (Wed, 12 Oct 2011)
New Revision: 15088

Modified:
   stack/native/trunk/modules/client/pom.xml
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/dist/management/pom.xml
   stack/native/trunk/modules/dist/pom.xml
   stack/native/trunk/modules/endorsed/pom.xml
   stack/native/trunk/modules/resources/pom.xml
   stack/native/trunk/modules/services/pom.xml
   stack/native/trunk/modules/testsuite/native-tests/pom.xml
   stack/native/trunk/modules/testsuite/pom.xml
   stack/native/trunk/modules/testsuite/shared-tests/pom.xml
   stack/native/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: stack/native/trunk/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/client/pom.xml	2011-10-12 13:59:40 UTC (rev =
15087)
+++ stack/native/trunk/modules/client/pom.xml	2011-10-12 14:03:26 UTC (rev =
15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/pom.xml	2011-10-12 13:59:40 UTC (rev 15=
087)
+++ stack/native/trunk/modules/core/pom.xml	2011-10-12 14:03:26 UTC (rev 15=
088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/dist/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/dist/management/pom.xml	2011-10-12 13:59:40 =
UTC (rev 15087)
+++ stack/native/trunk/modules/dist/management/pom.xml	2011-10-12 14:03:26 =
UTC (rev 15088)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/dist/pom.xml	2011-10-12 13:59:40 UTC (rev 15=
087)
+++ stack/native/trunk/modules/dist/pom.xml	2011-10-12 14:03:26 UTC (rev 15=
088)
@@ -5,12 +5,12 @@
   <name>JBoss Web Services - Stack Native Distribution</name>
   <artifactId>jbossws-native-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0.Beta3</version>
+  <version>4.0.0-SNAPSHOT</version>
 =

   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/endorsed/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/endorsed/pom.xml	2011-10-12 13:59:40 UTC (re=
v 15087)
+++ stack/native/trunk/modules/endorsed/pom.xml	2011-10-12 14:03:26 UTC (re=
v 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/resources/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/resources/pom.xml	2011-10-12 13:59:40 UTC (r=
ev 15087)
+++ stack/native/trunk/modules/resources/pom.xml	2011-10-12 14:03:26 UTC (r=
ev 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/native/trunk/modules/services/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/services/pom.xml	2011-10-12 13:59:40 UTC (re=
v 15087)
+++ stack/native/trunk/modules/services/pom.xml	2011-10-12 14:03:26 UTC (re=
v 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-10-12 13=
:59:40 UTC (rev 15087)
+++ stack/native/trunk/modules/testsuite/native-tests/pom.xml	2011-10-12 14=
:03:26 UTC (rev 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-12 13:59:40 UTC (r=
ev 15087)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-12 14:03:26 UTC (r=
ev 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 13=
:59:40 UTC (rev 15087)
+++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 14=
:03:26 UTC (rev 15088)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.native</groupId>
     <artifactId>jbossws-native-testsuite</artifactId>
-    <version>4.0.0.Beta3</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/native/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/pom.xml	2011-10-12 13:59:40 UTC (rev 15087)
+++ stack/native/trunk/pom.xml	2011-10-12 14:03:26 UTC (rev 15088)
@@ -18,20 +18,20 @@
   <packaging>pom</packaging>
   <description>JBossWS Native stack</description>
 =

-  <version>4.0.0.Beta3</version>
+  <version>4.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/tags/jbossws-native-4.0.0.Beta3</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/tags/jbossws-native-4.0.0.Beta3</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossw=
s-native-4.0.0.Beta3</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/nativ=
e/trunk</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/native/trunk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/trunk</url>
   </scm>
 =

   <!-- Modules -->
@@ -45,10 +45,10 @@
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
-    <jbossws.common.version>2.0.0.Beta11</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
-    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
+    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
+    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>


--===============4090869483224748583==--

From jbossws-commits at lists.jboss.org Wed Oct 12 10:04:53 2011
Content-Type: multipart/mixed; boundary="===============3922712925721752788=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15089 -
 stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport.
Date: Wed, 12 Oct 2011 10:04:53 -0400
Message-ID: <201110121404.p9CE4rDL020366@svn01.web.mwc.hst.phx2.redhat.com>

--===============3922712925721752788==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 10:04:53 -0400 (Wed, 12 Oct 2011)
New Revision: 15089

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tra=
nsport/ServletHelper.java
Log:
final tuning fix - ensure proper injections

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/transport/ServletHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-12 14:03:26 UTC (rev 15088)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/tr=
ansport/ServletHelper.java	2011-10-12 14:04:53 UTC (rev 15089)
@@ -120,7 +120,8 @@
    private static void injectServiceAndHandlerResources(Endpoint endpoint)
    {
       ServerFactoryBean factory =3D endpoint.getAttachment(ServerFactoryBe=
an.class);
-      if (factory =3D=3D null) throw new UnsupportedOperationException(); =
// TODO: move injection to ASIL
+      // ping endpoint to force injection
+      endpoint.getInstanceProvider().getInstance(endpoint.getTargetBeanNam=
e());
       if (factory !=3D null)
       {
          InjectionsMetaData metadata =3D endpoint.getAttachment(Injections=
MetaData.class);
@@ -150,7 +151,8 @@
       {
          if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() !=3D=
 null)
          {
-            final Object epInstance =3D endpoint.getInstanceProvider().get=
Instance(factory.getServiceBean().getClass().getName()).getValue();
+            final Reference epReference =3D endpoint.getInstanceProvider()=
.getInstance(factory.getServiceBean().getClass().getName());
+            final Object epInstance =3D epReference.getValue(); =

             InjectionHelper.callPreDestroyMethod(epInstance);
          }
       }


--===============3922712925721752788==--

From jbossws-commits at lists.jboss.org Wed Oct 12 10:11:22 2011
Content-Type: multipart/mixed; boundary="===============6091335276422386630=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15090 - in stack/cxf/trunk:
 modules/addons and 11 other directories.
Date: Wed, 12 Oct 2011 10:11:22 -0400
Message-ID: <201110121411.p9CEBMMT021173@svn01.web.mwc.hst.phx2.redhat.com>

--===============6091335276422386630==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 10:11:22 -0400 (Wed, 12 Oct 2011)
New Revision: 15090

Modified:
   stack/cxf/trunk/modules/addons/pom.xml
   stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
   stack/cxf/trunk/modules/client/pom.xml
   stack/cxf/trunk/modules/dist/management/pom.xml
   stack/cxf/trunk/modules/dist/pom.xml
   stack/cxf/trunk/modules/endorsed/pom.xml
   stack/cxf/trunk/modules/resources/pom.xml
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
   stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
   stack/cxf/trunk/pom.xml
Log:
prepare for tagging

Modified: stack/cxf/trunk/modules/addons/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/addons/pom.xml	2011-10-12 14:04:53 UTC (rev 150=
89)
+++ stack/cxf/trunk/modules/addons/pom.xml	2011-10-12 14:11:22 UTC (rev 150=
90)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-=
10-12 14:04:53 UTC (rev 15089)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-=
10-12 14:11:22 UTC (rev 15090)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-addons</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/pom.xml	2011-10-12 14:04:53 UTC (rev 150=
89)
+++ stack/cxf/trunk/modules/client/pom.xml	2011-10-12 14:11:22 UTC (rev 150=
90)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/dist/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-12 14:04:53 UTC=
 (rev 15089)
+++ stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-12 14:11:22 UTC=
 (rev 15090)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <!-- Build -->

Modified: stack/cxf/trunk/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/pom.xml	2011-10-12 14:04:53 UTC (rev 15089)
+++ stack/cxf/trunk/modules/dist/pom.xml	2011-10-12 14:11:22 UTC (rev 15090)
@@ -4,12 +4,12 @@
   <name>JBoss Web Services - Stack CXF Distrubiton</name>
   <artifactId>jbossws-cxf-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta6</version>
   =

   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/endorsed/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/endorsed/pom.xml	2011-10-12 14:04:53 UTC (rev 1=
5089)
+++ stack/cxf/trunk/modules/endorsed/pom.xml	2011-10-12 14:11:22 UTC (rev 1=
5090)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/resources/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/pom.xml	2011-10-12 14:04:53 UTC (rev =
15089)
+++ stack/cxf/trunk/modules/resources/pom.xml	2011-10-12 14:11:22 UTC (rev =
15090)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/pom.xml	2011-10-12 14:04:53 UTC (rev 150=
89)
+++ stack/cxf/trunk/modules/server/pom.xml	2011-10-12 14:11:22 UTC (rev 150=
90)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml	2011-10-12 1=
4:04:53 UTC (rev 15089)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml	2011-10-12 1=
4:11:22 UTC (rev 15090)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml	2011-10-12 14:04:53=
 UTC (rev 15089)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml	2011-10-12 14:11:22=
 UTC (rev 15090)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-12 14:04:53 UTC (rev =
15089)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-12 14:11:22 UTC (rev =
15090)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 14:04=
:53 UTC (rev 15089)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 14:11=
:22 UTC (rev 15090)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0.Beta6</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-12 14:04:53 UTC (rev 15089)
+++ stack/cxf/trunk/pom.xml	2011-10-12 14:11:22 UTC (rev 15090)
@@ -19,20 +19,20 @@
   <description>JBossWS CXF stack</description>
 =

   =

-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0.Beta6</version>
   =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
   =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
runk</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
ags/jbossws-cxf-4.0.0.Beta6</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/tags/jbossws-cxf-4.0.0.Beta6</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-c=
xf-4.0.0.Beta6</url>
   </scm>
   =

   <!-- Modules -->
@@ -46,10 +46,10 @@
   =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
-    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
-    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
+    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
+    <jbossws.common.version>2.0.0.Beta11</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
+    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>


--===============6091335276422386630==--

From jbossws-commits at lists.jboss.org Wed Oct 12 10:15:38 2011
Content-Type: multipart/mixed; boundary="===============8677772520486547161=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15091 - stack/cxf/tags.
Date: Wed, 12 Oct 2011 10:15:38 -0400
Message-ID: <201110121415.p9CEFcON021553@svn01.web.mwc.hst.phx2.redhat.com>

--===============8677772520486547161==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 10:15:37 -0400 (Wed, 12 Oct 2011)
New Revision: 15091

Added:
   stack/cxf/tags/jbossws-cxf-4.0.0.Beta6/
Log:
tagging JBossWS CXF 4.0.0.Beta6


--===============8677772520486547161==--

From jbossws-commits at lists.jboss.org Wed Oct 12 10:18:40 2011
Content-Type: multipart/mixed; boundary="===============8881865469543736737=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15092 - in stack/cxf/trunk:
 modules/addons and 11 other directories.
Date: Wed, 12 Oct 2011 10:18:40 -0400
Message-ID: <201110121418.p9CEIefW021874@svn01.web.mwc.hst.phx2.redhat.com>

--===============8881865469543736737==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-12 10:18:40 -0400 (Wed, 12 Oct 2011)
New Revision: 15092

Modified:
   stack/cxf/trunk/modules/addons/pom.xml
   stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
   stack/cxf/trunk/modules/client/pom.xml
   stack/cxf/trunk/modules/dist/management/pom.xml
   stack/cxf/trunk/modules/dist/pom.xml
   stack/cxf/trunk/modules/endorsed/pom.xml
   stack/cxf/trunk/modules/resources/pom.xml
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
   stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
   stack/cxf/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: stack/cxf/trunk/modules/addons/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/addons/pom.xml	2011-10-12 14:15:37 UTC (rev 150=
91)
+++ stack/cxf/trunk/modules/addons/pom.xml	2011-10-12 14:18:40 UTC (rev 150=
92)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-=
10-12 14:15:37 UTC (rev 15091)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-=
10-12 14:18:40 UTC (rev 15092)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-addons</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/pom.xml	2011-10-12 14:15:37 UTC (rev 150=
91)
+++ stack/cxf/trunk/modules/client/pom.xml	2011-10-12 14:18:40 UTC (rev 150=
92)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/dist/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-12 14:15:37 UTC=
 (rev 15091)
+++ stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-12 14:18:40 UTC=
 (rev 15092)
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <!-- Build -->

Modified: stack/cxf/trunk/modules/dist/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/pom.xml	2011-10-12 14:15:37 UTC (rev 15091)
+++ stack/cxf/trunk/modules/dist/pom.xml	2011-10-12 14:18:40 UTC (rev 15092)
@@ -4,12 +4,12 @@
   <name>JBoss Web Services - Stack CXF Distrubiton</name>
   <artifactId>jbossws-cxf-dist</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0.Beta6</version>
+  <version>4.0.0-SNAPSHOT</version>
   =

   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/endorsed/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/endorsed/pom.xml	2011-10-12 14:15:37 UTC (rev 1=
5091)
+++ stack/cxf/trunk/modules/endorsed/pom.xml	2011-10-12 14:18:40 UTC (rev 1=
5092)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/resources/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/pom.xml	2011-10-12 14:15:37 UTC (rev =
15091)
+++ stack/cxf/trunk/modules/resources/pom.xml	2011-10-12 14:18:40 UTC (rev =
15092)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/pom.xml	2011-10-12 14:15:37 UTC (rev 150=
91)
+++ stack/cxf/trunk/modules/server/pom.xml	2011-10-12 14:18:40 UTC (rev 150=
92)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml	2011-10-12 1=
4:15:37 UTC (rev 15091)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml	2011-10-12 1=
4:18:40 UTC (rev 15092)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml	2011-10-12 14:15:37=
 UTC (rev 15091)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml	2011-10-12 14:18:40=
 UTC (rev 15092)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   =


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-12 14:15:37 UTC (rev =
15091)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-12 14:18:40 UTC (rev =
15092)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 14:15=
:37 UTC (rev 15091)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml	2011-10-12 14:18=
:40 UTC (rev 15092)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.jboss.ws.cxf</groupId>
     <artifactId>jbossws-cxf-testsuite</artifactId>
-    <version>4.0.0.Beta6</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 =


Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-12 14:15:37 UTC (rev 15091)
+++ stack/cxf/trunk/pom.xml	2011-10-12 14:18:40 UTC (rev 15092)
@@ -19,20 +19,20 @@
   <description>JBossWS CXF stack</description>
 =

   =

-  <version>4.0.0.Beta6</version>
+  <version>4.0.0-SNAPSHOT</version>
   =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
   =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
ags/jbossws-cxf-4.0.0.Beta6</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/tags/jbossws-cxf-4.0.0.Beta6</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-c=
xf-4.0.0.Beta6</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/t=
runk</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack=
/cxf/trunk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
   </scm>
   =

   <!-- Modules -->
@@ -46,10 +46,10 @@
   =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0.Beta11</jbossws.spi.version>
-    <jbossws.common.version>2.0.0.Beta11</jbossws.common.version>
-    <jbossws.common.tools.version>1.0.0.Beta1</jbossws.common.tools.versio=
n>
-    <jbossws.shared.testsuite.version>4.0.0.Beta5</jbossws.shared.testsuit=
e.version>
+    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+    <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+    <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.ver=
sion>
+    <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.tests=
uite.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>


--===============8881865469543736737==--

From jbossws-commits at lists.jboss.org Thu Oct 13 05:06:44 2011
Content-Type: multipart/mixed; boundary="===============5678891228240640189=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15093 - hudson/trunk/scripts.
Date: Thu, 13 Oct 2011 05:06:44 -0400
Message-ID: <201110130906.p9D96iwc014723@svn01.web.mwc.hst.phx2.redhat.com>

--===============5678891228240640189==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-13 05:06:44 -0400 (Thu, 13 Oct 2011)
New Revision: 15093

Modified:
   hudson/trunk/scripts/jbossws-qa.sh
Log:
Also update native stack for AS 71x in cxf jobs


Modified: hudson/trunk/scripts/jbossws-qa.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/scripts/jbossws-qa.sh	2011-10-12 14:18:40 UTC (rev 15092)
+++ hudson/trunk/scripts/jbossws-qa.sh	2011-10-13 09:06:44 UTC (rev 15093)
@@ -21,9 +21,17 @@
     redeployBinaryDistribution
     STACK_ID=3Dcxf
     STACK_DIR=3D$ORIG_STACK_DIR
-  else
-    echo "No need to pre-install native..."
   fi;
+  if [ "$STACK_ID" =3D "cxf" ] && [[ $JBOSS_TARGET =3D=3D jboss71* ]]; then
+    echo "cxf stack with AS 71x, first installing native..."
+    STACK_ID=3Dnative
+    ORIG_STACK_DIR=3D$STACK_DIR
+    STACK_DIR=3D$STACK_DIR/../../../NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6/work=
space/stack-native/
+    setupEnv
+    redeployBinaryDistribution
+    STACK_ID=3Dcxf
+    STACK_DIR=3D$ORIG_STACK_DIR
+  fi;
 }
 =

 setupEnv() {


--===============5678891228240640189==--

From jbossws-commits at lists.jboss.org Thu Oct 13 08:16:04 2011
Content-Type: multipart/mixed; boundary="===============4148612695829643893=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15094 - in
 shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4
 other directories.
Date: Thu, 13 Oct 2011 08:16:03 -0400
Message-ID: <201110131216.p9DCG3KE017865@svn01.web.mwc.hst.phx2.redhat.com>

--===============4148612695829643893==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:16:03 -0400 (Thu, 13 Oct 2011)
New Revision: 15094

Added:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/BothPojoAndEjbInWarTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/EJB3Endpoint.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/EndpointIface.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/OnlyEjbInWarTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3367/POJOEndpoint.java
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-I=
NF/
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-I=
NF/jboss-web.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-I=
NF/web.xml
Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3376][AS7-1605] providing test case

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-j=
axws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-13 09:06:44 UTC (rev 15093)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-13 12:16:03 UTC (rev 15094)
@@ -1116,6 +1116,28 @@
             </classes>
         </war>
 		=

+                <!-- jaxws-jbws3367 -->
+                <war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws33=
67-usecase1.war" webxml=3D"${tests.output.dir}/test-resources/jaxws/jbws336=
7/WEB-INF/web.xml">
+                        <classes dir=3D"${tests.output.dir}/test-classes">
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3367=
/EndpointIface.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3367=
/POJOEndpoint.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3367=
/EJB3Endpoint.class"/>
+                        </classes>
+                        <webinf dir=3D"${tests.output.dir}/test-resources/=
jaxws/jbws3367/WEB-INF">
+                                <include name=3D"jboss-web.xml" />
+                        </webinf>
+                </war>
+		=

+                <war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws33=
67-usecase2.war" needxmlfile=3D"false">
+                        <classes dir=3D"${tests.output.dir}/test-classes">
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3367=
/EndpointIface.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3367=
/EJB3Endpoint.class"/>
+                        </classes>
+                        <webinf dir=3D"${tests.output.dir}/test-resources/=
jaxws/jbws3367/WEB-INF">
+                                <include name=3D"jboss-web.xml" />
+                        </webinf>
+                </war>
+		=

 		<!-- jaxws-endpoint-servlet -->
 		<war warfile=3D"${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war=
" manifest=3D"${tests.output.dir}/test-resources/jaxws/endpoint/META-INF/MA=
NIFEST.MF"
 			webxml=3D"${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web=
.xml">

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3367/BothPojoAndEjbInWarTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/BothPojoAndEjbInWarTestCase.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/BothPojoAndEjbInWarTestCase.java	2011-10-13 12:16:03 UTC (rev 1509=
4)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3367][AS7-1605] jboss-web.xml ignored for web service root
+ *
+ * This test case tests if both POJO & EJB3 endpoints are in war archive.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class BothPojoAndEjbInWarTestCase extends JBossWSTest
+{
+
+   public static Test suite()
+   {
+      return new JBossWSTestSetup(BothPojoAndEjbInWarTestCase.class, "jaxw=
s-jbws3367-usecase1.war");
+   }
+
+   public void testPOJOEndpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
367", "POJOEndpointService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jbws3367-custom=
ized/POJOEndpoint?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final EndpointIface port =3D service.getPort(EndpointIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("POJO hello", result);
+   }
+
+   public void testEJB3Endpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
367", "EJB3EndpointService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jbws3367-custom=
ized/EJB3Endpoint?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final EndpointIface port =3D service.getPort(EndpointIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("EJB3 hello", result);
+   }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3367/EJB3Endpoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/EJB3Endpoint.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/EJB3Endpoint.java	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+/**
+ * EJB3 endpoint.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)Stateless
+(a)WebService
+(
+    endpointInterface =3D "org.jboss.test.ws.jaxws.jbws3367.EndpointIface",
+    targetNamespace =3D "org.jboss.test.ws.jaxws.jbws3367"
+)
+public class EJB3Endpoint
+{
+    public String echo(final String s)
+    {
+        return "EJB3 " + s;
+    }
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3367/EndpointIface.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/EndpointIface.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/EndpointIface.java	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)WebService
+(a)SOAPBinding
+public interface EndpointIface
+{
+    String echo(String s);
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3367/OnlyEjbInWarTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/OnlyEjbInWarTestCase.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/OnlyEjbInWarTestCase.java	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3367][AS7-1605] jboss-web.xml ignored for web service root
+ *
+ * This test case tests if only EJB3 endpoints are in war archive.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class OnlyEjbInWarTestCase extends JBossWSTest
+{
+
+   public static Test suite()
+   {
+      return new JBossWSTestSetup(OnlyEjbInWarTestCase.class, "jaxws-jbws3=
367-usecase2.war");
+   }
+
+   public void testEJB3Endpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
367", "EJB3EndpointService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jbws3367-custom=
ized/EJB3Endpoint?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final EndpointIface port =3D service.getPort(EndpointIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("EJB3 hello", result);
+   }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3367/POJOEndpoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/POJOEndpoint.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3367/POJOEndpoint.java	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3367;
+
+import javax.jws.WebService;
+
+/**
+ * POJO endpoint.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)WebService
+(
+    endpointInterface =3D "org.jboss.test.ws.jaxws.jbws3367.EndpointIface",
+    targetNamespace =3D "org.jboss.test.ws.jaxws.jbws3367"
+)
+public class POJOEndpoint
+{
+    public String echo(final String s)
+    {
+        return "POJO " + s;
+    }
+}

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/W=
EB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-=
INF/jboss-web.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-=
INF/jboss-web.xml	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,9 @@
+<?xml version=3D'1.0' encoding=3D'UTF-8'?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+
+  <context-root>/jbws3367-customized</context-root>
+
+</jboss-web>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-=
INF/web.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3367/WEB-=
INF/web.xml	2011-10-13 12:16:03 UTC (rev 15094)
@@ -0,0 +1,19 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<web-app version=3D"3.0"
+         xmlns=3D"http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee http://ja=
va.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         metadata-complete=3D"false">
+
+  <servlet>
+    <servlet-name>POJOEndpoint</servlet-name>
+    <servlet-class>org.jboss.test.ws.jaxws.jbws3367.POJOEndpoint</servlet-=
class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>POJOEndpoint</servlet-name>
+    <url-pattern>/POJOEndpoint</url-pattern>
+  </servlet-mapping>
+
+</web-app>


--===============4148612695829643893==--

From jbossws-commits at lists.jboss.org Thu Oct 13 08:22:11 2011
Content-Type: multipart/mixed; boundary="===============4064238021420845671=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15095 -
 stack/cxf/trunk/modules/testsuite.
Date: Thu, 13 Oct 2011 08:22:11 -0400
Message-ID: <201110131222.p9DCMBsb018622@svn01.web.mwc.hst.phx2.redhat.com>

--===============4064238021420845671==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:22:10 -0400 (Thu, 13 Oct 2011)
New Revision: 15095

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3367][AS7-1605] excluding test for now

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-13 12:16:03 UTC (rev =
15094)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-13 12:22:10 UTC (rev =
15095)
@@ -736,6 +736,9 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
               </excludes>
             </configuration>
           </plugin>
@@ -910,6 +913,9 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
               </excludes>
             </configuration>
           </plugin>
@@ -1031,6 +1037,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
@@ -1277,6 +1286,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>


--===============4064238021420845671==--

From jbossws-commits at lists.jboss.org Thu Oct 13 08:26:38 2011
Content-Type: multipart/mixed; boundary="===============1064623583336516286=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15096 -
 stack/native/trunk/modules/testsuite.
Date: Thu, 13 Oct 2011 08:26:38 -0400
Message-ID: <201110131226.p9DCQc5g018988@svn01.web.mwc.hst.phx2.redhat.com>

--===============1064623583336516286==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:26:38 -0400 (Thu, 13 Oct 2011)
New Revision: 15096

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3367][AS7-1605] excluding test for now

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-13 12:22:10 UTC (r=
ev 15095)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-13 12:26:38 UTC (r=
ev 15096)
@@ -534,10 +534,10 @@
             <configuration>
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Depl=
oyer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
               <excludes>
-                <!--# UsernameTokenHTTPSTestCase requires keystore & trust=
ore in jboss-web tomcat configuration-->
+                <!-- # UsernameTokenHTTPSTestCase requires keystore & trus=
tore in jboss-web tomcat configuration-->
                 <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTo=
kenHTTPSTestCase.*</exclude>
 =

-                <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignore=
d-->
+                <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignor=
ed-->
                 <exclude>org/jboss/test/ws/jaxws/samples/serviceref/Servic=
eRefEJBTestCase.*</exclude>
 =

                 <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -552,6 +552,8 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -675,10 +677,10 @@
             <configuration>
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Depl=
oyer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
               <excludes>
-                <!--# UsernameTokenHTTPSTestCase requires keystore & trust=
ore in jboss-web tomcat configuration-->
+                <!-- # UsernameTokenHTTPSTestCase requires keystore & trus=
tore in jboss-web tomcat configuration-->
                 <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTo=
kenHTTPSTestCase.*</exclude>
 =

-                <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignore=
d-->
+                <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignor=
ed-->
                 <exclude>org/jboss/test/ws/jaxws/samples/serviceref/Servic=
eRefEJBTestCase.*</exclude>
 =

                 <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -693,6 +695,8 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -786,10 +790,10 @@
             <configuration>
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${endorsed.dirs}</argLine>
               <excludes>
-                 <!--# UsernameTokenHTTPSTestCase requires keystore & trus=
tore in jboss-web tomcat configuration-->
+                 <!-- # UsernameTokenHTTPSTestCase requires keystore & tru=
store in jboss-web tomcat configuration-->
                  <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameT=
okenHTTPSTestCase.*</exclude>
 =

-                 <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignor=
ed-->
+                 <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is igno=
red-->
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/Servi=
ceRefEJBTestCase.*</exclude>
 =

                  <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -810,6 +814,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
@@ -963,10 +970,10 @@
             <configuration>
               <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${endorsed.dirs}</argLine>
               <excludes>
-                 <!--# UsernameTokenHTTPSTestCase requires keystore & trus=
tore in jboss-web tomcat configuration-->
+                 <!-- # UsernameTokenHTTPSTestCase requires keystore & tru=
store in jboss-web tomcat configuration-->
                  <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameT=
okenHTTPSTestCase.*</exclude>
 =

-                 <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignor=
ed-->
+                 <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is igno=
red-->
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/Servi=
ceRefEJBTestCase.*</exclude>
 =

                  <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
@@ -987,6 +994,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>


--===============1064623583336516286==--

From jbossws-commits at lists.jboss.org Thu Oct 13 08:59:21 2011
Content-Type: multipart/mixed; boundary="===============3474426321622463572=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15097 - in
 shared-testsuite/trunk/testsuite/src/test:
 java/org/jboss/test/ws/jaxws/jbws3026 and 1 other directory.
Date: Thu, 13 Oct 2011 08:59:21 -0400
Message-ID: <201110131259.p9DCxL01021801@svn01.web.mwc.hst.phx2.redhat.com>

--===============3474426321622463572==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 08:59:20 -0400 (Thu, 13 Oct 2011)
New Revision: 15097

Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3026/MyServiceImpl.java
Log:
[JBWS-3026] fixing test case - use lookup attribute

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-j=
axws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-13 12:26:38 UTC (rev 15096)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-13 12:59:20 UTC (rev 15097)
@@ -993,14 +993,12 @@
 		<jar destfile=3D"${tests.output.dir}/test-libs/jaxws-jbws3026-ejb.jar">
 			<fileset dir=3D"${tests.output.dir}/test-classes">
 				<include name=3D"org/jboss/test/ws/jaxws/jbws3026/MyBean*.class" />
-				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3026/MyService*.class" />
-				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
 			</fileset>
 		</jar>
 		<war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws3026-web.war" we=
bxml=3D"${tests.output.dir}/test-resources/jaxws/jbws3026/WEB-INF/web.xml">
 			<classes dir=3D"${tests.output.dir}/test-classes">
 				<include name=3D"org/jboss/test/ws/jaxws/jbws3026/MyService*.class"/>
-				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3026/MyBean*.class"/>
+				<include name=3D"org/jboss/test/ws/jaxws/jbws3026/MyBeanRemote.class"/>
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3026/*TestCase.class" />
 			</classes>
 		</war>

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws3026/MyServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3026/MyServiceImpl.java	2011-10-13 12:26:38 UTC (rev 15096)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3026/MyServiceImpl.java	2011-10-13 12:59:20 UTC (rev 15097)
@@ -32,9 +32,10 @@
 @WebService(serviceName =3D "MyService", portName =3D "MyServicePort")
 public class MyServiceImpl implements MyService
 {
-    @EJB(mappedName=3D"MyBean/remote")
-    MyBeanRemote bean;
 =

+   @EJB(lookup=3D"java:global/jaxws-jbws3026-ejb/MyBean!org.jboss.test.ws.=
jaxws.jbws3026.MyBeanRemote")
+   MyBeanRemote bean;
+
     /**
      * Invoking method of injected bean =

      */
@@ -49,10 +50,7 @@
    public void thisOneWorks()
    {
       MyBeanRemote bean =3D lookupBean();
-      if (bean !=3D null)
-      {
-         bean.myMethod();
-      }
+      bean.myMethod();
    }
 =

    /**
@@ -66,13 +64,14 @@
       try
       {
          InitialContext ctx =3D new InitialContext();
-         res=3D (MyBeanRemote) ctx.lookup("MyBean/remote");
+         res=3D (MyBeanRemote) ctx.lookup("java:global/jaxws-jbws3026-ejb/=
MyBean!org.jboss.test.ws.jaxws.jbws3026.MyBeanRemote");
       }
       catch (NamingException e)
       {
          System.out.println("Something went wrong");
-         e.printStackTrace();
+         throw new RuntimeException(e);
       }
       return res;
    }
+
 }


--===============3474426321622463572==--

From jbossws-commits at lists.jboss.org Thu Oct 13 10:02:26 2011
Content-Type: multipart/mixed; boundary="===============4999284277805887337=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15098 - in stack/native/trunk:
 modules/core and 1 other directories.
Date: Thu, 13 Oct 2011 10:02:26 -0400
Message-ID: <201110131402.p9DE2QsC007383@svn01.web.mwc.hst.phx2.redhat.com>

--===============4999284277805887337==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 10:02:26 -0400 (Thu, 13 Oct 2011)
New Revision: 15098

Modified:
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/testsuite/pom.xml
   stack/native/trunk/pom.xml
Log:
use jboss spec ejb API version plus fixing endorsement for AS6 targets

Modified: stack/native/trunk/modules/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/pom.xml	2011-10-13 12:59:20 UTC (rev 15=
097)
+++ stack/native/trunk/modules/core/pom.xml	2011-10-13 14:02:26 UTC (rev 15=
098)
@@ -55,8 +55,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-13 12:59:20 UTC (r=
ev 15097)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-13 14:02:26 UTC (r=
ev 15098)
@@ -69,10 +69,6 @@
       <systemPath>${java.home}/../lib/tools.jar</systemPath>
     </dependency>
     <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
@@ -119,6 +115,11 @@
       <version>${jboss.javaee.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 =

   <!-- Build -->
@@ -181,6 +182,13 @@
                   <overWrite>true</overWrite>
                   <outputDirectory>${project.build.directory}/endorsed</ou=
tputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jboss.spec.javax.ejb</groupId>
+                  <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/endorsed</ou=
tputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -427,7 +435,7 @@
       <properties>
         <jboss.version>6.0.0.Final</jboss.version>
         <jbossws.integration.target>jboss600</jbossws.integration.target>
-        <endorsed.dirs>${jboss600.home}/lib/endorsed</endorsed.dirs>
+        <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
       </properties>
       <dependencies>
         <dependency>
@@ -439,6 +447,10 @@
           <exclusions>
             <!-- Exclusion for not depending on the container integration =
-->
             <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-ejb-api</artifactId>
+            </exclusion>
+            <exclusion>
               <groupId>org.jboss.jbossas</groupId>
               <artifactId>jboss-as-webservices</artifactId>
             </exclusion>
@@ -552,6 +564,9 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- # [JBWS-3026] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
                 <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
               </excludes>
@@ -570,7 +585,7 @@
       <properties>
         <jboss.version>6.1.0.Final</jboss.version>
         <jbossws.integration.target>jboss610</jbossws.integration.target>
-        <endorsed.dirs>${jboss610.home}/lib/endorsed</endorsed.dirs>
+        <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs>
       </properties>
       <dependencies>
         <dependency>
@@ -580,6 +595,10 @@
           <type>pom</type>
           <version>${jboss.version}</version>
           <exclusions>
+            <exclusion>
+              <groupId>org.jboss.javaee</groupId>
+              <artifactId>jboss-ejb-api</artifactId>
+            </exclusion>
             <!-- Exclusion for not depending on the container integration =
-->
             <exclusion>
               <groupId>org.jboss.jbossas</groupId>
@@ -695,6 +714,9 @@
                 <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

+                <!-- # [JBWS-3026] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
                 <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
               </excludes>

Modified: stack/native/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/pom.xml	2011-10-13 12:59:20 UTC (rev 15097)
+++ stack/native/trunk/pom.xml	2011-10-13 14:02:26 UTC (rev 15098)
@@ -53,6 +53,7 @@
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
+    <ejb.api.version>1.0.1.Final</ejb.api.version>
     <ant.version>1.7.1</ant.version>
     <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
     <commons.logging.version>1.1.1</commons.logging.version>
@@ -153,11 +154,6 @@
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>javax.ejb</groupId>
-        <artifactId>ejb-api</artifactId>
-        <version>3.0</version>
-      </dependency>
-      <dependency>
         <groupId>javax.jms</groupId>
         <artifactId>jms</artifactId>
         <version>1.1</version>
@@ -289,6 +285,11 @@
         <version>${jaxws.api.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.jboss.spec.javax.ejb</groupId>
+        <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+        <version>${ejb.api.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.spec.javax.xml.rpc</groupId>
         <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
         <version>${jaxrpc.api.version}</version>


--===============4999284277805887337==--

From jbossws-commits at lists.jboss.org Thu Oct 13 10:14:54 2011
Content-Type: multipart/mixed; boundary="===============2944556817615778406=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15099 - in stack/cxf/trunk:
 modules/server and 1 other directories.
Date: Thu, 13 Oct 2011 10:14:54 -0400
Message-ID: <201110131414.p9DEEsRi008272@svn01.web.mwc.hst.phx2.redhat.com>

--===============2944556817615778406==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-13 10:14:54 -0400 (Thu, 13 Oct 2011)
New Revision: 15099

Modified:
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/pom.xml
Log:
use jboss spec ejb API version plus fixing endorsement for AS6 targets

Modified: stack/cxf/trunk/modules/server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/pom.xml	2011-10-13 14:02:26 UTC (rev 150=
98)
+++ stack/cxf/trunk/modules/server/pom.xml	2011-10-13 14:14:54 UTC (rev 150=
99)
@@ -23,8 +23,8 @@
     </dependency>
     =

     <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-13 14:02:26 UTC (rev =
15098)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-13 14:14:54 UTC (rev =
15099)
@@ -58,8 +58,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.ejb</groupId>
-      <artifactId>ejb-api</artifactId>
+      <groupId>org.jboss.spec.javax.ejb</groupId>
+      <artifactId>jboss-ejb-api_3.1_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.jws</groupId>
@@ -196,6 +196,12 @@
                   <type>jar</type>
                   <outputDirectory>${project.build.directory}/endorsed</ou=
tputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jboss.spec.javax.ejb</groupId>
+                  <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+                  <type>jar</type>
+                  <outputDirectory>${project.build.directory}/endorsed</ou=
tputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -676,7 +682,7 @@
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <compilerArgument>-Djava.endorsed.dirs=3D${jboss600.home}/li=
b/endorsed</compilerArgument>
+              <compilerArgument>-Djava.endorsed.dirs=3D${project.build.dir=
ectory}/endorsed</compilerArgument>
             </configuration>
             <executions>
               <execution>
@@ -691,14 +697,14 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${jboss600.home}/lib/endorsed -Dorg.jboss.wsf.spi.=
deployer.Deployer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
+              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${project.build.directory}/endorsed -Dorg.jboss.ws=
f.spi.deployer.Deployer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
               <!-- TODO: replace with maven dependencies -->
               <additionalClasspathElements>
                  <!-- Lib below required just for jaxrpc tests; listed her=
e to prevent CXF stack from depending on Native stack -->
                 <additionalClasspathElement>${jboss.home}/common/lib/jboss=
ws-native-core.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <excludes>
-                <!-- # UsernameTestCase requires trustore in jboss-web tom=
cat configuration-->
+                <!--# UsernameTestCase requires trustore in jboss-web tomc=
at configuration-->
                 <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/Userna=
meTestCase.*</exclude>
                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic=
/UsernameOverTransportTestCase.*</exclude>
 =

@@ -726,19 +732,21 @@
                 <!--# Seems MSFT interop. endpoints are down :(-->
                 <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**<=
/exclude>
 =

-                <!-- # [JBWS-3205] JDKLogManager not used -->
+                <!--# [JBWS-3205] JDKLogManager not used -->
                 <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTes=
tCase*</exclude>
 =

-                <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support av=
ailable on AS 7 only -->
+                <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support ava=
ilable on AS 7 only -->
                 <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
                 <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
 =

-                <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
+                <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -=
->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

-                <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <!--# [JBWS-3026] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
+                <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
               </excludes>
             </configuration>
           </plugin>
@@ -853,7 +861,7 @@
           <plugin>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <compilerArgument>-Djava.endorsed.dirs=3D${jboss610.home}/li=
b/endorsed</compilerArgument>
+              <compilerArgument>-Djava.endorsed.dirs=3D${project.build.dir=
ectory}/endorsed</compilerArgument>
             </configuration>
             <executions>
               <execution>
@@ -868,14 +876,14 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${jboss610.home}/lib/endorsed -Dorg.jboss.wsf.spi.=
deployer.Deployer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
+              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args=
} -Djava.endorsed.dirs=3D${project.build.directory}/endorsed -Dorg.jboss.ws=
f.spi.deployer.Deployer=3Dorg.jboss.wsf.test.DeployerJBoss6</argLine>
               <!-- TODO: replace with maven dependencies -->
               <additionalClasspathElements>
                  <!-- Lib below required just for jaxrpc tests; listed her=
e to prevent CXF stack from depending on Native stack -->
                 <additionalClasspathElement>${jboss.home}/common/lib/jboss=
ws-native-core.jar</additionalClasspathElement>
               </additionalClasspathElements>
               <excludes>
-                <!-- # UsernameTestCase requires trustore in jboss-web tom=
cat configuration-->
+                <!--# UsernameTestCase requires trustore in jboss-web tomc=
at configuration-->
                 <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/Userna=
meTestCase.*</exclude>
                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic=
/UsernameOverTransportTestCase.*</exclude>
 =

@@ -903,19 +911,21 @@
                 <!--# Seems MSFT interop. endpoints are down :(-->
                 <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**<=
/exclude>
 =

-                <!-- # [JBWS-3205] JDKLogManager not used -->
+                <!--# [JBWS-3205] JDKLogManager not used -->
                 <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTes=
tCase*</exclude>
 =

-                <!-- # [JBWS-3125] SOAP over JMS 1.0 deployment support av=
ailable on AS 7 only -->
+                <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support ava=
ilable on AS 7 only -->
                 <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
                 <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
 =

-                <!-- # [AS7-1322] Implemented on AS 7.0.1 or greater only =
-->
+                <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -=
->
                 <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase=
*</exclude>
 =

-                <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
+                <!--# [JBWS-3026] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+
+                <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
               </excludes>
             </configuration>
           </plugin>

Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-13 14:02:26 UTC (rev 15098)
+++ stack/cxf/trunk/pom.xml	2011-10-13 14:14:54 UTC (rev 15099)
@@ -54,6 +54,7 @@
     <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
+    <ejb.api.version>1.0.1.Final</ejb.api.version>
     <cxf.version>2.4.3</cxf.version>
     <cxf.asm.version>3.3</cxf.asm.version>
     <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
@@ -164,14 +165,6 @@
         <version>${jaxws-jboss-httpserver-httpspi.version}</version>
       </dependency>
 =

-      <!-- provided apis -->
-      <dependency>
-        <groupId>javax.ejb</groupId>
-        <artifactId>ejb-api</artifactId>
-        <version>3.0</version>
-        <scope>provided</scope>
-      </dependency>
-      =

       <!-- CXF dependencies -->
       <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -942,6 +935,11 @@
         <version>${jaxws.api.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.jboss.spec.javax.ejb</groupId>
+        <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+        <version>${ejb.api.version}</version>
+      </dependency>
+      <dependency>
         <groupId>com.sun.xml.fastinfoset</groupId>
         <artifactId>FastInfoset</artifactId>
         <version>${fastinfoset.api.version}</version>


--===============2944556817615778406==--

From jbossws-commits at lists.jboss.org Fri Oct 14 03:41:20 2011
Content-Type: multipart/mixed; boundary="===============5753495592671147208=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15100 -
 stack/native/trunk/modules/testsuite.
Date: Fri, 14 Oct 2011 03:41:20 -0400
Message-ID: <201110140741.p9E7fKeB012368@svn01.web.mwc.hst.phx2.redhat.com>

--===============5753495592671147208==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 03:41:20 -0400 (Fri, 14 Oct 2011)
New Revision: 15100

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
enabling tests

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-13 14:14:54 UTC (r=
ev 15099)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-14 07:41:20 UTC (r=
ev 15100)
@@ -1016,15 +1016,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
-                 <!-- TODO: Injections support for WS components -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</=
exclude> <!-- [AS7-1407] affects this test -->
-
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
@@ -1057,7 +1048,7 @@
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</e=
xclude>
                  <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**<=
/exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
-                 =

+
                  <!-- # appclient & jaxrpc client issues -->
                  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocE=
JBTestCase*</exclude>
                  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJ=
SETestCase*</exclude>


--===============5753495592671147208==--

From jbossws-commits at lists.jboss.org Fri Oct 14 03:44:42 2011
Content-Type: multipart/mixed; boundary="===============7964747248800694839=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15101 -
 stack/cxf/trunk/modules/testsuite.
Date: Fri, 14 Oct 2011 03:44:42 -0400
Message-ID: <201110140744.p9E7ig83012696@svn01.web.mwc.hst.phx2.redhat.com>

--===============7964747248800694839==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 03:44:41 -0400 (Fri, 14 Oct 2011)
New Revision: 15101

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling tests

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 07:41:20 UTC (rev =
15100)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 07:44:41 UTC (rev =
15101)
@@ -1296,15 +1296,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
-                 <!-- TODO: Injections support for WS components -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-                 <exclude>org/jboss/test/ws/jaxws/enventry/*JSETestCase*</=
exclude> <!-- [AS7-1407] affects this test -->
-
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1348,7 +1339,7 @@
 =

                  <!-- JAXR not available -->
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
-                 =

+
                  <!-- appclient not available for JAXRPC clients -->
                  <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</ex=
clude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</e=
xclude>


--===============7964747248800694839==--

From jbossws-commits at lists.jboss.org Fri Oct 14 04:11:54 2011
Content-Type: multipart/mixed; boundary="===============3380963546578096260=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15102 -
 stack/cxf/trunk/modules/testsuite.
Date: Fri, 14 Oct 2011 04:11:53 -0400
Message-ID: <201110140811.p9E8Brpp021473@svn01.web.mwc.hst.phx2.redhat.com>

--===============3380963546578096260==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 04:11:53 -0400 (Fri, 14 Oct 2011)
New Revision: 15102

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
fixing jaxrpc tests regression

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 07:44:41 UTC (rev =
15101)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 08:11:53 UTC (rev =
15102)
@@ -1256,7 +1256,7 @@
               <additionalClasspathElements>
                 <!-- Lib below required just for jaxrpc tests; listed here=
 to prevent CXF stack from depending on Native stack -->
                 <!-- JBossWS Native Core version available on 710 -->
-                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta2.jar</a=
dditionalClasspathElement>
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</a=
dditionalClasspathElement>
                 <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
                 <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
               </additionalClasspathElements>


--===============3380963546578096260==--

From jbossws-commits at lists.jboss.org Fri Oct 14 04:55:51 2011
Content-Type: multipart/mixed; boundary="===============6349322313073915717=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15103 - in stack/cxf/trunk/modules:
 dist/management/src/main and 3 other directories.
Date: Fri, 14 Oct 2011 04:55:49 -0400
Message-ID: <201110140855.p9E8tnlZ025755@svn01.web.mwc.hst.phx2.redhat.com>

--===============6349322313073915717==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 04:55:47 -0400 (Fri, 14 Oct 2011)
New Revision: 15103

Removed:
   stack/cxf/trunk/modules/dist/management/src/main/pclwebapp/
Modified:
   stack/cxf/trunk/modules/dist/management/pom.xml
   stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-d=
eploy-macros.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3225] resuscitating JBossWS console for CXF integration - it is possi=
ble because since now JBossWS Native is present on AS7 and we're able to re=
ference it's PortLinkServlet

Modified: stack/cxf/trunk/modules/dist/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-14 08:11:53 UTC=
 (rev 15102)
+++ stack/cxf/trunk/modules/dist/management/pom.xml	2011-10-14 08:55:47 UTC=
 (rev 15103)
@@ -55,45 +55,20 @@
       </plugin>
       <plugin>
          <artifactId>maven-war-plugin</artifactId>
-         <groupId>org.apache.maven.plugins</groupId>
-         <executions>
-           <execution>
-             <id>console</id>
-             <phase>package</phase>
-             <goals>
-               <goal>war</goal>
-             </goals>
-             <configuration>
-               <warName>jbossws-cxf-management</warName>
-               <warSourceDirectory>${basedir}/src/main/webapp</warSourceDi=
rectory>
-               <webappDirectory>${project.build.directory}/jbossws-cxf-man=
agement</webappDirectory>
-               <webResources>
-                 <webResource>
-                   <directory>${basedir}/src/main/webapp</directory>
-                   <filtering>true</filtering>
-                 </webResource>
-               </webResources>
-             </configuration>
-           </execution>
-           <execution>
-             <id>pcl</id>
-             <phase>package</phase>
-             <goals>
-               <goal>war</goal>
-             </goals>
-             <configuration>
-               <warName>jbossws-cxf-management-pcl</warName>
-               <warSourceDirectory>${basedir}/src/main/pclwebapp</warSourc=
eDirectory>
-               <webappDirectory>${project.build.directory}/jbossws-cxf-man=
agement-pcl</webappDirectory>
-               <webResources>
-                 <webResource>
-                   <directory>${basedir}/src/main/pclwebapp</directory>
-                   <filtering>true</filtering>
-                 </webResource>
-               </webResources>
-             </configuration>
-           </execution>
-         </executions>
+         <configuration>
+           <warName>jbossws-cxf-management</warName>
+           <webResources>
+             <resource>
+               <directory>src/main/webapp</directory>
+               <filtering>true</filtering>
+             </resource>
+           </webResources>
+           <archive>
+             <manifestEntries>
+               <Dependencies>org.jboss.as.webservices services,org.jboss.w=
s.native.jbossws-native-core services,org.jboss.ws.common</Dependencies>
+             </manifestEntries>
+           </archive>
+         </configuration>
       </plugin>
     </plugins>
   </build>

Modified: stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/w=
eb.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml=
	2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/dist/management/src/main/webapp/WEB-INF/web.xml=
	2011-10-14 08:55:47 UTC (rev 15103)
@@ -15,6 +15,11 @@
     <servlet-class>org.jboss.ws.common.management.ContextServlet</servlet-=
class>
   </servlet>
 =

+  <servlet>
+    <servlet-name>PortComponentLinkServlet</servlet-name>
+    <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</serv=
let-class>
+  </servlet>
+  =

   <!-- now the mappings -->
   =

   <servlet-mapping>
@@ -22,6 +27,11 @@
     <url-pattern>/services/*</url-pattern>
   </servlet-mapping>
 =

+  <servlet-mapping>
+    <servlet-name>PortComponentLinkServlet</servlet-name>
+    <url-pattern>/pclink</url-pattern>
+  </servlet-mapping>
+
    <!-- A security constraint that restricts access
    <security-constraint>
      <web-resource-collection>
@@ -45,7 +55,7 @@
    <security-role>
       <role-name>friend</role-name>
    </security-role>
-
+  =

   <!-- =

   currently the W3C haven't settled on a media type for WSDL;
   http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft

Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jb=
ossws-deploy-macros.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-=
deploy-macros.xml	2011-10-14 08:11:53 UTC (rev 15102)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-=
deploy-macros.xml	2011-10-14 08:55:47 UTC (rev 15103)
@@ -455,6 +455,8 @@
     <fail message=3D"installserver must be specified" unless=3D"installser=
ver"/>
     <fail message=3D"thirdpartydir must be specified" unless=3D"thirdparty=
dir"/>
     <macro-deploy-jbossws-modules targetdir=3D"${installserver}/modules" t=
hirdpartydir=3D"${thirdpartydir}" jbossid=3D"${jbossid}"/>
+    <macro-deploy-jbossws-deployment targetdir=3D"${installserver}/standal=
one/deployments/jbossws-console.war" thirdpartydir=3D"${thirdpartydir}"/>
+    <touch file=3D"${installserver}/standalone/deployments/jbossws-console=
.war.dodeploy"/>
   </target>
 =

   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 08:11:53 UTC (rev =
15102)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 08:55:47 UTC (rev =
15103)
@@ -1328,9 +1328,6 @@
                  <!-- # [JBWS-3205] JDKLogManager not used -->
                  <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTe=
stCase*</exclude>
 =

-                 <!-- # [JBWS-3225] jbossws console not yet available -->
-                 <exclude>org/jboss/test/ws/console/**</exclude>
-
                  <!-- # [JBWS-3227] handlers config file not found on clas=
spath -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
 =



--===============6349322313073915717==--

From jbossws-commits at lists.jboss.org Fri Oct 14 05:44:54 2011
Content-Type: multipart/mixed; boundary="===============5398986910955396807=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15104 -
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/enventry.
Date: Fri, 14 Oct 2011 05:44:54 -0400
Message-ID: <201110140944.p9E9is6f003397@svn01.web.mwc.hst.phx2.redhat.com>

--===============5398986910955396807==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 05:44:53 -0400 (Fri, 14 Oct 2011)
New Revision: 15104

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/e=
nventry/EnvEntryBeanJSE.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/e=
nventry/EnvEntryEndpoint.java
Log:
fixing test case - it was failing on CXF integration

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/enventry/EnvEntryBeanJSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
enventry/EnvEntryBeanJSE.java	2011-10-14 08:55:47 UTC (rev 15103)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
enventry/EnvEntryBeanJSE.java	2011-10-14 09:44:53 UTC (rev 15104)
@@ -28,7 +28,7 @@
 =

 import org.jboss.logging.Logger;
 =

-(a)WebService(serviceName =3D "EnvEntryService", targetNamespace =3D "http=
://org.jboss.ws/enventry")
+(a)WebService(serviceName =3D "EnvEntryService", portName=3D"EnvEntryPort"=
, targetNamespace =3D "http://org.jboss.ws/enventry")
 @SOAPBinding(style =3D SOAPBinding.Style.RPC)
 public class EnvEntryBeanJSE
 {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/enventry/EnvEntryEndpoint.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
enventry/EnvEntryEndpoint.java	2011-10-14 08:55:47 UTC (rev 15103)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
enventry/EnvEntryEndpoint.java	2011-10-14 09:44:53 UTC (rev 15104)
@@ -26,7 +26,7 @@
 import javax.jws.soap.SOAPBinding;
 =

 =

-(a)WebService(serviceName=3D"EnvEntryService", targetNamespace =3D "http:/=
/org.jboss.ws/enventry")
+(a)WebService(serviceName=3D"EnvEntryService", portName=3D"EnvEntryPort", =
targetNamespace =3D "http://org.jboss.ws/enventry")
 @SOAPBinding(style =3D SOAPBinding.Style.RPC)
 public interface EnvEntryEndpoint
 {


--===============5398986910955396807==--

From jbossws-commits at lists.jboss.org Fri Oct 14 06:28:24 2011
Content-Type: multipart/mixed; boundary="===============1602068634311606719=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15105 -
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/benchmark/test/datatypes.
Date: Fri, 14 Oct 2011 06:28:23 -0400
Message-ID: <201110141028.p9EASNtT013638@svn01.web.mwc.hst.phx2.redhat.com>

--===============1602068634311606719==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: rsvoboda(a)redhat.com
Date: 2011-10-14 06:28:23 -0400 (Fri, 14 Oct 2011)
New Revision: 15105

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/b=
enchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/b=
enchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
Log:
JBWS-3368: POJO endpoinds contained @Stateless annotation

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java	2011-10-14 09:44:5=
3 UTC (rev 15104)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
benchmark/test/datatypes/EndpointPOJOWrappedDocImpl.java	2011-10-14 10:28:2=
3 UTC (rev 15105)
@@ -28,7 +28,6 @@
 import java.util.Date;
 import java.util.List;
 =

-import javax.ejb.Stateless;
 import javax.jws.WebService;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
@@ -43,7 +42,6 @@
  * @since 09-Mar-2010
  */
 @WebService(serviceName =3D "EndpointWrappedDocService", portName =3D "End=
pointWrappedDocPort", endpointInterface =3D "org.jboss.test.ws.jaxws.benchm=
ark.test.datatypes.EndpointWrappedDoc")
-(a)Stateless
 public class EndpointPOJOWrappedDocImpl implements EndpointDoc
 {
    private static Duration dayDuration;

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java	2011-10-14 09:44:5=
3 UTC (rev 15104)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
benchmark/test/datatypes/EndpointPOJOWrappedRPCImpl.java	2011-10-14 10:28:2=
3 UTC (rev 15105)
@@ -28,7 +28,6 @@
 import java.util.Date;
 import java.util.List;
 =

-import javax.ejb.Stateless;
 import javax.jws.WebService;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
@@ -43,7 +42,6 @@
  * @since 09-Mar-2010
  */
 @WebService(serviceName =3D "EndpointWrappedRPCService", portName =3D "End=
pointWrappedRPCPort", endpointInterface =3D "org.jboss.test.ws.jaxws.benchm=
ark.test.datatypes.EndpointWrappedRPC")
-(a)Stateless
 public class EndpointPOJOWrappedRPCImpl implements EndpointRPC
 {
    private static Duration dayDuration;


--===============1602068634311606719==--

From jbossws-commits at lists.jboss.org Fri Oct 14 08:36:19 2011
Content-Type: multipart/mixed; boundary="===============5748853581444935366=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15106 -
 shared-testsuite/trunk/testsuite/src/test/ant-import.
Date: Fri, 14 Oct 2011 08:36:19 -0400
Message-ID: <201110141236.p9ECaJBp005105@svn01.web.mwc.hst.phx2.redhat.com>

--===============5748853581444935366==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 08:36:18 -0400 (Fri, 14 Oct 2011)
New Revision: 15106

Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
fixing test case - include all necessary sources so AS7 WS deployer don't c=
omplain

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-j=
axws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-14 10:28:23 UTC (rev 15105)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-14 12:36:18 UTC (rev 15106)
@@ -1033,7 +1033,7 @@
 		<war warfile=3D"${tests.output.dir}/test-libs/jbws3140-server.war" webxm=
l=3D"${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.x=
ml">
 			<classes dir=3D"${tests.output.dir}/test-classes">
 				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.class" />
-				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/server*.xml" />
+				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.xml" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*EndpointService.cla=
ss" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" />
@@ -1045,7 +1045,7 @@
 		<war warfile=3D"${tests.output.dir}/test-libs/jbws3140-responses-server.=
war" webxml=3D"${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Se=
rver/web.xml">
 			<classes dir=3D"${tests.output.dir}/test-classes">
 				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.class" />
-				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/server*.xml" />
+				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.xml" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" />
 			</classes>
@@ -1059,7 +1059,7 @@
 		<war warfile=3D"${tests.output.dir}/test-libs/jbws3140-client.war" webxm=
l=3D"${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Client/web.x=
ml">
 			<classes dir=3D"${tests.output.dir}/test-classes">
 				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.class" />
-				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/client*.xml" />
+				<include name=3D"org/jboss/test/ws/jaxws/jbws3140/*.xml" />
 				<exclude name=3D"org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" />
 			</classes>
 			<classes dir=3D"${tests.output.dir}/test-resources/jaxws/jbws3140">


--===============5748853581444935366==--

From jbossws-commits at lists.jboss.org Fri Oct 14 08:58:24 2011
Content-Type: multipart/mixed; boundary="===============3728694186916361634=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15107 -
 stack/native/trunk/modules/testsuite.
Date: Fri, 14 Oct 2011 08:58:24 -0400
Message-ID: <201110141258.p9ECwOP6007084@svn01.web.mwc.hst.phx2.redhat.com>

--===============3728694186916361634==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 08:58:24 -0400 (Fri, 14 Oct 2011)
New Revision: 15107

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-14 12:36:18 UTC (r=
ev 15106)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-14 12:58:24 UTC (r=
ev 15107)
@@ -1016,6 +1016,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- # [JBWS-3232][JBMETA-339] waiting for metadata beta1=
4 release -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
@@ -1033,9 +1036,6 @@
                  <!-- TODO: will we support wars bundled in jars on AS7? -=
->
                  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
 =

-                 <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Na=
me 'service' not found in context 'env' -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
                  <!-- TODO: tests using org.jboss.ejb3.client.ClientLaunch=
er -->
                  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclud=
e>
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>
@@ -1157,7 +1157,7 @@
                  <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTe=
stCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*=
</exclude>
                  <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/Add=
ressingReplyToTestCase*</exclude>
-                 =

+
                  <!-- # webservices-description in jboss-web.xml / jboss.x=
ml -->
                  <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</=
exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</e=
xclude>
@@ -1170,15 +1170,15 @@
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSign=
upTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCa=
se*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublish=
TestCase*</exclude>
-                 =

+
                  <!-- # unpackaged EAR deployment failure -->
                  <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase=
*</exclude>
-                 =

+
                  <!-- # javaType [javax.xml.transform.Source] is not assig=
nable from attachment content: java.lang.String -->
                  <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentS=
AAJTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentP=
roxyTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/swa/AttachmentD=
IITestCase*</exclude>
-                 =

+
               </excludes>
             </configuration>
           </plugin>


--===============3728694186916361634==--

From jbossws-commits at lists.jboss.org Fri Oct 14 09:00:30 2011
Content-Type: multipart/mixed; boundary="===============4377777987016045903=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15108 -
 stack/cxf/trunk/modules/testsuite.
Date: Fri, 14 Oct 2011 09:00:30 -0400
Message-ID: <201110141300.p9ED0UPP013449@svn01.web.mwc.hst.phx2.redhat.com>

--===============4377777987016045903==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-14 09:00:30 -0400 (Fri, 14 Oct 2011)
New Revision: 15108

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 12:58:24 UTC (rev =
15107)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-14 13:00:30 UTC (rev =
15108)
@@ -1296,6 +1296,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata=
 beta14 release -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
+
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1307,9 +1310,6 @@
                  <!-- TODO: will we support wars bundled in jars on AS7? -=
->
                  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
 =

-                 <!-- # [JBWS-3232] javax.naming.NameNotFoundException: Na=
me 'service' not found in context 'env' -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
                  <!-- TODO: tests using org.jboss.ejb3.client.ClientLaunch=
er -->
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>
 =



--===============4377777987016045903==--

From jbossws-commits at lists.jboss.org Mon Oct 17 05:17:19 2011
Content-Type: multipart/mixed; boundary="===============6884505718965875981=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15109 - hudson/trunk/scripts.
Date: Mon, 17 Oct 2011 05:17:19 -0400
Message-ID: <201110170917.p9H9HJvi010123@svn01.web.mwc.hst.phx2.redhat.com>

--===============6884505718965875981==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 05:17:19 -0400 (Mon, 17 Oct 2011)
New Revision: 15109

Modified:
   hudson/trunk/scripts/jboss.sh
Log:
remove preview config - we're part of standart config now

Modified: hudson/trunk/scripts/jboss.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/scripts/jboss.sh	2011-10-14 13:00:30 UTC (rev 15108)
+++ hudson/trunk/scripts/jboss.sh	2011-10-17 09:17:19 UTC (rev 15109)
@@ -12,7 +12,7 @@
 if [ -f "$JBOSS_HOME/bin/run.sh" ]; then
    RUN_CMD=3D"$DIRNAME/runjboss.sh -b $BINDADDR"
 else
-   RUN_CMD=3D"$JBOSS_HOME/bin/standalone.sh -server-config standalone-prev=
iew.xml"
+   RUN_CMD=3D"$JBOSS_HOME/bin/standalone.sh"
    export LAUNCH_JBOSS_IN_BACKGROUND=3D"true"
    export JBOSS_PIDFILE=3D$PIDFILE
 fi


--===============6884505718965875981==--

From jbossws-commits at lists.jboss.org Mon Oct 17 05:25:32 2011
Content-Type: multipart/mixed; boundary="===============7677312816327220697=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15110 -
 stack/cxf/trunk/modules/testsuite.
Date: Mon, 17 Oct 2011 05:25:32 -0400
Message-ID: <201110170925.p9H9PWKp010947@svn01.web.mwc.hst.phx2.redhat.com>

--===============7677312816327220697==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 05:25:32 -0400 (Mon, 17 Oct 2011)
New Revision: 15110

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-17 09:17:19 UTC (rev =
15109)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-17 09:25:32 UTC (rev =
15110)
@@ -1296,9 +1296,12 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata=
 beta14 release -->
+                 <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata=
 Beta14 release -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
 =

+                 <!-- # [JBWS-3227][MODULES-109] waiting for jboss modules=
 1.0.3.GA release -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
+
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1328,9 +1331,6 @@
                  <!-- # [JBWS-3205] JDKLogManager not used -->
                  <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTe=
stCase*</exclude>
 =

-                 <!-- # [JBWS-3227] handlers config file not found on clas=
spath -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
-
                  <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFil=
eTestCase on AS7 -->
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAut=
horizationCustomFileTestCase*</exclude>
 =



--===============7677312816327220697==--

From jbossws-commits at lists.jboss.org Mon Oct 17 06:05:09 2011
Content-Type: multipart/mixed; boundary="===============8499065713591841118=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15111 - in stack/cxf/trunk/modules:
 testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging and 1
 other directory.
Date: Mon, 17 Oct 2011 06:05:09 -0400
Message-ID: <201110171005.p9HA59F2020822@svn01.web.mwc.hst.phx2.redhat.com>

--===============8499065713591841118==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 06:05:09 -0400 (Mon, 17 Oct 2011)
New Revision: 15111

Removed:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test=
/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
Modified:
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6=
.xml
Log:
[JBWS-3205] getting rid of org.jboss.ws.common.logging package

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-con=
fig-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-17 09:25:32 UTC (rev 15110)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-17 10:05:09 UTC (rev 15111)
@@ -10,15 +10,6 @@
     <property name=3D"mbeanServer"><inject bean=3D"WSMBeanServerLocator" p=
roperty=3D"mbeanServer"/></property>
   </bean>
 =

-  <!-- Logging redirector -->
-  <bean name=3D"JDKLogRedirector" class=3D"org.jboss.ws.common.logging.JDK=
LogRedirector">
-    <property name=3D"namespaces">
-      <list class=3D"java.util.LinkedList" elementClass=3D"java.lang.Strin=
g">
-        <value>org.apache.cxf</value>
-      </list>
-    </property>
-  </bean>
-  =

   <!-- This should actually be in the stack-agnostic config file, it's her=
e to avoid installing a CI -->
   <bean name=3D"WSDescriptorParser" class=3D"org.jboss.ws.common.deploymen=
t.WebservicesDescriptorParserImpl">
     <property name=3D"descriptorName">webservices.xml</property>

Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jbos=
s/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/cxf/logging/JDKLoggingTestCase.java	2011-10-17 09:25:32 UTC (rev=
 15110)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/cxf/logging/JDKLoggingTestCase.java	2011-10-17 10:05:09 UTC (rev=
 15111)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.logging;
-
-import java.util.logging.Handler;
-import java.util.logging.Logger;
-
-import org.jboss.ws.common.logging.JDKLogHandler;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test redirection of JDK logging on the client side =

- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 18-Dec-2007
- */
-public class JDKLoggingTestCase extends JBossWSTest
-{
-   public void testLogging() throws Exception
-   {
-      Logger log =3D Logger.getLogger(JDKLoggingTestCase.class.getName());
-      assertHandlers(log);
-
-      log =3D Logger.getLogger(JDKLoggingTestCase.class.getName());
-      assertHandlers(log);
-
-      log.info("test message");
-   }
-
-   private void assertHandlers(Logger log)
-   {
-      int found =3D 0;
-      for (Handler handler : log.getHandlers())
-      {
-         if (handler instanceof JDKLogHandler)
-            found++;
-      }
-      assertEquals("Expected one jboss handler", 1, found);
-   }
-}


--===============8499065713591841118==--

From jbossws-commits at lists.jboss.org Mon Oct 17 06:05:40 2011
Content-Type: multipart/mixed; boundary="===============8349076314603451216=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15112 -
 common/trunk/src/main/java/org/jboss/ws/common.
Date: Mon, 17 Oct 2011 06:05:40 -0400
Message-ID: <201110171005.p9HA5eTj020833@svn01.web.mwc.hst.phx2.redhat.com>

--===============8349076314603451216==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 06:05:40 -0400 (Mon, 17 Oct 2011)
New Revision: 15112

Removed:
   common/trunk/src/main/java/org/jboss/ws/common/logging/
Log:
[JBWS-3205] getting rid of org.jboss.ws.common.logging package


--===============8349076314603451216==--

From jbossws-commits at lists.jboss.org Mon Oct 17 06:54:56 2011
Content-Type: multipart/mixed; boundary="===============6236615428278479620=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15113 -
 stack/cxf/trunk/modules/resources/src/main/resources/resources.
Date: Mon, 17 Oct 2011 06:54:56 -0400
Message-ID: <201110171054.p9HAsuCF024970@svn01.web.mwc.hst.phx2.redhat.com>

--===============6236615428278479620==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 06:54:56 -0400 (Mon, 17 Oct 2011)
New Revision: 15113

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-d=
eploy-macros.xml
Log:
[JBWS-3225] resuscitating JBossWS console for CXF JAXRPC integration as well

Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jb=
ossws-deploy-macros.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-=
deploy-macros.xml	2011-10-17 10:05:40 UTC (rev 15112)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-=
deploy-macros.xml	2011-10-17 10:54:56 UTC (rev 15113)
@@ -254,23 +254,6 @@
   </macrodef>
 =

   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-  <!-- Deploy JBossWS Console + PortComponentLink servlet                 =
-->
-  <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
-  <macrodef name=3D"macro-deploy-jbossws-jaxrpc-deployment">
-    <attribute name=3D"thirdpartydir"/>
-    <attribute name=3D"targetdir"/>
-    <sequential>
-      <mkdir dir=3D"@{targetdir}"/>
-      <unzip dest=3D"@{targetdir}">
-        <fileset dir=3D"@{thirdpartydir}">
-          <include name=3D"**/jbossws-cxf-management-pcl.war"/>
-        </fileset>
-      </unzip>
-    </sequential>
-  </macrodef>
-
-  <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
   <!-- Deploy Deployers                                                   =
-->
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
 =

@@ -445,7 +428,7 @@
     <macro-deploy-jbossws-lib targetdir=3D"${installserver}/../../lib" thi=
rdpartydir=3D"${thirdpartydir}"/>
     <macro-deploy-jbossws-endorsed targetdir=3D"${installserver}/../../lib=
/endorsed" thirdpartydir=3D"${thirdpartydir}"/>
     <macro-deploy-jbossws-server-lib targetdir=3D"${installserver}/../../c=
ommon/lib" thirdpartydir=3D"${thirdpartydir}"/>
-    <macro-deploy-jbossws-jaxrpc-deployment targetdir=3D"${installserver}/=
deploy/jbossws-console.war" thirdpartydir=3D"${thirdpartydir}"/>
+    <macro-deploy-jbossws-deployment targetdir=3D"${installserver}/deploy/=
jbossws-console.war" thirdpartydir=3D"${thirdpartydir}"/>
     <macro-deploy-jbossws-deployers targetdir=3D"${installserver}/deployer=
s/jbossws.deployer/" thirdpartydir=3D"${thirdpartydir}" artifactsdir=3D"${a=
rtifactsdir}" jbossid=3D"${jbossid}"/>
     <macro-deploy-jbossws-jaxrpc-deployers targetdir=3D"${installserver}/d=
eployers/jbossws-jaxrpc.deployer/" artifactsdir=3D"${artifactsdir}" jbossid=
=3D"${jbossid}"/>
     <macro-deploy-juddi-sar targetdir=3D"${installserver}/deploy/juddi-ser=
vice.sar" thirdpartydir=3D"${thirdpartydir}"/>


--===============6236615428278479620==--

From jbossws-commits at lists.jboss.org Mon Oct 17 07:06:12 2011
Content-Type: multipart/mixed; boundary="===============1375102765783675905=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15114 -
 stack/cxf/trunk/modules/testsuite.
Date: Mon, 17 Oct 2011 07:06:11 -0400
Message-ID: <201110171106.p9HB6BBi032479@svn01.web.mwc.hst.phx2.redhat.com>

--===============1375102765783675905==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 07:06:11 -0400 (Mon, 17 Oct 2011)
New Revision: 15114

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-17 10:54:56 UTC (rev =
15113)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-17 11:06:11 UTC (rev =
15114)
@@ -1296,9 +1296,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- # [JBWS-3232][JBMETA-339] waiting for jboss metadata=
 Beta14 release -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
                  <!-- # [JBWS-3227][MODULES-109] waiting for jboss modules=
 1.0.3.GA release -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
 =



--===============1375102765783675905==--

From jbossws-commits at lists.jboss.org Mon Oct 17 07:07:13 2011
Content-Type: multipart/mixed; boundary="===============5707474730098501331=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15115 -
 stack/native/trunk/modules/testsuite.
Date: Mon, 17 Oct 2011 07:07:13 -0400
Message-ID: <201110171107.p9HB7DBA032492@svn01.web.mwc.hst.phx2.redhat.com>

--===============5707474730098501331==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-17 07:07:13 -0400 (Mon, 17 Oct 2011)
New Revision: 15115

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-17 11:06:11 UTC (r=
ev 15114)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-17 11:07:13 UTC (r=
ev 15115)
@@ -1016,9 +1016,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- # [JBWS-3232][JBMETA-339] waiting for metadata beta1=
4 release -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
-
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>


--===============5707474730098501331==--

From jbossws-commits at lists.jboss.org Mon Oct 17 13:15:16 2011
Content-Type: multipart/mixed; boundary="===============7682249925744513726=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15116 -
 stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config.
Date: Mon, 17 Oct 2011 13:15:16 -0400
Message-ID: <201110171715.p9HHFGRi005767@svn01.web.mwc.hst.phx2.redhat.com>

--===============7682249925744513726==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-17 13:15:15 -0400 (Mon, 17 Oct 2011)
New Revision: 15116

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/conf=
ig/JBossWSConfigFactory.java
Log:
[JBWS-3369] Use native core module classloader for getting default native s=
tack confs instead of ASIL classloader


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metada=
ta/config/JBossWSConfigFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/con=
fig/JBossWSConfigFactory.java	2011-10-17 11:07:13 UTC (rev 15115)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/con=
fig/JBossWSConfigFactory.java	2011-10-17 17:15:15 UTC (rev 15116)
@@ -72,9 +72,8 @@
    private JBossWSConfigFactory(ClassLoader loader)
    {
       //use a delegate classloader: first try lookup using the provided cl=
assloader,
-      //otherwise use server integration classloader which has the default=
 configuration
-      final ClassLoader cl =3D ClassLoaderProvider.getDefaultProvider().ge=
tServerIntegrationClassLoader();
-      this.loader =3D new DelegateClassLoader(cl, loader);
+      //otherwise use the native core module classloader (the default conf=
s are there)
+      this.loader =3D new DelegateClassLoader(JBossWSConfigFactory.class.g=
etClassLoader(), loader);
    }
 =

    /** Create a new instance of the factory


--===============7682249925744513726==--

From jbossws-commits at lists.jboss.org Tue Oct 18 02:20:32 2011
Content-Type: multipart/mixed; boundary="===============4222453287039391871=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15117 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 18 Oct 2011 02:20:31 -0400
Message-ID: <201110180620.p9I6KV4u026065@svn01.web.mwc.hst.phx2.redhat.com>

--===============4222453287039391871==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 02:20:30 -0400 (Tue, 18 Oct 2011)
New Revision: 15117

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-17 17:15:15 UTC (rev =
15116)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 06:20:30 UTC (rev =
15117)
@@ -1296,9 +1296,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- # [JBWS-3227][MODULES-109] waiting for jboss modules=
 1.0.3.GA release -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
-
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1325,9 +1322,6 @@
                  <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbT=
estCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>
 =

-                 <!-- # [JBWS-3205] JDKLogManager not used -->
-                 <exclude>org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTe=
stCase*</exclude>
-
                  <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFil=
eTestCase on AS7 -->
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAut=
horizationCustomFileTestCase*</exclude>
 =



--===============4222453287039391871==--

From jbossws-commits at lists.jboss.org Tue Oct 18 05:17:27 2011
Content-Type: multipart/mixed; boundary="===============5666228425665716933=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15118 - in stack/cxf/trunk/modules:
 testsuite and 1 other directory.
Date: Tue, 18 Oct 2011 05:17:27 -0400
Message-ID: <201110180917.p9I9HR0i028543@svn01.web.mwc.hst.phx2.redhat.com>

--===============5666228425665716933==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 05:17:27 -0400 (Tue, 18 Oct 2011)
New Revision: 15118

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/springf=
ramework/spring/main/module.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3370] adding org.jboss.vfs so spring-core can see its classes

Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/=
springframework/spring/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/spring=
framework/spring/main/module.xml	2011-10-18 06:20:30 UTC (rev 15117)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/spring=
framework/spring/main/module.xml	2011-10-18 09:17:27 UTC (rev 15118)
@@ -33,5 +33,6 @@
         <module name=3D"javax.jms.api" />
         <module name=3D"javax.annotation.api" />
         <module name=3D"org.apache.commons.logging" />
+        <module name=3D"org.jboss.vfs" />
     </dependencies>
 </module>

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 06:20:30 UTC (rev =
15117)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 09:17:27 UTC (rev =
15118)
@@ -1317,7 +1317,6 @@
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 =

                  <!-- TODO: investigate -->
-                 <exclude>org/jboss/test/ws/jaxws/cxf/webserviceref/WebSer=
viceRefServletTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbT=
estCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>


--===============5666228425665716933==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:13:38 2011
Content-Type: multipart/mixed; boundary="===============1335026277503955480=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15119 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 18 Oct 2011 06:13:38 -0400
Message-ID: <201110181013.p9IADcjQ007616@svn01.web.mwc.hst.phx2.redhat.com>

--===============1335026277503955480==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:13:37 -0400 (Tue, 18 Oct 2011)
New Revision: 15119

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 09:17:27 UTC (rev =
15118)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:13:37 UTC (rev =
15119)
@@ -1296,6 +1296,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- # [JBWS-3371] waiting for merge upstream -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
@@ -1317,7 +1320,6 @@
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 =

                  <!-- TODO: investigate -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbT=
estCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>
 =



--===============1335026277503955480==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:24:10 2011
Content-Type: multipart/mixed; boundary="===============2137768201123862716=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15120 -
 common/trunk/src/main/java/org/jboss/ws/common/utils.
Date: Tue, 18 Oct 2011 06:24:09 -0400
Message-ID: <201110181024.p9IAO9oa008477@svn01.web.mwc.hst.phx2.redhat.com>

--===============2137768201123862716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 06:24:09 -0400 (Tue, 18 Oct 2011)
New Revision: 15120

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolv=
er.java
Log:
[JBWS-3369] Allow providing a classloader for entities properties file retr=
ieval in JBossWSEntityResolver


Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntit=
yResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResol=
ver.java	2011-10-18 10:13:37 UTC (rev 15119)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResol=
ver.java	2011-10-18 10:24:09 UTC (rev 15120)
@@ -59,19 +59,32 @@
    =

    // provide logging
    private static final Logger log =3D Logger.getLogger(JBossWSEntityResol=
ver.class);
+   =

+   private ClassLoader additionalClassLoader;
 =

    public JBossWSEntityResolver()
    {
-	  this("META-INF/jbossws-entities.properties");
+      this(ClassLoaderProvider.getDefaultProvider().getServerIntegrationCl=
assLoader());
    }
    =

+   public JBossWSEntityResolver(ClassLoader loader)
+   {
+      this("META-INF/jbossws-entities.properties", loader);
+   }
+   =

    public JBossWSEntityResolver(final String entitiesResource)
    {
+      this(entitiesResource, ClassLoaderProvider.getDefaultProvider().getS=
erverIntegrationClassLoader());
+   }
+   =

+   public JBossWSEntityResolver(final String entitiesResource, final Class=
Loader loader)
+   {
       super();
       =

+      this.additionalClassLoader =3D loader;
       Properties props =3D null;
-      ClassLoader loader =3D SecurityActions.getContextClassLoader();
-      Map<String, Properties> map =3D propertiesMap.get(loader);
+      ClassLoader tccl =3D SecurityActions.getContextClassLoader();
+      Map<String, Properties> map =3D propertiesMap.get(tccl);
       if (map !=3D null && map.containsKey(entitiesResource))
       {
          props =3D map.get(entitiesResource);
@@ -81,10 +94,10 @@
          if (map =3D=3D null)
          {
             map =3D new ConcurrentHashMap<String, Properties>();
-            propertiesMap.put(loader, map);
+            propertiesMap.put(tccl, map);
          }
          // load entities
-         props =3D loadEntitiesMappingFromClasspath(entitiesResource, load=
er);
+         props =3D loadEntitiesMappingFromClasspath(entitiesResource, tccl=
, this.additionalClassLoader);
          if (props.size() =3D=3D 0)
             throw new IllegalArgumentException(BundleUtils.getMessage(bund=
le, "NO_ENTITIES_MAPPING_DEFINED_IN_RESOURCE_FILE",  entitiesResource));
          map.put(entitiesResource, props);
@@ -101,16 +114,16 @@
 	   }
    }
    =

-   private Properties loadEntitiesMappingFromClasspath(final String entiti=
esResource, final ClassLoader classLoader)
+   private Properties loadEntitiesMappingFromClasspath(final String entiti=
esResource, final ClassLoader classLoader, final ClassLoader additionalClas=
sLoader)
    {
       return AccessController.doPrivileged(new PrivilegedAction<Properties=
>()
       {
          public Properties run()
          {
-            //use a delegate classloader: first try lookup using the provi=
ded classloader,
-            //otherwise use server integration classloader which has the d=
efault configuration
-            final ClassLoader intCl =3D ClassLoaderProvider.getDefaultProv=
ider().getServerIntegrationClassLoader();
-            InputStream is =3D new DelegateClassLoader(intCl, classLoader)=
.getResourceAsStream(entitiesResource);
+            //use a delegate classloader: first try lookup using the provi=
ded (tccl) classloader,
+            //otherwise use the constructor provided classloader if any (t=
hat defaults to the
+            //server integration classloader which should have the default=
 configuration)
+            InputStream is =3D new DelegateClassLoader(additionalClassLoad=
er, classLoader).getResourceAsStream(entitiesResource);
             // get stream
             if (is =3D=3D null)
                throw new IllegalArgumentException(BundleUtils.getMessage(b=
undle, "RESOURCE_NOT_FOUND",  entitiesResource ));
@@ -160,7 +173,7 @@
            final ClassLoader origLoader =3D SecurityActions.getContextClas=
sLoader();
            try
            {
-               SecurityActions.setContextClassLoader(ClassLoaderProvider.g=
etDefaultProvider().getServerIntegrationClassLoader());
+               SecurityActions.setContextClassLoader(this.additionalClassL=
oader);
                is =3D super.loadClasspathResource(resource, trace);
            }
            finally


--===============2137768201123862716==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:28:11 2011
Content-Type: multipart/mixed; boundary="===============8654162815896898252=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15121 -
 stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config.
Date: Tue, 18 Oct 2011 06:28:07 -0400
Message-ID: <201110181028.p9IAS7fX008843@svn01.web.mwc.hst.phx2.redhat.com>

--===============8654162815896898252==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 06:28:07 -0400 (Tue, 18 Oct 2011)
New Revision: 15121

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/conf=
ig/JBossWSConfigFactory.java
Log:
[JBWS-3369] Forward proper classloader from JBossWSConfigFactory to the ent=
ity resolver it creates to parse the configuration


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metada=
ta/config/JBossWSConfigFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/con=
fig/JBossWSConfigFactory.java	2011-10-18 10:24:09 UTC (rev 15120)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/con=
fig/JBossWSConfigFactory.java	2011-10-18 10:28:07 UTC (rev 15121)
@@ -99,7 +99,7 @@
          Unmarshaller unmarshaller =3D UnmarshallerFactory.newInstance().n=
ewUnmarshaller();
          unmarshaller.setValidation(true);
          unmarshaller.setSchemaValidation(true);
-         unmarshaller.setEntityResolver(new JBossWSEntityResolver());
+         unmarshaller.setEntityResolver(new JBossWSEntityResolver(loader));
 =

          String nsURI =3D getNamespaceURI(configURL);
          is =3D configURL.openStream();


--===============8654162815896898252==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:34:08 2011
Content-Type: multipart/mixed; boundary="===============2927559047334592541=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15122 - in
 stack/cxf/trunk/modules/testsuite:
 cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB and 1
 other directory.
Date: Tue, 18 Oct 2011 06:34:08 -0400
Message-ID: <201110181034.p9IAY8YA009319@svn01.web.mwc.hst.phx2.redhat.com>

--===============2927559047334592541==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:34:07 -0400 (Tue, 18 Oct 2011)
New Revision: 15122

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jbo=
ss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
fixing test for AS7 - exception message is different

Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/=
org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jb=
oss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java	2011-10-18 10:28:07 =
UTC (rev 15121)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jb=
oss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java	2011-10-18 10:34:07 =
UTC (rev 15122)
@@ -79,7 +79,14 @@
       }
       catch (Exception ex)
       {
-          assertEquals("Caller unauthorized", ex.getMessage());
+          if (isTargetJBoss6())
+          {
+             assertEquals("Caller unauthorized", ex.getMessage());
+          }
+          else
+          {
+             assertTrue(ex.getMessage().contains("EjbEndpoint is not allow=
ed"));
+          }
       }
    }
 =


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:28:07 UTC (rev =
15121)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:34:07 UTC (rev =
15122)
@@ -1320,7 +1320,6 @@
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 =

                  <!-- TODO: investigate -->
-                 <exclude>org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbT=
estCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>
 =

                  <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFil=
eTestCase on AS7 -->


--===============2927559047334592541==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:40:35 2011
Content-Type: multipart/mixed; boundary="===============2611440306703863029=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15123 -
 stack/native/trunk/modules/testsuite.
Date: Tue, 18 Oct 2011 06:40:35 -0400
Message-ID: <201110181040.p9IAeZ8Q010086@svn01.web.mwc.hst.phx2.redhat.com>

--===============2611440306703863029==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:40:35 -0400 (Tue, 18 Oct 2011)
New Revision: 15123

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-18 10:34:07 UTC (r=
ev 15122)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-18 10:40:35 UTC (r=
ev 15123)
@@ -1004,10 +1004,11 @@
                  <!-- # [JBWS-3150] This test causes hudson to freeze -->
                  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTest=
Case.*</exclude>
 =

-                 <!-- # [JBAS-9188] Implement support for nested EJBs & WA=
Rs in .sar archives -->
+                 <!-- # [JBAS-9188] On AS7 we don't support nested EJB & W=
AR archives neither in .sar nor in .jar archives -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**<=
/exclude>
+                 <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
 =

                  <!-- # [JBWS-3252] Investigate WSA interop tests regressi=
on -->
                  <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase=
*</exclude>
@@ -1030,9 +1031,6 @@
                  <!-- TODO: JMX client to AS7 server -->
                  <exclude>org/jboss/test/ws/management/recording/CustomRec=
ordProcessorTestCase*</exclude>
 =

-                 <!-- TODO: will we support wars bundled in jars on AS7? -=
->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
                  <!-- TODO: tests using org.jboss.ejb3.client.ClientLaunch=
er -->
                  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclud=
e>
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>


--===============2611440306703863029==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:40:46 2011
Content-Type: multipart/mixed; boundary="===============1134641212957930767=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15124 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 18 Oct 2011 06:40:46 -0400
Message-ID: <201110181040.p9IAekJw010158@svn01.web.mwc.hst.phx2.redhat.com>

--===============1134641212957930767==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:40:45 -0400 (Tue, 18 Oct 2011)
New Revision: 15124

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:40:35 UTC (rev =
15123)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:40:45 UTC (rev =
15124)
@@ -1286,10 +1286,11 @@
                  <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
                  <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.=
*</exclude>
 =

-                 <!-- # [JBAS-9188] Implement support for nested EJBs & WA=
Rs in .sar archives -->
+                 <!--# [JBAS-9188] On AS7 We don't support nested EJB & WA=
R archives neither in .sar nor in .jar archives -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+                 <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
 =

-                 <!--# Seems MSFT interop. endpoints are down :(-->
+                 <!-- # Seems MSFT interop. endpoints are down :(-->
                  <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**=
</exclude>
 =

                  <!-- ////////////////////////// -->
@@ -1307,9 +1308,6 @@
                  <!-- TODO: JMX client to AS7 server -->
                  <exclude>org/jboss/test/ws/management/recording/CustomRec=
ordProcessorTestCase*</exclude>
 =

-                 <!-- TODO: will we support wars bundled in jars on AS7? -=
->
-                 <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
-
                  <!-- TODO: tests using org.jboss.ejb3.client.ClientLaunch=
er -->
                  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**=
</exclude>
 =



--===============1134641212957930767==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:54:40 2011
Content-Type: multipart/mixed; boundary="===============7364194837034963160=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15125 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 18 Oct 2011 06:54:40 -0400
Message-ID: <201110181054.p9IAseMM011301@svn01.web.mwc.hst.phx2.redhat.com>

--===============7364194837034963160==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 06:54:39 -0400 (Tue, 18 Oct 2011)
New Revision: 15125

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
reorganize exclusions to AS7 related and not

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:40:45 UTC (rev =
15124)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-18 10:54:39 UTC (rev =
15125)
@@ -1293,6 +1293,9 @@
                  <!-- # Seems MSFT interop. endpoints are down :(-->
                  <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**=
</exclude>
 =

+                 <!-- Former JMS endpoint functionalities replaced by SOAP=
-over-JMS on AS7 -->
+                 <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/=
**</exclude>
+
                  <!-- ////////////////////////// -->
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
@@ -1340,9 +1343,6 @@
                  <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</=
exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
 =

-                 <!-- Former JMS endpoint functionalities replaced by SOAP=
-over-JMS on AS7 -->
-                 <exclude>org/jboss/test/ws/jaxws/samples/**/jmstransport/=
**</exclude>
-
               </excludes>
             </configuration>
           </plugin>


--===============7364194837034963160==--

From jbossws-commits at lists.jboss.org Tue Oct 18 06:58:17 2011
Content-Type: multipart/mixed; boundary="===============5401806164029444006=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15126 - hudson/trunk/scripts.
Date: Tue, 18 Oct 2011 06:58:16 -0400
Message-ID: <201110181058.p9IAwGjZ011658@svn01.web.mwc.hst.phx2.redhat.com>

--===============5401806164029444006==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 06:58:16 -0400 (Tue, 18 Oct 2011)
New Revision: 15126

Modified:
   hudson/trunk/scripts/jboss.sh
Log:
AS 7.0.x still uses standalone-preview.xml


Modified: hudson/trunk/scripts/jboss.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/scripts/jboss.sh	2011-10-18 10:54:39 UTC (rev 15125)
+++ hudson/trunk/scripts/jboss.sh	2011-10-18 10:58:16 UTC (rev 15126)
@@ -9,6 +9,11 @@
 export JBOSS_HOME
 PIDFILE=3D"$JBOSS_HOME/bin/jboss.pid"
 =

+# Overwrite standalone.xml with standalone-preview.xml if available (AS 7.=
0.x)
+if [ -f "$JBOSS_HOME/standalone/configuration/standalone-preview.xml" ]; t=
hen
+   cp $JBOSS_HOME/standalone/configuration/standalone-preview.xml $JBOSS_H=
OME/standalone/configuration/standalone.xml
+fi
+
 if [ -f "$JBOSS_HOME/bin/run.sh" ]; then
    RUN_CMD=3D"$DIRNAME/runjboss.sh -b $BINDADDR"
 else


--===============5401806164029444006==--

From jbossws-commits at lists.jboss.org Tue Oct 18 08:10:53 2011
Content-Type: multipart/mixed; boundary="===============1745281599752083270=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15127 - in hudson/trunk: hudson-home
 and 8 other directories.
Date: Tue, 18 Oct 2011 08:10:52 -0400
Message-ID: <201110181210.p9ICAqxe030501@svn01.web.mwc.hst.phx2.redhat.com>

--===============1745281599752083270==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 08:10:52 -0400 (Tue, 18 Oct 2011)
New Revision: 15127

Removed:
   hudson/trunk/hudson-home/jobs/AS-6.1.0/
   hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.1.0/
   hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/CXF-CORE-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/NATIVE-CORE-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6/
   hudson/trunk/hudson-home/jobs/SWITCH-BINDIST-AS-6.1.0/
Modified:
   hudson/trunk/ant.properties.example
   hudson/trunk/hudson-home/config.xml
   hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
   hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
   hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
   hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
   hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
   hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
   hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
Log:
removing AS 6.1.0 QA jobs - not needed anymore

Modified: hudson/trunk/ant.properties.example
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/ant.properties.example	2011-10-18 10:58:16 UTC (rev 15126)
+++ hudson/trunk/ant.properties.example	2011-10-18 12:10:52 UTC (rev 15127)
@@ -25,10 +25,6 @@
 hudson.jboss600.build=3Djboss-6.0.0.Final
 hudson.jboss600.rev=3DHEAD
 =

-hudson.jboss610.url=3Dhttp://anonsvn.jboss.org/repos/jbossas/tags/6.1.0.Fi=
nal
-hudson.jboss610.build=3Djboss-6.1.0.Final
-hudson.jboss610.rev=3DHEAD
-
 hudson.jboss700.url=3Dhttps://github.com/jbossas/jboss-as
 hudson.jboss700.build=3Djboss-as-7.0.0.Final
 hudson.jboss700.rev=3D7.0.0.Final

Modified: hudson/trunk/hudson-home/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/config.xml	2011-10-18 10:58:16 UTC (rev 15126)
+++ hudson/trunk/hudson-home/config.xml	2011-10-18 12:10:52 UTC (rev 15127)
@@ -56,7 +56,6 @@
         <no-comparator/>
         <string>AS-ALL</string>
         <string>AS-6.0.0</string>
-        <string>AS-6.1.0</string>
         <string>AS-7.0.0</string>
         <string>AS-7.1.0</string>
       </jobNames>
@@ -75,7 +74,6 @@
         <no-comparator/>
         <string>AS-TESTS-ALL</string>
         <string>AS-TESTS-AS-6.0.0</string>
-        <string>AS-TESTS-AS-6.1.0</string>
       </jobNames>
       <name>AS Tests</name>
       <description>
@@ -95,15 +93,12 @@
         <string>NATIVE-ALL</string>
         <string>NATIVE-LIGHT</string>
         <string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
-        <string>NATIVE-CORE-AS-6.1.0-SUN-JDK-6</string>
         <string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
         <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
         <string>NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>NATIVE-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>NATIVE-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
       </jobNames>
@@ -125,27 +120,21 @@
         <string>CXF-ALL</string>
         <string>CXF-LIGHT</string>
         <string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
-        <string>CXF-CORE-AS-6.1.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
-        <string>CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>CXF-BINDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
-        <string>CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>CXF-SRCDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-7.1.0-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
-        <string>CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
         <string>CXF-SRCDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
       </jobNames>
@@ -166,28 +155,22 @@
         <no-comparator/>
         <string>CXF-LIGHT</string>
         <string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
-        <string>CXF-CORE-AS-6.1.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.0.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.1.0-SUN-JDK-6</string>
         <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
-        <string>CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6</string>
         <string>CXF-CORE-AS-7.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>CXF-BINDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.1.0-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
-        <string>CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6</string>
         <string>CXF-BINDIST-AS-7.1.0-SPRING-SUN-JDK-6</string>
         <string>NATIVE-LIGHT</string>
         <string>NATIVE-CORE-AS-6.0.0-SUN-JDK-6</string>
-        <string>NATIVE-CORE-AS-6.1.0-SUN-JDK-6</string>
         <string>NATIVE-CORE-AS-7.0.0-SUN-JDK-6</string>
         <string>NATIVE-CORE-AS-7.1.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6</string>
-        <string>NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6</string>
         <string>NATIVE-BINDIST-AS-7.1.0-SUN-JDK-6</string>
       </jobNames>

Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml	2011-10-18 10:58:16 UTC=
 (rev 15126)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml	2011-10-18 12:10:52 UTC=
 (rev 15127)
@@ -3,7 +3,7 @@
   <builders class=3D"vector"/>
   <publishers class=3D"vector">
     <hudson.tasks.BuildTrigger>
-      <childProjects>AS-6.0.0, AS-6.1.0, AS-7.0.0, AS-7.1.0</childProjects>
+      <childProjects>AS-6.0.0, AS-7.0.0, AS-7.1.0</childProjects>
       <threshold>
         <name>UNSTABLE</name>
         <ordinal>1</ordinal>

Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml	2011-10-18 10:58:=
16 UTC (rev 15126)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-ALL/config.xml	2011-10-18 12:10:=
52 UTC (rev 15127)
@@ -3,7 +3,7 @@
   <builders class=3D"vector"/>
   <publishers class=3D"vector">
     <hudson.tasks.BuildTrigger>
-      <childProjects>AS-TESTS-AS-6.0.0, AS-TESTS-AS-6.1.0</childProjects>
+      <childProjects>AS-TESTS-AS-6.0.0</childProjects>
       <threshold>
         <name>UNSTABLE</name>
         <ordinal>1</ordinal>

Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml	2011-10-18 10:58:16 UT=
C (rev 15126)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml	2011-10-18 12:10:52 UT=
C (rev 15127)
@@ -8,10 +8,6 @@
 =

 , CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
 =

-, CXF-CORE-AS-6.1.0-SUN-JDK-6
-
-, CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6
-
 , CXF-CORE-AS-7.0.0-SUN-JDK-6
 =

 , CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
@@ -24,18 +20,10 @@
 =

 , CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
 =

-, CXF-BINDIST-AS-6.1.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6
-
 , CXF-SRCDIST-AS-6.0.0-SUN-JDK-6
 =

 , CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6
 =

-, CXF-SRCDIST-AS-6.1.0-SUN-JDK-6
-
-, CXF-SRCDIST-AS-6.1.0-SPRING-SUN-JDK-6
-
 , CXF-BINDIST-AS-7.0.0-SUN-JDK-6
 =

 , CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6

Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml	2011-10-18 10:58:16 =
UTC (rev 15126)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml	2011-10-18 12:10:52 =
UTC (rev 15127)
@@ -8,10 +8,6 @@
 =

 , CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6
 =

-, CXF-CORE-AS-6.1.0-SUN-JDK-6
-
-, CXF-CORE-AS-6.1.0-SPRING-SUN-JDK-6
-
 , CXF-CORE-AS-7.0.0-SUN-JDK-6
 =

 , CXF-CORE-AS-7.0.0-SPRING-SUN-JDK-6
@@ -24,10 +20,6 @@
 =

 , CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6
 =

-, CXF-BINDIST-AS-6.1.0-SUN-JDK-6
-
-, CXF-BINDIST-AS-6.1.0-SPRING-SUN-JDK-6
-
 , CXF-BINDIST-AS-7.0.0-SUN-JDK-6
 =

 , CXF-BINDIST-AS-7.0.0-SPRING-SUN-JDK-6

Modified: hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml	2011-10-18 10:58:16=
 UTC (rev 15126)
+++ hudson/trunk/hudson-home/jobs/NATIVE-ALL/config.xml	2011-10-18 12:10:52=
 UTC (rev 15127)
@@ -10,12 +10,6 @@
 =

 , NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6
 =

-, NATIVE-CORE-AS-6.1.0-SUN-JDK-6
-
-, NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6
-
-, NATIVE-SRCDIST-AS-6.1.0-SUN-JDK-6
-
 , NATIVE-CORE-AS-7.0.0-SUN-JDK-6
 =

 , NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6

Modified: hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml	2011-10-18 10:58:=
16 UTC (rev 15126)
+++ hudson/trunk/hudson-home/jobs/NATIVE-LIGHT/config.xml	2011-10-18 12:10:=
52 UTC (rev 15127)
@@ -8,10 +8,6 @@
 =

 , NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6
 =

-, NATIVE-CORE-AS-6.1.0-SUN-JDK-6
-
-, NATIVE-BINDIST-AS-6.1.0-SUN-JDK-6
-
 , NATIVE-CORE-AS-7.0.0-SUN-JDK-6
 =

 , NATIVE-BINDIST-AS-7.0.0-SUN-JDK-6

Modified: hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml	2011-10-18 10:58:16=
 UTC (rev 15126)
+++ hudson/trunk/hudson-home/jobs/SWITCH-ALL/config.xml	2011-10-18 12:10:52=
 UTC (rev 15127)
@@ -3,7 +3,7 @@
   <builders class=3D"vector"/>
   <publishers class=3D"vector">
     <hudson.tasks.BuildTrigger>
-      <childProjects>SWITCH-BINDIST-AS-6.0.0, SWITCH-BINDIST-AS-6.1.0</chi=
ldProjects>
+      <childProjects>SWITCH-BINDIST-AS-6.0.0</childProjects>
       <threshold>
         <name>UNSTABLE</name>
         <ordinal>1</ordinal>


--===============1745281599752083270==--

From jbossws-commits at lists.jboss.org Tue Oct 18 08:11:47 2011
Content-Type: multipart/mixed; boundary="===============8724268394307919934=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15128 - hudson/trunk/hudson-home.
Date: Tue, 18 Oct 2011 08:11:46 -0400
Message-ID: <201110181211.p9ICBk51030557@svn01.web.mwc.hst.phx2.redhat.com>

--===============8724268394307919934==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-18 08:11:46 -0400 (Tue, 18 Oct 2011)
New Revision: 15128

Modified:
   hudson/trunk/hudson-home/config.xml
Log:
removing AS 6.1.0 QA jobs - not needed anymore

Modified: hudson/trunk/hudson-home/config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hudson/trunk/hudson-home/config.xml	2011-10-18 12:10:52 UTC (rev 15127)
+++ hudson/trunk/hudson-home/config.xml	2011-10-18 12:11:46 UTC (rev 15128)
@@ -37,7 +37,6 @@
   <tr><th align=3Dleft>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
   <tr><td colspan=3D2></td></tr>
   <tr><th align=3Dleft>@hudson.jboss600.build@</th><td>-r(a)hudson.jboss60=
0.rev@ @hudson.jboss600.url@</td></tr>
-  <tr><th align=3Dleft>@hudson.jboss610.build@</th><td>-r(a)hudson.jboss61=
0.rev@ @hudson.jboss610.url@</td></tr>
   <tr><th align=3Dleft>@hudson.jboss700.build@</th><td>-r(a)hudson.jboss70=
0.rev@ @hudson.jboss700.url@</td></tr>
   <tr><th align=3Dleft>@hudson.jboss710.build@</th><td>-r(a)hudson.jboss71=
0.rev@ @hudson.jboss710.url@</td></tr>
   <tr><td colspan=3D2></td></tr>


--===============8724268394307919934==--

From jbossws-commits at lists.jboss.org Tue Oct 18 12:12:15 2011
Content-Type: multipart/mixed; boundary="===============7667365510431973206=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15129 -
 stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main.
Date: Tue, 18 Oct 2011 12:12:15 -0400
Message-ID: <201110181612.p9IGCFw0012080@svn01.web.mwc.hst.phx2.redhat.com>

--===============7667365510431973206==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 12:12:14 -0400 (Tue, 18 Oct 2011)
New Revision: 15129

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/w=
s/spi/main/module.xml
Log:
Synch with AS7 upstream


Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/=
jboss/ws/spi/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
ws/spi/main/module.xml	2011-10-18 12:11:46 UTC (rev 15128)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/=
ws/spi/main/module.xml	2011-10-18 16:12:14 UTC (rev 15129)
@@ -35,5 +35,6 @@
         <module name=3D"javax.xml.ws.api"/>
         <module name=3D"org.jboss.logging"/>
         <module name=3D"org.jboss.ws.api"/>
+        <module name=3D"org.jboss.as.webservices"/>
     </dependencies>
 </module>


--===============7667365510431973206==--

From jbossws-commits at lists.jboss.org Tue Oct 18 12:12:34 2011
Content-Type: multipart/mixed; boundary="===============4346331403568412778=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15130 -
 stack/native/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main.
Date: Tue, 18 Oct 2011 12:12:34 -0400
Message-ID: <201110181612.p9IGCYGQ012091@svn01.web.mwc.hst.phx2.redhat.com>

--===============4346331403568412778==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-18 12:12:34 -0400 (Tue, 18 Oct 2011)
New Revision: 15130

Modified:
   stack/native/trunk/modules/resources/src/main/resources/modules/org/jbos=
s/ws/spi/main/module.xml
Log:
Synch with AS7 upstream


Modified: stack/native/trunk/modules/resources/src/main/resources/modules/o=
rg/jboss/ws/spi/main/module.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/ws/spi/main/module.xml	2011-10-18 16:12:14 UTC (rev 15129)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/org/jbo=
ss/ws/spi/main/module.xml	2011-10-18 16:12:34 UTC (rev 15130)
@@ -35,5 +35,6 @@
         <module name=3D"javax.xml.ws.api"/>
         <module name=3D"org.jboss.logging"/>
         <module name=3D"org.jboss.ws.api"/>
+        <module name=3D"org.jboss.as.webservices"/>
     </dependencies>
 </module>


--===============4346331403568412778==--

From jbossws-commits at lists.jboss.org Wed Oct 19 03:22:07 2011
Content-Type: multipart/mixed; boundary="===============4814869480547798220=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15131 - stack/cxf/trunk.
Date: Wed, 19 Oct 2011 03:22:07 -0400
Message-ID: <201110190722.p9J7M7eH023928@svn01.web.mwc.hst.phx2.redhat.com>

--===============4814869480547798220==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 03:22:07 -0400 (Wed, 19 Oct 2011)
New Revision: 15131

Modified:
   stack/cxf/trunk/pom.xml
Log:
use Apache CXF 2.4.4-SNAPSHOT

Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-18 16:12:34 UTC (rev 15130)
+++ stack/cxf/trunk/pom.xml	2011-10-19 07:22:07 UTC (rev 15131)
@@ -55,7 +55,7 @@
     <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
     <ejb.api.version>1.0.1.Final</ejb.api.version>
-    <cxf.version>2.4.3</cxf.version>
+    <cxf.version>2.4.4-SNAPSHOT</cxf.version>
     <cxf.asm.version>3.3</cxf.asm.version>
     <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
     <fastinfoset.api.version>1.2.7</fastinfoset.api.version>


--===============4814869480547798220==--

From jbossws-commits at lists.jboss.org Wed Oct 19 05:28:52 2011
Content-Type: multipart/mixed; boundary="===============3733209899645921092=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15132 -
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws981.
Date: Wed, 19 Oct 2011 05:28:52 -0400
Message-ID: <201110190928.p9J9SqIP015542@svn01.web.mwc.hst.phx2.redhat.com>

--===============3733209899645921092==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 05:28:52 -0400 (Wed, 19 Oct 2011)
New Revision: 15132

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws981/EJB3Bean.java
Log:
sync with JBossWS API

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxws/jbws981/EJB3Bean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws981/EJB3Bean.java	2011-10-19 07:22:07 UTC (rev 15131)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws981/EJB3Bean.java	2011-10-19 09:28:52 UTC (rev 15132)
@@ -23,40 +23,22 @@
 =

 import javax.ejb.Stateless;
 import javax.jws.WebService;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
 =

-import org.jboss.logging.Logger;
 import org.jboss.ws.api.annotation.WebContext;
 =

 /**
- * =

+ *
  * @author darran.lofthouse(a)jboss.com
  * @since Nov 2, 2006
  */
 @Stateless
 @WebService(endpointInterface =3D "org.jboss.test.ws.jaxws.jbws981.Endpoin=
tInterface", targetNamespace =3D "http://www.jboss.org/test/ws/jaxws/jbws98=
1", serviceName =3D "EndpointService")
-(a)WebContext(virtualHosts =3D { "localhost", "www.jboss.org" })
+(a)WebContext(virtualHost =3D "default-host")
 public class EJB3Bean implements EJB3RemoteInterface
 {
 =

-   private static final Logger log =3D Logger.getLogger(EJB3Bean.class);
-
    public String hello(final String message)
    {
-      try
-      {
-         MBeanServer mbeanServer =3D (MBeanServer)MBeanServerFactory.findM=
BeanServer(null).get(0);
-         ObjectName on =3D new ObjectName("jboss.web:J2EEApplication=3Dnon=
e,J2EEServer=3Dnone,WebModule=3D//www.jboss.org/jaxws-jbws981,j2eeType=3DSe=
rvlet,name=3DEJB3Bean");
-         mbeanServer.getMBeanInfo(on);
-      }
-      catch (Exception e)
-      {
-         log.error("Unable to lookup deployment", e);
-         return "Unable to get WebModule MBean for virtual host - virtual-=
host not handled from @WebContext";
-      }
-
       return message;
    }
 =



--===============3733209899645921092==--

From jbossws-commits at lists.jboss.org Wed Oct 19 05:33:41 2011
Content-Type: multipart/mixed; boundary="===============3098712128991659232=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15133 -
 api/trunk/src/main/java/org/jboss/ws/api/annotation.
Date: Wed, 19 Oct 2011 05:33:41 -0400
Message-ID: <201110190933.p9J9XfUF016015@svn01.web.mwc.hst.phx2.redhat.com>

--===============3098712128991659232==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 05:33:41 -0400 (Wed, 19 Oct 2011)
New Revision: 15133

Modified:
   api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java
Log:
[JBAS-8363] clarifying API - endpoint can be deployed to one virtual host o=
nly

Modified: api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java	201=
1-10-19 09:28:52 UTC (rev 15132)
+++ api/trunk/src/main/java/org/jboss/ws/api/annotation/WebContext.java	201=
1-10-19 09:33:41 UTC (rev 15133)
@@ -45,11 +45,11 @@
    String contextRoot() default "";
    =

    /** =

-    * The virtual hosts that the web service endpoint is deployed to.
+    * The virtual host that the web service endpoint is deployed to.
     * =

     * Applies to server side port components only.
     */
-   String[] virtualHosts() default {};
+   String virtualHost() default "";
    =

    /** =

     * Relative path that is appended to the contextRoot to form fully qual=
ified


--===============3098712128991659232==--

From jbossws-commits at lists.jboss.org Wed Oct 19 05:39:15 2011
Content-Type: multipart/mixed; boundary="===============4720669030873316967=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15134 - in
 shared-testsuite/trunk/testsuite/src/test:
 java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare and 8 other directories.
Date: Wed, 19 Oct 2011 05:39:15 -0400
Message-ID: <201110190939.p9J9dFoP016384@svn01.web.mwc.hst.phx2.redhat.com>

--===============4720669030873316967==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-19 05:39:14 -0400 (Wed, 19 Oct 2011)
New Revision: 15134

Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrp=
c.xml
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/docstyle/bare/TrivialServiceDocBareTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/exception/ExceptionTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/handler/HeaderClientTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/holder/HolderTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/message/MessageTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/mtom/MTOMTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/oneway/OneWayTestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/=
samples/rpcstyle/TrivialServiceRpcTestCase.java
Log:
Updating some jaxrpc tests to avoid relying on remote jndi lookup


Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-sample=
s-jaxrpc.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxr=
pc.xml	2011-10-19 09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxr=
pc.xml	2011-10-19 09:39:14 UTC (rev 15134)
@@ -292,6 +292,9 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
+      <manifest>
+        <attribute name=3D"Dependencies" value=3D"org.jboss.ws.common"/>
+      </manifest>
     </war>
     <jar jarfile=3D"${tests.output.dir}/test-libs/jaxrpc-samples-message-c=
lient.jar">
       <fileset dir=3D"${tests.output.dir}/test-classes">
@@ -318,6 +321,9 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
+      <manifest>
+        <attribute name=3D"Dependencies" value=3D"org.jboss.ws.common,java=
x.mail.api services export,javax.activation.api services export"/>
+      </manifest>
     </war>
     <jar destfile=3D"${tests.output.dir}/test-libs/jaxrpc-samples-mtom-cli=
ent.jar">
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/mt=
om/META-INF">

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/docstyle/bare/TrivialServiceDocBareTestCase.java	2011-10-19 09:33:=
41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/docstyle/bare/TrivialServiceDocBareTestCase.java	2011-10-19 09:39:=
14 UTC (rev 15134)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.docstyle.bare;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,8 @@
  */
 public class TrivialServiceDocBareTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/docstyle/bare";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-docstyle-bare";
    private static TrivialService port;
 =

    public static Test suite()
@@ -50,12 +56,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Object obj =3D iniCtx.lookup("java:comp/env/service/TrivialServic=
e");
-         Service service =3D (Service)obj;
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testProducPurchase() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java	2011-10-19 =
09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.java	2011-10-19 =
09:39:14 UTC (rev 15134)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.docstyle.wrapped;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,8 @@
  */
 public class TrivialServiceDocWrappedTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/docstyle/wrapped";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-docstyle-wrapped";
    private static TrivialService port;
 =

    public static Test suite()
@@ -50,11 +56,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TrivialService");
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testProducTrivial() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/exception/ExceptionTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/exception/ExceptionTestCase.java	2011-10-19 09:33:41 UTC (rev 1513=
3)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/exception/ExceptionTestCase.java	2011-10-19 09:39:14 UTC (rev 1513=
4)
@@ -22,6 +22,7 @@
 package org.jboss.test.ws.jaxrpc.samples.exception;
 =

 import java.io.ByteArrayInputStream;
+import java.net.URL;
 import java.rmi.RemoteException;
 =

 import javax.naming.InitialContext;
@@ -55,6 +56,7 @@
 public class ExceptionTestCase extends JBossWSTest
 {
    private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/exception";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-exception";
 =

    public static Test suite() throws Exception
    {
@@ -63,10 +65,9 @@
 =

    private ExceptionServiceInterface getPort() throws Exception
    {
-      InitialContext iniCtx =3D getInitialContext();
-      ExceptionService service =3D (ExceptionService)iniCtx.lookup("java:c=
omp/env/service/ExceptionService");
-      ExceptionServiceInterface port =3D service.getPort();
-      return port;
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, "ExceptionService"));
+      return (ExceptionServiceInterface)service.getPort(new QName(TARGET_N=
AMESPACE, "ExceptionServiceInterfacePort"), ExceptionServiceInterface.class=
);
    }
 =

    /** Test creation of a SOAPFault */

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/handler/HeaderClientTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/handler/HeaderClientTestCase.java	2011-10-19 09:33:41 UTC (rev 151=
33)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/handler/HeaderClientTestCase.java	2011-10-19 09:39:14 UTC (rev 151=
34)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.handler;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.holders.StringHolder;
 =

 import junit.framework.Test;
@@ -39,6 +43,7 @@
 public class HeaderClientTestCase extends JBossWSTest
 {
    public final String TARGET_ENDPOINT_ADDRESS =3D "http://" + getServerHo=
st() + ":8080/jaxrpc-samples-handler";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/handler";
 =

    private static HeaderTestService port;
 =

@@ -53,11 +58,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (HeaderTestService)service.getPort(HeaderTestService.cla=
ss);
+         port =3D getService(HeaderTestService.class, "TestService", "Head=
erTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_ADDRESS + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testBoundInHeader() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/holder/HolderTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/holder/HolderTestCase.java	2011-10-19 09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/holder/HolderTestCase.java	2011-10-19 09:39:14 UTC (rev 15134)
@@ -23,11 +23,13 @@
 =

 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.URL;
 import java.util.GregorianCalendar;
 =

 import javax.naming.InitialContext;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.holders.BigDecimalHolder;
 import javax.xml.rpc.holders.BigIntegerHolder;
 import javax.xml.rpc.holders.BooleanHolder;
@@ -62,6 +64,9 @@
  */
 public class HolderTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-holder";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/holder";
+   =

    private static HolderTestService port;
 =

    public static Test suite()
@@ -75,11 +80,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (HolderTestService)service.getPort(HolderTestService.cla=
ss);
+         port =3D getService(HolderTestService.class, "TestService", "Hold=
erTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testEchoBigDecimal() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/message/MessageTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/message/MessageTestCase.java	2011-10-19 09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/message/MessageTestCase.java	2011-10-19 09:39:14 UTC (rev 15134)
@@ -30,6 +30,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPConnection;
@@ -61,6 +62,7 @@
 public class MessageTestCase extends JBossWSTest
 {
    private final String TARGET_ENDPOINT =3D "http://" + getServerHost() + =
":8080/jaxrpc-samples-message";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/message";
 =

    /** Deploy the test ear */
    public static Test suite() throws Exception
@@ -129,12 +131,11 @@
 =

    private MessageTestService getPort() throws Exception
    {
-      InitialContext iniCtx =3D getInitialContext();
-      Service service =3D (Service)iniCtx.lookup("java:comp/env/service/Me=
ssageService");
-      MessageTestService port =3D (MessageTestService)service.getPort(Mess=
ageTestService.class);
-      return port;
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT + "?wsdl"), new QName(TARGET_NAMESPACE, "MessageService"));
+      return (MessageTestService)service.getPort(new QName(TARGET_NAMESPAC=
E, "MessageTestServicePort"), MessageTestService.class);
    }
-
+   =

    private SOAPElement convertToSOAPElement(Element reqElement) throws Tra=
nsformerException, SOAPException
    {
       SOAPElement parent =3D SOAPFactory.newInstance().createElement("dumm=
y");

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/mtom/MTOMTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/mtom/MTOMTestCase.java	2011-10-19 09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/mtom/MTOMTestCase.java	2011-10-19 09:39:14 UTC (rev 15134)
@@ -24,10 +24,13 @@
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 =

 import javax.activation.DataHandler;
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.Stub;
 import javax.xml.transform.stream.StreamSource;
 =

@@ -45,6 +48,9 @@
  */
 public class MTOMTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/mtom";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-mtom";
+   =

    private static EmployeeRecords port;
 =

    /** Deploy the test ear */
@@ -59,11 +65,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/XOPTestService");
-         port =3D (EmployeeRecords)service.getPort(EmployeeRecords.class);
+         port =3D getService(EmployeeRecords.class, "EmployeeService", "Em=
ployeeRecordsPort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testUpdate() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/oneway/OneWayTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/oneway/OneWayTestCase.java	2011-10-19 09:33:41 UTC (rev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/oneway/OneWayTestCase.java	2011-10-19 09:39:14 UTC (rev 15134)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.oneway;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,9 @@
  */
 public class OneWayTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-oneway";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/oneway";
+   =

    private static OneWayTestService port;
 =

    public static Test suite()
@@ -50,11 +57,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (OneWayTestService)service.getPort(OneWayTestService.cla=
ss);
+         port =3D getService(OneWayTestService.class, "TestService", "OneW=
ayTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testOneWay() throws Exception
    {

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/rpcstyle/TrivialServiceRpcTestCase.java	2011-10-19 09:33:41 UTC (r=
ev 15133)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc=
/samples/rpcstyle/TrivialServiceRpcTestCase.java	2011-10-19 09:39:14 UTC (r=
ev 15134)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.rpcstyle;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,9 @@
  */
 public class TrivialServiceRpcTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-rpcstyle";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/rpcstyle";
+   =

    private static TrivialService port;
 =

    public static Test suite()
@@ -50,11 +57,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TrivialService");
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testTrivialAccess() throws Exception
    {


--===============4720669030873316967==--

From jbossws-commits at lists.jboss.org Wed Oct 19 05:39:53 2011
Content-Type: multipart/mixed; boundary="===============7945802066834569012=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15135 -
 stack/cxf/trunk/modules/testsuite.
Date: Wed, 19 Oct 2011 05:39:53 -0400
Message-ID: <201110190939.p9J9dr4j016400@svn01.web.mwc.hst.phx2.redhat.com>

--===============7945802066834569012==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-19 05:39:53 -0400 (Wed, 19 Oct 2011)
New Revision: 15135

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Enabling some jaxrpc tests


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-19 09:39:14 UTC (rev =
15134)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-19 09:39:53 UTC (rev =
15135)
@@ -1161,6 +1161,11 @@
           <version>2.0.0-beta-1</version>
         </dependency>
         <dependency>
+          <groupId>javassist</groupId>
+          <artifactId>javassist</artifactId>
+          <version>3.12.1.GA</version>
+        </dependency>
+        <dependency>
           <groupId>org.jboss</groupId>
           <artifactId>jboss-common-core</artifactId>
           <exclusions>
@@ -1329,20 +1334,20 @@
                  <!-- JAXR not available -->
                  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
 =

-                 <!-- appclient not available for JAXRPC clients -->
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/**</ex=
clude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/exception/**</e=
xclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exc=
lude>
+                 <!-- TODO: JSR109 w/ jaxrpc, remote JNDI support -->
                  <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**</e=
xclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**</=
exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/message/**</exc=
lude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</e=
xclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/Serv=
iceRefClientTestCase*</exclude>
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/Serv=
iceRefEJBTestCase*</exclude>
+
+                 <!-- TODO: investigate jaxrpc attachments -->
                  <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/**</exclud=
e>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/**</excl=
ude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/**</ex=
clude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</e=
xclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/**</=
exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/swa/**</exclude>
 =

+                 <!-- TODO: investigate saaj impl selection -->
+                 <exclude>org/jboss/test/ws/jaxrpc/samples/handler/**</exc=
lude>
+
               </excludes>
             </configuration>
           </plugin>


--===============7945802066834569012==--

From jbossws-commits at lists.jboss.org Wed Oct 19 05:59:18 2011
Content-Type: multipart/mixed; boundary="===============8496458762390952753=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15136 - in
 spi/trunk/src/main/java/org/jboss/wsf/spi: deployment and 1 other directory.
Date: Wed, 19 Oct 2011 05:59:17 -0400
Message-ID: <201110190959.p9J9xHsc018354@svn01.web.mwc.hst.phx2.redhat.com>

--===============8496458762390952753==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 05:59:17 -0400 (Wed, 19 Oct 2011)
New Revision: 15136

Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContextImpl.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java
Log:
[JBAS-8363] clarifying API - endpoint can be deployed to one virtual host o=
nly

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContextIm=
pl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContextImpl.jav=
a	2011-10-19 09:39:53 UTC (rev 15135)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/annotation/WebContextImpl.jav=
a	2011-10-19 09:59:17 UTC (rev 15136)
@@ -36,7 +36,7 @@
 {
    private String contextRoot =3D "";
    private String authmethod =3D "";
-   private String[] virtualHosts =3D new String[] {};
+   private String virtualHost =3D "";
    private String urlpattern =3D "";
    private String transportGuarantee  =3D "";
    private boolean securedWsdl =3D false;
@@ -59,18 +59,18 @@
    }
 =

    /**
-    * The virtual hosts that the web service endpoint is deployed to.
+    * The virtual host that the web service endpoint is deployed to.
     *
     * Applies to server side port components only.
     */
-   public String[] virtualHosts(){
-      return virtualHosts;
+   public String virtualHost() {
+      return virtualHost;
    };
 =

 =

-   public void setVirtualHosts(String[] virtualHosts)
+   public void setVirtualHost(String virtualHost)
    {
-      this.virtualHosts =3D virtualHosts;
+      this.virtualHost =3D virtualHost;
    }
 =

    /**

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java	2011-=
10-19 09:39:53 UTC (rev 15135)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java	2011-=
10-19 09:59:17 UTC (rev 15136)
@@ -58,10 +58,10 @@
    /** Set the context root for this service */
    void setContextRoot(String contextRoot);
    =

-   /** Get the virtual hosts for this service */
-   List<String> getVirtualHosts();
+   /** Get the virtual host for this service */
+   String getVirtualHost();
    =

-   /** Set the virtual hosts for this service */
-   void setVirtualHosts(List<String> virtualHosts);
+   /** Set the virtual host for this service */
+   void setVirtualHost(String virtualHost);
    =

 }


--===============8496458762390952753==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:04:10 2011
Content-Type: multipart/mixed; boundary="===============3367598083828719038=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15137 -
 common/trunk/src/main/java/org/jboss/ws/common/deployment.
Date: Wed, 19 Oct 2011 06:04:10 -0400
Message-ID: <201110191004.p9JA4A7i024825@svn01.web.mwc.hst.phx2.redhat.com>

--===============3367598083828719038==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:04:10 -0400 (Wed, 19 Oct 2011)
New Revision: 15137

Modified:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultService=
.java
   common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.proper=
ties
   common/trunk/src/main/java/org/jboss/ws/common/deployment/VirtualHostDep=
loymentAspect.java
Log:
[JBAS-8363] clarifying API - endpoint can be deployed to one virtual host o=
nly

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Default=
Service.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultServic=
e.java	2011-10-19 09:59:17 UTC (rev 15136)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultServic=
e.java	2011-10-19 10:04:10 UTC (rev 15137)
@@ -45,7 +45,7 @@
    private Deployment dep;
    private List<Endpoint> endpoints =3D new LinkedList<Endpoint>();
    private String contextRoot;
-   private List<String> virtualHosts;
+   private String virtualHost;
 =

    DefaultService()
    {
@@ -110,24 +110,14 @@
       this.contextRoot =3D contextRoot;
    }
 =

-   public List<String> getVirtualHosts()
+   public String getVirtualHost()
    {
-      if ( virtualHosts !=3D null )
-      {
-         final List<String> retVal =3D new LinkedList<String>();
-         for ( String virtualHost : virtualHosts )
-         {
-            retVal.add( virtualHost );
-         }
-         return retVal;
-      }
-      =

-      return null;
+      return virtualHost;
    }
 =

-   public void setVirtualHosts(List<String> virtualHosts)
+   public void setVirtualHost(String virtualHost)
    {
-      this.virtualHosts =3D virtualHosts;      =

+      this.virtualHost =3D virtualHost;      =

    }
 =

 }

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Message=
.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.prope=
rties	2011-10-19 09:59:17 UTC (rev 15136)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/Message.prope=
rties	2011-10-19 10:04:10 UTC (rev 15137)
@@ -13,7 +13,7 @@
 INVOCATION_HANDLER_NOT_AVAILABLE=3DInvocation handler not available
 CANNOT_STOP_ENDPOINT_IN_STATE=3DCannot stop endpoint in state: {0}
 COULD_NOT_FIND_IN_THE_ADDITIONAL_METADATAFILES=3DCould not find {0} in the=
 additional metadatafiles!
-VIRTUALHOSTS_MUST_BE_THE_SAME_FOR_ALL_DEPLOYED_ENDPOINTS=3DvirtualHosts mu=
st be the same for all deployed endpoints
+VIRTUALHOST_MUST_BE_THE_SAME_FOR_ALL_DEPLOYED_ENDPOINTS=3DvirtualHost must=
 be the same for all deployed endpoints
 CANNOT_OBTAIN_SERVLET_MAPPING_FOR=3DCannot obtain servlet mapping for: {0}
 LIFECYCLEHANDLER_NOT_INITIALISED=3DLifecycleHandler not initialised
 CANNOT_OBTAIN_CONTEXT_ROOT=3DCannot obtain context root

Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/Virtual=
HostDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/VirtualHostDe=
ploymentAspect.java	2011-10-19 09:59:17 UTC (rev 15136)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/VirtualHostDe=
ploymentAspect.java	2011-10-19 10:04:10 UTC (rev 15137)
@@ -24,8 +24,6 @@
 =

 import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeploymen=
t;
 =

-import java.util.Arrays;
-import java.util.List;
 import java.util.ResourceBundle;
 =

 import org.jboss.ws.api.annotation.WebContext;
@@ -35,12 +33,12 @@
 import org.jboss.wsf.spi.deployment.Endpoint;
 =

 /**
- * A deployer that assigns the virtual hosts to the service =

+ * A deployment aspect that assigns the virtual host to a WS service. =

  *
  * @author darran.lofthouse(a)jboss.com
- * @since 10-Jul-2008
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
  */
-public class VirtualHostDeploymentAspect extends AbstractDeploymentAspect
+public final class VirtualHostDeploymentAspect extends AbstractDeploymentA=
spect
 {
    private static final ResourceBundle bundle =3D BundleUtils.getBundle(Vi=
rtualHostDeploymentAspect.class);
 =

@@ -49,48 +47,41 @@
    {
       if (isJaxwsEjbDeployment(dep))
       {
-         dep.getService().setVirtualHosts(getExplicitVirtualHosts(dep));
+         dep.getService().setVirtualHost(getExplicitVirtualHost(dep));
       }
    }
 =

-   protected List<String> getExplicitVirtualHosts(Deployment dep)
+   protected String getExplicitVirtualHost(final Deployment dep)
    {
-      String[] virtualHosts =3D null;
+      String virtualHost =3D null;
 =

-      // Use the virtual hosts from @WebContext.virtualHosts
-      for (Endpoint ep : dep.getService().getEndpoints())
+      for (final Endpoint ep : dep.getService().getEndpoints())
       {
-         Class<?> implClass =3D ep.getTargetBeanClass();
-         WebContext anWebContext =3D (WebContext)implClass.getAnnotation(W=
ebContext.class);
-         if (anWebContext !=3D null && anWebContext.virtualHosts() !=3D nu=
ll && anWebContext.virtualHosts().length > 0)
-         {
-            String[] anVirtualHosts =3D anWebContext.virtualHosts();
-            // Avoid modifying the annotation values.
-            String[] temp =3D new String[anVirtualHosts.length];
-            System.arraycopy(anVirtualHosts, 0, temp, 0, anVirtualHosts.le=
ngth);
-            Arrays.sort(temp);
+         final Class<?> implClass =3D ep.getTargetBeanClass();
+         final WebContext webContext =3D implClass.getAnnotation(WebContex=
t.class);
 =

-            if (virtualHosts =3D=3D null)
+         if (hasVirtualHost(webContext))
+         {
+            final String currentVirtualHost =3D webContext.virtualHost().t=
rim();
+            if (virtualHost =3D=3D null)
             {
-               virtualHosts =3D temp;
+                virtualHost =3D currentVirtualHost;
             }
             else
             {
-               if (Arrays.equals(virtualHosts, temp) =3D=3D false)
+               if (!currentVirtualHost.equals(virtualHost))
                {
-                  throw new IllegalStateException(BundleUtils.getMessage(b=
undle, "VIRTUALHOSTS_MUST_BE_THE_SAME_FOR_ALL_DEPLOYED_ENDPOINTS"));
+                  throw new IllegalStateException(BundleUtils.getMessage(b=
undle, "VIRTUALHOST_MUST_BE_THE_SAME_FOR_ALL_DEPLOYED_ENDPOINTS"));
                }
             }
          }
       }
       =

-      if ( virtualHosts !=3D null )
-      {
-         return Arrays.asList(virtualHosts);
-      }
-      else
-      {
-         return null;
-      }
+      return virtualHost;
    }
+
+   private static boolean hasVirtualHost(final WebContext webContext) {
+       return webContext !=3D null && webContext.virtualHost().trim().leng=
th() > 0;
+   }
+
 }


--===============3367598083828719038==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:12:31 2011
Content-Type: multipart/mixed; boundary="===============2362295520028402334=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15138 -
 container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat.
Date: Wed, 19 Oct 2011 06:12:30 -0400
Message-ID: <201110191012.p9JACUYi025647@svn01.web.mwc.hst.phx2.redhat.com>

--===============2362295520028402334==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:12:30 -0400 (Wed, 19 Oct 2011)
New Revision: 15138

Modified:
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/tomcat/WebMetaDataCreator.java
Log:
sync with SPI

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/tomcat/WebMetaDataCreator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataCreator.java	2011-10-19 10:04:10 UTC=
 (rev 15137)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataCreator.java	2011-10-19 10:12:30 UTC=
 (rev 15138)
@@ -21,6 +21,7 @@
  */
 package org.jboss.webservices.integration.tomcat;
 =

+import java.util.Arrays;
 import java.util.List;
 =

 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -136,9 +137,12 @@
       }
 =

       // Set virtual hosts
-      final List<String> virtualHosts =3D dep.getService().getVirtualHosts=
();
-      this.log.debug("Setting virtual hosts: " + virtualHosts);
-      jbossWebMD.setVirtualHosts(virtualHosts);
+      final String virtualHost =3D dep.getService().getVirtualHost();
+      if (virtualHost !=3D null)
+      {
+         this.log.debug("Setting virtual host: " + virtualHost);
+         jbossWebMD.setVirtualHosts(Arrays.asList(virtualHost));
+      }
    }
 =

    /**


--===============2362295520028402334==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:14:05 2011
Content-Type: multipart/mixed; boundary="===============7515006310789194769=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15139 -
 container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat.
Date: Wed, 19 Oct 2011 06:14:05 -0400
Message-ID: <201110191014.p9JAE5NM025659@svn01.web.mwc.hst.phx2.redhat.com>

--===============7515006310789194769==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:14:04 -0400 (Wed, 19 Oct 2011)
New Revision: 15139

Modified:
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/tomcat/WebMetaDataCreator.java
Log:
sync with SPI

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/tomcat/WebMetaDataCreator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataCreator.java	2011-10-19 10:12:30 UTC=
 (rev 15138)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/tomcat/WebMetaDataCreator.java	2011-10-19 10:14:04 UTC=
 (rev 15139)
@@ -21,6 +21,7 @@
  */
 package org.jboss.webservices.integration.tomcat;
 =

+import java.util.Arrays;
 import java.util.List;
 =

 import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -136,9 +137,12 @@
       }
 =

       // Set virtual hosts
-      final List<String> virtualHosts =3D dep.getService().getVirtualHosts=
();
-      this.log.debug("Setting virtual hosts: " + virtualHosts);
-      jbossWebMD.setVirtualHosts(virtualHosts);
+      final String virtualHost =3D dep.getService().getVirtualHost();
+      if (virtualHost !=3D null)
+      {
+         this.log.debug("Setting virtual host: " + virtualHost);
+         jbossWebMD.setVirtualHosts(Arrays.asList(virtualHost));
+      }
    }
 =

    /**


--===============7515006310789194769==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:18:20 2011
Content-Type: multipart/mixed; boundary="===============1167897787193622620=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15140 -
 container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat.
Date: Wed, 19 Oct 2011 06:18:19 -0400
Message-ID: <201110191018.p9JAIJMi026344@svn01.web.mwc.hst.phx2.redhat.com>

--===============1167897787193622620==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:18:19 -0400 (Wed, 19 Oct 2011)
New Revision: 15140

Modified:
   container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/w=
ebservices/tomcat/WebMetaDataCreator.java
Log:
[JBAS-8363] clarifying API - endpoint can be deployed to one virtual host o=
nly

Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jbo=
ss/as/webservices/tomcat/WebMetaDataCreator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/tomcat/WebMetaDataCreator.java	2011-10-19 10:14:04 UTC (rev 151=
39)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/=
webservices/tomcat/WebMetaDataCreator.java	2011-10-19 10:18:19 UTC (rev 151=
40)
@@ -21,6 +21,7 @@
  */
 package org.jboss.as.webservices.tomcat;
 =

+import java.util.Arrays;
 import java.util.List;
 =

 import org.jboss.as.server.deployment.DeploymentUnit;
@@ -139,9 +140,12 @@
         }
 =

         // Set virtual hosts
-        final List<String> virtualHosts =3D dep.getService().getVirtualHos=
ts();
-        log.debug("Setting virtual hosts: " + virtualHosts);
-        jbossWebMD.setVirtualHosts(virtualHosts);
+        final String virtualHost =3D dep.getService().getVirtualHost();
+        if (virtualHost !=3D null)
+        {
+           log.debug("Setting virtual host: " + virtualHost);
+           jbossWebMD.setVirtualHosts(Arrays.asList(virtualHost));
+        }
     }
 =

     /**


--===============1167897787193622620==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:52:16 2011
Content-Type: multipart/mixed; boundary="===============1892804708721993863=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15141 - api/trunk.
Date: Wed, 19 Oct 2011 06:52:16 -0400
Message-ID: <201110191052.p9JAqGWn029598@svn01.web.mwc.hst.phx2.redhat.com>

--===============1892804708721993863==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:52:15 -0400 (Wed, 19 Oct 2011)
New Revision: 15141

Modified:
   api/trunk/pom.xml
Log:
prepare for tagging

Modified: api/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- api/trunk/pom.xml	2011-10-19 10:18:19 UTC (rev 15140)
+++ api/trunk/pom.xml	2011-10-19 10:52:15 UTC (rev 15141)
@@ -7,20 +7,20 @@
   <packaging>jar</packaging>
   <description>JBossWS API</description>
 =

-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.0.Alpha4</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/trunk</=
connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
runk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/tags/jb=
ossws-api-1.0.0.Alpha4</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
ags/jbossws-api-1.0.0.Alpha4</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/tags/jbossws-api-1.0=
.0.Alpha4</url>
   </scm>
   =

   <properties>


--===============1892804708721993863==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:53:57 2011
Content-Type: multipart/mixed; boundary="===============0520162825019624608=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15142 - api/trunk.
Date: Wed, 19 Oct 2011 06:53:56 -0400
Message-ID: <201110191053.p9JAruv3029611@svn01.web.mwc.hst.phx2.redhat.com>

--===============0520162825019624608==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:53:56 -0400 (Wed, 19 Oct 2011)
New Revision: 15142

Modified:
   api/trunk/pom.xml
Log:
prepare for tagging

Modified: api/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- api/trunk/pom.xml	2011-10-19 10:52:15 UTC (rev 15141)
+++ api/trunk/pom.xml	2011-10-19 10:53:56 UTC (rev 15142)
@@ -7,7 +7,7 @@
   <packaging>jar</packaging>
   <description>JBossWS API</description>
 =

-  <version>1.0.0.Alpha4</version>
+  <version>1.0.0.Beta3</version>
 =

   <!-- Parent -->
   <parent>
@@ -18,9 +18,9 @@
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/tags/jb=
ossws-api-1.0.0.Alpha4</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
ags/jbossws-api-1.0.0.Alpha4</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/tags/jbossws-api-1.0=
.0.Alpha4</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/tags/jb=
ossws-api-1.0.0.Beta3</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
ags/jbossws-api-1.0.0.Beta3</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/tags/jbossws-api-1.0=
.0.Beta3</url>
   </scm>
   =

   <properties>


--===============0520162825019624608==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:54:48 2011
Content-Type: multipart/mixed; boundary="===============1985646651055531949=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15143 - api/tags.
Date: Wed, 19 Oct 2011 06:54:47 -0400
Message-ID: <201110191054.p9JAslbO029629@svn01.web.mwc.hst.phx2.redhat.com>

--===============1985646651055531949==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:54:47 -0400 (Wed, 19 Oct 2011)
New Revision: 15143

Added:
   api/tags/jbossws-api-1.0.0.Beta3/
Log:
tagging JBossWS API 1.0.0.Beta3


--===============1985646651055531949==--

From jbossws-commits at lists.jboss.org Wed Oct 19 06:57:39 2011
Content-Type: multipart/mixed; boundary="===============2354411393110385996=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15144 - api/trunk.
Date: Wed, 19 Oct 2011 06:57:39 -0400
Message-ID: <201110191057.p9JAvd4D029985@svn01.web.mwc.hst.phx2.redhat.com>

--===============2354411393110385996==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 06:57:39 -0400 (Wed, 19 Oct 2011)
New Revision: 15144

Modified:
   api/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: api/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- api/trunk/pom.xml	2011-10-19 10:54:47 UTC (rev 15143)
+++ api/trunk/pom.xml	2011-10-19 10:57:39 UTC (rev 15144)
@@ -7,22 +7,22 @@
   <packaging>jar</packaging>
   <description>JBossWS API</description>
 =

-  <version>1.0.0.Beta3</version>
+  <version>1.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/tags/jb=
ossws-api-1.0.0.Beta3</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
ags/jbossws-api-1.0.0.Beta3</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/tags/jbossws-api-1.0=
.0.Beta3</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/api/trunk</=
connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/api/t=
runk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/api/trunk</url>
   </scm>
-  =

+
   <properties>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
     <junit.version>3.8.2</junit.version>
@@ -38,7 +38,7 @@
       <version>${jboss-logging-spi.version}</version>
       <scope>provided</scope>
     </dependency>
-    =

+
     <!-- test dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -46,7 +46,7 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
-    =

+
   </dependencies>
 =

   <!-- Plugins -->


--===============2354411393110385996==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:02:05 2011
Content-Type: multipart/mixed; boundary="===============4895637227407311472=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15145 - spi/trunk.
Date: Wed, 19 Oct 2011 07:02:05 -0400
Message-ID: <201110191102.p9JB25fI004086@svn01.web.mwc.hst.phx2.redhat.com>

--===============4895637227407311472==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:02:05 -0400 (Wed, 19 Oct 2011)
New Revision: 15145

Modified:
   spi/trunk/pom.xml
Log:
prepare for tagging

Modified: spi/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/pom.xml	2011-10-19 10:57:39 UTC (rev 15144)
+++ spi/trunk/pom.xml	2011-10-19 11:02:05 UTC (rev 15145)
@@ -7,25 +7,25 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta12</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</=
connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
runk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta12</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta12</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta12</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
+    <jbossws.api.version>1.0.0.Beta3</jbossws.api.version>
     <jms.api.version>1.0.0.Final</jms.api.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
     <servlet.api.version>1.0.0.Final</servlet.api.version>


--===============4895637227407311472==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:04:47 2011
Content-Type: multipart/mixed; boundary="===============3111503639034664688=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15146 - spi/tags.
Date: Wed, 19 Oct 2011 07:04:47 -0400
Message-ID: <201110191104.p9JB4lE8004108@svn01.web.mwc.hst.phx2.redhat.com>

--===============3111503639034664688==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:04:47 -0400 (Wed, 19 Oct 2011)
New Revision: 15146

Added:
   spi/tags/jbossws-spi-2.0.0.Beta12/
Log:
tagging JBossWS SPI 2.0.0.Beta12


--===============3111503639034664688==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:05:11 2011
Content-Type: multipart/mixed; boundary="===============4718931205113908336=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15147 - spi/trunk.
Date: Wed, 19 Oct 2011 07:05:11 -0400
Message-ID: <201110191105.p9JB5BDv004460@svn01.web.mwc.hst.phx2.redhat.com>

--===============4718931205113908336==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:05:11 -0400 (Wed, 19 Oct 2011)
New Revision: 15147

Modified:
   spi/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: spi/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/pom.xml	2011-10-19 11:04:47 UTC (rev 15146)
+++ spi/trunk/pom.xml	2011-10-19 11:05:11 UTC (rev 15147)
@@ -7,25 +7,25 @@
   <packaging>jar</packaging>
   <description>JBossWS SPI</description>
 =

-  <version>2.0.0.Beta12</version>
+  <version>2.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jb=
ossws-spi-2.0.0.Beta12</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
ags/jbossws-spi-2.0.0.Beta12</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0=
.0.Beta12</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</=
connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/t=
runk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.api.version>1.0.0.Beta3</jbossws.api.version>
+    <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version>
     <jms.api.version>1.0.0.Final</jms.api.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
     <servlet.api.version>1.0.0.Final</servlet.api.version>


--===============4718931205113908336==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:09:33 2011
Content-Type: multipart/mixed; boundary="===============2244594580692831663=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15148 - common/trunk.
Date: Wed, 19 Oct 2011 07:09:33 -0400
Message-ID: <201110191109.p9JB9Xmn004487@svn01.web.mwc.hst.phx2.redhat.com>

--===============2244594580692831663==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:09:32 -0400 (Wed, 19 Oct 2011)
New Revision: 15148

Modified:
   common/trunk/pom.xml
Log:
prepare for tagging

Modified: common/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/pom.xml	2011-10-19 11:05:11 UTC (rev 15147)
+++ common/trunk/pom.xml	2011-10-19 11:09:32 UTC (rev 15148)
@@ -9,25 +9,25 @@
   <packaging>jar</packaging>
   <description>JBossWS Common</description>
 =

-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0.Beta12</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.10.Alpha2</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trun=
k</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/trunk</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags=
/jbossws-common-2.0.0.Beta12</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/tags/jbossws-common-2.0.0.Beta12</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-comm=
on-2.0.0.Beta12</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
+    <jbossws.spi.version>2.0.0.Beta12</jbossws.spi.version>
     <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
     <jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============2244594580692831663==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:13:52 2011
Content-Type: multipart/mixed; boundary="===============4855415586532362615=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15149 - common/tags.
Date: Wed, 19 Oct 2011 07:13:51 -0400
Message-ID: <201110191113.p9JBDpQ3004957@svn01.web.mwc.hst.phx2.redhat.com>

--===============4855415586532362615==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:13:51 -0400 (Wed, 19 Oct 2011)
New Revision: 15149

Added:
   common/tags/jbossws-common-2.0.0.Beta12/
Log:
tagging JBossWS Common 2.0.0.Beta12


--===============4855415586532362615==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:14:15 2011
Content-Type: multipart/mixed; boundary="===============4337407041674434221=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15150 - common/trunk.
Date: Wed, 19 Oct 2011 07:14:14 -0400
Message-ID: <201110191114.p9JBEEsG004970@svn01.web.mwc.hst.phx2.redhat.com>

--===============4337407041674434221==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:14:14 -0400 (Wed, 19 Oct 2011)
New Revision: 15150

Modified:
   common/trunk/pom.xml
Log:
prepare for next dev. cycle

Modified: common/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/pom.xml	2011-10-19 11:13:51 UTC (rev 15149)
+++ common/trunk/pom.xml	2011-10-19 11:14:14 UTC (rev 15150)
@@ -9,25 +9,25 @@
   <packaging>jar</packaging>
   <description>JBossWS Common</description>
 =

-  <version>2.0.0.Beta12</version>
+  <version>2.0.0-SNAPSHOT</version>
 =

   <!-- Parent -->
   <parent>
     <groupId>org.jboss.ws</groupId>
     <artifactId>jbossws-parent</artifactId>
-    <version>1.0.10.Alpha2</version>
+    <version>1.0.10-SNAPSHOT</version>
   </parent>
 =

   <!-- Source Control Management -->
   <scm>
-    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags=
/jbossws-common-2.0.0.Beta12</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/tags/jbossws-common-2.0.0.Beta12</developerConnection>
-    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-comm=
on-2.0.0.Beta12</url>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trun=
k</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/commo=
n/trunk</developerConnection>
+    <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url>
   </scm>
 =

   <!-- Properties -->
   <properties>
-    <jbossws.spi.version>2.0.0.Beta12</jbossws.spi.version>
+    <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
     <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
     <jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
     <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>


--===============4337407041674434221==--

From jbossws-commits at lists.jboss.org Wed Oct 19 07:40:21 2011
Content-Type: multipart/mixed; boundary="===============5850627215723610127=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15151 -
 stack/cxf/trunk/modules/testsuite.
Date: Wed, 19 Oct 2011 07:40:20 -0400
Message-ID: <201110191140.p9JBeKrJ007712@svn01.web.mwc.hst.phx2.redhat.com>

--===============5850627215723610127==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-19 07:40:20 -0400 (Wed, 19 Oct 2011)
New Revision: 15151

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-19 11:14:14 UTC (rev =
15150)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-19 11:40:20 UTC (rev =
15151)
@@ -1305,9 +1305,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- # [JBWS-3371] waiting for merge upstream -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
-
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>


--===============5850627215723610127==--

From jbossws-commits at lists.jboss.org Wed Oct 19 12:50:30 2011
Content-Type: multipart/mixed; boundary="===============0268026162967237274=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15152 - in
 stack/native/trunk/modules/testsuite:
 native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/docstyle/bare and
 8 other directories.
Date: Wed, 19 Oct 2011 12:50:30 -0400
Message-ID: <201110191650.p9JGoUd7001609@svn01.web.mwc.hst.phx2.redhat.com>

--===============0268026162967237274==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-19 12:50:29 -0400 (Wed, 19 Oct 2011)
New Revision: 15152

Modified:
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase.=
java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/holder/HolderTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/message/MessageTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbos=
s/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
   stack/native/trunk/modules/testsuite/pom.xml
Log:
Enabling further jaxrpc tests


Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java	=
2011-10-19 11:40:20 UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/docstyle/bare/TrivialServiceDocBareTestCase.java	=
2011-10-19 16:50:29 UTC (rev 15152)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.docstyle.bare;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,8 @@
  */
 public class TrivialServiceDocBareTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/docstyle/bare";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-docstyle-bare";
    private static TrivialService port;
 =

    public static Test suite()
@@ -50,11 +56,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TrivialService");
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testProducPurchase() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTe=
stCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase=
.java	2011-10-19 11:40:20 UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialServiceDocWrappedTestCase=
.java	2011-10-19 16:50:29 UTC (rev 15152)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.docstyle.wrapped;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,8 @@
  */
 public class TrivialServiceDocWrappedTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/docstyle/wrapped";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-docstyle-wrapped";
    private static TrivialService port;
 =

    public static Test suite()
@@ -50,11 +56,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TrivialService");
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testProducTrivial() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java	2011-10-19 11:40=
:20 UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/exception/ExceptionTestCase.java	2011-10-19 16:50=
:29 UTC (rev 15152)
@@ -22,6 +22,7 @@
 package org.jboss.test.ws.jaxrpc.samples.exception;
 =

 import java.io.ByteArrayInputStream;
+import java.net.URL;
 import java.rmi.RemoteException;
 =

 import javax.naming.InitialContext;
@@ -55,6 +56,7 @@
 public class ExceptionTestCase extends JBossWSTest
 {
    private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/exception";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-exception";
 =

    public static Test suite() throws Exception
    {
@@ -63,10 +65,9 @@
 =

    private ExceptionServiceInterface getPort() throws Exception
    {
-      InitialContext iniCtx =3D getInitialContext();
-      ExceptionService service =3D (ExceptionService)iniCtx.lookup("java:c=
omp/env/service/ExceptionService");
-      ExceptionServiceInterface port =3D service.getPort();
-      return port;
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, "ExceptionService"));
+      return (ExceptionServiceInterface)service.getPort(new QName(TARGET_N=
AMESPACE, "ExceptionServiceInterfacePort"), ExceptionServiceInterface.class=
);
    }
 =

    /** Test creation of a SOAPFault */

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java	2011-10-19 11:4=
0:20 UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/handler/HeaderClientTestCase.java	2011-10-19 16:5=
0:29 UTC (rev 15152)
@@ -21,14 +21,18 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.handler;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.ParameterMode;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.holders.StringHolder;
 =

 import junit.framework.Test;
 =

+import org.jboss.test.ws.jaxrpc.samples.handler.HeaderTestService;
 import org.jboss.ws.common.Constants;
 import org.jboss.ws.core.StubExt;
 import org.jboss.wsf.test.JBossWSTest;
@@ -43,6 +47,7 @@
 public class HeaderClientTestCase extends JBossWSTest
 {
    public final String TARGET_ENDPOINT_ADDRESS =3D "http://" + getServerHo=
st() + ":8080/jaxrpc-samples-handler";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/handler";
 =

    private static HeaderTestService port;
 =

@@ -57,11 +62,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (HeaderTestService)service.getPort(HeaderTestService.cla=
ss);
+         port =3D getService(HeaderTestService.class, "TestService", "Head=
erTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_ADDRESS + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testBoundInHeader() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/holder/HolderTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/holder/HolderTestCase.java	2011-10-19 11:40:20 UT=
C (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/holder/HolderTestCase.java	2011-10-19 16:50:29 UT=
C (rev 15152)
@@ -23,11 +23,13 @@
 =

 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.URL;
 import java.util.GregorianCalendar;
 =

 import javax.naming.InitialContext;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.holders.BigDecimalHolder;
 import javax.xml.rpc.holders.BigIntegerHolder;
 import javax.xml.rpc.holders.BooleanHolder;
@@ -62,6 +64,9 @@
  */
 public class HolderTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-holder";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/holder";
+   =

    private static HolderTestService port;
 =

    public static Test suite()
@@ -75,11 +80,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (HolderTestService)service.getPort(HolderTestService.cla=
ss);
+         port =3D getService(HolderTestService.class, "TestService", "Hold=
erTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testEchoBigDecimal() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/message/MessageTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/message/MessageTestCase.java	2011-10-19 11:40:20 =
UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/message/MessageTestCase.java	2011-10-19 16:50:29 =
UTC (rev 15152)
@@ -30,6 +30,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPConnection;
@@ -48,7 +49,7 @@
 =

 import org.jboss.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.ws.common.DOMUtils;
+import org.jboss.ws.api.util.DOMUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 =

@@ -61,6 +62,7 @@
 public class MessageTestCase extends JBossWSTest
 {
    private final String TARGET_ENDPOINT =3D "http://" + getServerHost() + =
":8080/jaxrpc-samples-message";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/message";
 =

    /** Deploy the test ear */
    public static Test suite() throws Exception
@@ -129,12 +131,11 @@
 =

    private MessageTestService getPort() throws Exception
    {
-      InitialContext iniCtx =3D getInitialContext();
-      Service service =3D (Service)iniCtx.lookup("java:comp/env/service/Me=
ssageService");
-      MessageTestService port =3D (MessageTestService)service.getPort(Mess=
ageTestService.class);
-      return port;
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT + "?wsdl"), new QName(TARGET_NAMESPACE, "MessageService"));
+      return (MessageTestService)service.getPort(new QName(TARGET_NAMESPAC=
E, "MessageTestServicePort"), MessageTestService.class);
    }
-
+   =

    private SOAPElement convertToSOAPElement(Element reqElement) throws Tra=
nsformerException, SOAPException
    {
       SOAPElement parent =3D SOAPFactory.newInstance().createElement("dumm=
y");

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java	2011-10-19 11:40:20 UTC (r=
ev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java	2011-10-19 16:50:29 UTC (r=
ev 15152)
@@ -24,16 +24,18 @@
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 =

 import javax.activation.DataHandler;
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 import javax.xml.rpc.Stub;
 import javax.xml.transform.stream.StreamSource;
 =

 import junit.framework.Test;
 =

-import org.jboss.ws.core.StubExt;
 import org.jboss.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestSetup;
 =

@@ -46,6 +48,9 @@
  */
 public class MTOMTestCase extends JBossWSTest
 {
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/mtom";
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-mtom";
+   =

    private static EmployeeRecords port;
 =

    /** Deploy the test ear */
@@ -60,11 +65,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/XOPTestService");
-         port =3D (EmployeeRecords)service.getPort(EmployeeRecords.class);
+         port =3D getService(EmployeeRecords.class, "EmployeeService", "Em=
ployeeRecordsPort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testUpdate() throws Exception
    {
@@ -92,7 +101,7 @@
 =

       StreamSource xmlStream =3D (StreamSource)employee.getLegacyData().ge=
tContent();
       String content =3D new BufferedReader(new InputStreamReader(xmlStrea=
m.getInputStream())).readLine();
-      assertEquals("<Payroll><Data/></Payroll>", content);
+      assertTrue(content.contains("<Payroll><Data/></Payroll>"));
    }
 =

    private DataHandler getLegacyData()
@@ -102,6 +111,6 @@
 =

    private void setMTOMEnabled(Boolean b)
    {
-      ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, b);
+      ((Stub)port)._setProperty("org.jboss.ws.mtom.enabled", b);
    }
 }

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java	2011-10-19 11:40:20 UT=
C (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/oneway/OneWayTestCase.java	2011-10-19 16:50:29 UT=
C (rev 15152)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.oneway;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,9 @@
  */
 public class OneWayTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-oneway";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/oneway";
+   =

    private static OneWayTestService port;
 =

    public static Test suite()
@@ -50,11 +57,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TestService");
-         port =3D (OneWayTestService)service.getPort(OneWayTestService.cla=
ss);
+         port =3D getService(OneWayTestService.class, "TestService", "OneW=
ayTestServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testOneWay() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/o=
rg/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java	2011-10-1=
9 11:40:20 UTC (rev 15151)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jbo=
ss/test/ws/jaxrpc/samples/rpcstyle/TrivialServiceRpcTestCase.java	2011-10-1=
9 16:50:29 UTC (rev 15152)
@@ -21,8 +21,12 @@
  */
 package org.jboss.test.ws.jaxrpc.samples.rpcstyle;
 =

+import java.net.URL;
+
 import javax.naming.InitialContext;
+import javax.xml.namespace.QName;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
 =

 import junit.framework.Test;
 =

@@ -37,6 +41,9 @@
  */
 public class TrivialServiceRpcTestCase extends JBossWSTest
 {
+   private static final String TARGET_ENDPOINT_URL =3D "http://" + getServ=
erHost() + ":8080/jaxrpc-samples-rpcstyle";
+   private static final String TARGET_NAMESPACE =3D "http://org.jboss.ws/s=
amples/rpcstyle";
+   =

    private static TrivialService port;
 =

    public static Test suite()
@@ -50,11 +57,15 @@
 =

       if (port =3D=3D null)
       {
-         InitialContext iniCtx =3D getInitialContext();
-         Service service =3D (Service)iniCtx.lookup("java:comp/env/service=
/TrivialService");
-         port =3D (TrivialService)service.getPort(TrivialService.class);
+         port =3D getService(TrivialService.class, "SampleService", "Trivi=
alServicePort");
       }
    }
+   =

+   protected <T> T getService(final Class<T> clazz, final String serviceNa=
me, final String portName) throws Exception {
+      ServiceFactory serviceFactory =3D ServiceFactory.newInstance();
+      Service service =3D serviceFactory.createService(new URL(TARGET_ENDP=
OINT_URL + "?wsdl"), new QName(TARGET_NAMESPACE, serviceName));
+      return (T) service.getPort(new QName(TARGET_NAMESPACE, portName), cl=
azz);
+   }
 =

    public void testTrivialAccess() throws Exception
    {

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-19 11:40:20 UTC (r=
ev 15151)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-19 16:50:29 UTC (r=
ev 15152)
@@ -1044,7 +1044,7 @@
                  <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**<=
/exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
 =

-                 <!-- # appclient & jaxrpc client issues -->
+                 <!-- # Remote JNDI lookup & jaxrpc client issues -->
                  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocE=
JBTestCase*</exclude>
                  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJ=
SETestCase*</exclude>
                  <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcE=
JBTestCase*</exclude>
@@ -1067,7 +1067,6 @@
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCa=
se*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCa=
se*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase=
*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase=
*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCa=
se*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTe=
stCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCa=
se*</exclude>
@@ -1126,26 +1125,17 @@
                  <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLit=
TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallRpcLit=
TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTe=
stCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/bare/T=
rivialServiceDocBareTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/docstyle/wrappe=
d/TrivialServiceDocWrappedTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/=
DynamicHandlerTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/=
StaticHandlerTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/exception/Excep=
tionTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/handler/HeaderC=
lientTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/message/Message=
TestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCa=
se*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/oneway/OneWayTe=
stCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/rpcstyle/Trivia=
lServiceRpcTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/Secur=
eEJBTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/Serv=
iceRefClientTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/Serv=
iceRefEJBTestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/Serv=
iceRefServletTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/=
AddressingReplyToTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/Simp=
leEncryptTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/Simp=
leSignTestCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</e=
xclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublish=
TestCase*</exclude>
-                 <exclude>org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase*=
</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*<=
/exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTe=
stCase*</exclude>
                  <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*=
</exclude>


--===============0268026162967237274==--

From jbossws-commits at lists.jboss.org Thu Oct 20 02:40:46 2011
Content-Type: multipart/mixed; boundary="===============1301845162075588546=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15153 -
 stack/cxf/trunk/modules/testsuite.
Date: Thu, 20 Oct 2011 02:40:46 -0400
Message-ID: <201110200640.p9K6ekEj032661@svn01.web.mwc.hst.phx2.redhat.com>

--===============1301845162075588546==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-20 02:40:45 -0400 (Thu, 20 Oct 2011)
New Revision: 15153

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-19 16:50:29 UTC (rev =
15152)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-20 06:40:45 UTC (rev =
15153)
@@ -1288,9 +1288,6 @@
                  <!--# [JBWS-2397] Fix jbws1797 testcase-->
                  <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
 =

-                 <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
-                 <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.=
*</exclude>
-
                  <!--# [JBAS-9188] On AS7 We don't support nested EJB & WA=
R archives neither in .sar nor in .jar archives -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>


--===============1301845162075588546==--

From jbossws-commits at lists.jboss.org Thu Oct 20 02:45:26 2011
Content-Type: multipart/mixed; boundary="===============7160191127511132051=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15154 -
 stack/native/trunk/modules/testsuite.
Date: Thu, 20 Oct 2011 02:45:26 -0400
Message-ID: <201110200645.p9K6jQOO000610@svn01.web.mwc.hst.phx2.redhat.com>

--===============7160191127511132051==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-20 02:45:26 -0400 (Thu, 20 Oct 2011)
New Revision: 15154

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-20 06:40:45 UTC (r=
ev 15153)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-20 06:45:26 UTC (r=
ev 15154)
@@ -998,9 +998,6 @@
                  <!-- # [EJBTHREE-1152] service-ref in ejb-jar.xml is igno=
red-->
                  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/Servi=
ceRefEJBTestCase.*</exclude>
 =

-                 <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.=
*</exclude>
-
                  <!-- # [JBWS-3150] This test causes hudson to freeze -->
                  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTest=
Case.*</exclude>
 =



--===============7160191127511132051==--

From jbossws-commits at lists.jboss.org Fri Oct 21 04:51:17 2011
Content-Type: multipart/mixed; boundary="===============7852053827265054071=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15155 -
 stack/native/trunk/modules/testsuite/native-tests/scripts.
Date: Fri, 21 Oct 2011 04:51:17 -0400
Message-ID: <201110210851.p9L8pHV4011081@svn01.web.mwc.hst.phx2.redhat.com>

--===============7852053827265054071==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-21 04:51:17 -0400 (Fri, 21 Oct 2011)
New Revision: 15155

Modified:
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-int=
erop.xml
Log:
proper excludes

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-j=
ars-interop.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-in=
terop.xml	2011-10-20 06:45:26 UTC (rev 15154)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-in=
terop.xml	2011-10-21 08:51:17 UTC (rev 15155)
@@ -181,6 +181,9 @@
       webxml=3D"${tests.output.dir}/test-resources/interop/nov2007/wsse/en=
crypt/WEB-INF/web.xml">
       <classes dir=3D"${tests.output.dir}/test-classes">
         <include name=3D"org/jboss/test/ws/interop/nov2007/wsse/**/*.class=
"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/UsernameTo=
kenHTTPSTestService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DE=
STestService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/*TestCase.=
class"/>
         <include name=3D"org/jboss/test/ws/interop/*.class"/>
       </classes>
       =

@@ -213,6 +216,9 @@
       webxml=3D"${tests.output.dir}/test-resources/interop/nov2007/wsse/en=
crypt3DES/WEB-INF/web.xml">
       <classes dir=3D"${tests.output.dir}/test-classes">
         <include name=3D"org/jboss/test/ws/interop/nov2007/wsse/**/*.class=
"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/UsernameTo=
kenHTTPSTestService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/EncryptTes=
tService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/*TestCase.=
class"/>
         <include name=3D"org/jboss/test/ws/interop/*.class"/>
       </classes>
       =

@@ -245,6 +251,9 @@
       webxml=3D"${tests.output.dir}/test-resources/interop/nov2007/wsse/us=
ernameTokenHTTPS/WEB-INF/web.xml">
       <classes dir=3D"${tests.output.dir}/test-classes">
         <include name=3D"org/jboss/test/ws/interop/nov2007/wsse/**/*.class=
"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DE=
STestService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/EncryptTes=
tService.class"/>
+        <exclude name=3D"org/jboss/test/ws/interop/nov2007/wsse/*TestCase.=
class"/>
         <include name=3D"org/jboss/test/ws/interop/*.class"/>
       </classes>
       <webinf dir=3D"${tests.output.dir}/test-resources/interop/nov2007/ws=
se/usernameTokenHTTPS/WEB-INF">


--===============7852053827265054071==--

From jbossws-commits at lists.jboss.org Fri Oct 21 05:21:38 2011
Content-Type: multipart/mixed; boundary="===============2836674416201300811=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15156 -
 shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish.
Date: Fri, 21 Oct 2011 05:21:37 -0400
Message-ID: <201110210921.p9L9Lbgr019874@svn01.web.mwc.hst.phx2.redhat.com>

--===============2836674416201300811==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-21 05:21:37 -0400 (Fri, 21 Oct 2011)
New Revision: 15156

Modified:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish=
/EndpointImpl2.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish=
/EndpointPublishServlet.java
Log:
each endpoint should use unique serviceName

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
publish/EndpointImpl2.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publis=
h/EndpointImpl2.java	2011-10-21 08:51:17 UTC (rev 15155)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publis=
h/EndpointImpl2.java	2011-10-21 09:21:37 UTC (rev 15156)
@@ -25,7 +25,7 @@
 =

 import org.jboss.logging.Logger;
 =

-(a)WebService(serviceName=3D"EndpointService", portName=3D"EndpointPort", =
endpointInterface =3D "org.jboss.test.ws.publish.Endpoint")
+(a)WebService(serviceName=3D"EndpointService2", portName=3D"EndpointPort",=
 endpointInterface =3D "org.jboss.test.ws.publish.Endpoint")
 public class EndpointImpl2
 {
    // Provide logging

Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/=
publish/EndpointPublishServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publis=
h/EndpointPublishServlet.java	2011-10-21 08:51:17 UTC (rev 15155)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publis=
h/EndpointPublishServlet.java	2011-10-21 09:21:37 UTC (rev 15156)
@@ -82,8 +82,8 @@
          }
          =

          //call endpoint
-         invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsd=
l"));
-         invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?ws=
dl"));
+         invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsd=
l"), new QName("http://publish.ws.test.jboss.org/", "EndpointService"));
+         invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?ws=
dl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2"));
          =

          res.getWriter().print("1");
       }
@@ -110,8 +110,7 @@
       }
    }
    =

-   private static void invoke(URL wsdlURL) throws Exception {
-      QName serviceName =3D new QName("http://publish.ws.test.jboss.org/",=
 "EndpointService");
+   private static void invoke(URL wsdlURL, QName serviceName) throws Excep=
tion {
       Service service =3D Service.create(wsdlURL, serviceName);
       org.jboss.test.ws.publish.Endpoint port =3D service.getPort(org.jbos=
s.test.ws.publish.Endpoint.class);
       String result =3D port.echo("Foo");


--===============2836674416201300811==--

From jbossws-commits at lists.jboss.org Fri Oct 21 05:50:16 2011
Content-Type: multipart/mixed; boundary="===============7411688584853745145=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15157 -
 stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint.
Date: Fri, 21 Oct 2011 05:50:16 -0400
Message-ID: <201110210950.p9L9oG5g022560@svn01.web.mwc.hst.phx2.redhat.com>

--===============7411688584853745145==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-21 05:50:16 -0400 (Fri, 21 Oct 2011)
New Revision: 15157

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test=
/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
Log:
provide default constructor as required by JAXWS spec

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jbo=
ss/test/ws/jaxws/cxf/endpoint/HelloWorldImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/cxf/endpoint/HelloWorldImpl.java	2011-10-21 09:21:37 UTC (rev 15=
156)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/cxf/endpoint/HelloWorldImpl.java	2011-10-21 09:50:16 UTC (rev 15=
157)
@@ -27,6 +27,8 @@
 public class HelloWorldImpl implements HelloWorld
 {
    private ClassLoader _deploymentClassLoader;
+   =

+   public HelloWorldImpl() {}
 =

    public HelloWorldImpl(ClassLoader classloader)
    {


--===============7411688584853745145==--

From jbossws-commits at lists.jboss.org Tue Oct 25 05:57:18 2011
Content-Type: multipart/mixed; boundary="===============5304508511069427267=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15158 - in stack/cxf/trunk:
 modules/client and 3 other directories.
Date: Tue, 25 Oct 2011 05:57:18 -0400
Message-ID: <201110250957.p9P9vI5b025440@svn01.web.mwc.hst.phx2.redhat.com>

--===============5304508511069427267==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-25 05:57:17 -0400 (Tue, 25 Oct 2011)
New Revision: 15158

Modified:
   stack/cxf/trunk/modules/client/pom.xml
   stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/co=
m.sun.tools.xjc.Plugin
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
   stack/cxf/trunk/modules/server/pom.xml
   stack/cxf/trunk/pom.xml
Log:
[JBWX-3374] Move to cxf-xjc utils 2.4.0 and remove dependency on cxf-xjc-bu=
g671


Modified: stack/cxf/trunk/modules/client/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/pom.xml	2011-10-21 09:50:16 UTC (rev 151=
57)
+++ stack/cxf/trunk/modules/client/pom.xml	2011-10-25 09:57:17 UTC (rev 151=
58)
@@ -103,10 +103,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cxf.xjcplugins</groupId>
-      <artifactId>cxf-xjc-bug671</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf.xjcplugins</groupId>
       <artifactId>cxf-xjc-dv</artifactId>
     </dependency>
     <dependency>

Modified: stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/serv=
ices/com.sun.tools.xjc.Plugin
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/c=
om.sun.tools.xjc.Plugin	2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/endorsed/src/main/resources/META-INF/services/c=
om.sun.tools.xjc.Plugin	2011-10-25 09:57:17 UTC (rev 15158)
@@ -1,4 +1,3 @@
 com.sun.tools.xjc.addon.apache_cxf.ts.ToStringPlugin
-com.sun.tools.xjc.addon.apache_cxf.bug671.Bug671Plugin
 com.sun.tools.xjc.addon.apache_cxf.bg.BooleanGetterPlugin
 com.sun.tools.xjc.addon.apache_cxf.dv.DefaultValuePlugin

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsum=
e.bat
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat	=
2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat	=
2011-10-25 09:57:17 UTC (rev 15158)
@@ -37,7 +37,6 @@
 =

 rem CXF XJC patched plugins
 set WSCONSUME_CLASSPATH=3D%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xj=
c-boolean.jar
-set WSCONSUME_CLASSPATH=3D%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xj=
c-bug671.jar
 =

 rem shared jaxws libs
 set WSCONSUME_CLASSPATH=3D%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/stax-a=
pi.jar

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsum=
e.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2=
011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2=
011-10-25 09:57:17 UTC (rev 15158)
@@ -88,7 +88,6 @@
 =

 # CXF XJC patched plugins
 WSCONSUME_CLASSPATH=3D"$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
-WSCONSUME_CLASSPATH=3D"$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
 =

 # shared jaxws libs
 WSCONSUME_CLASSPATH=3D"$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar"

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovid=
e.bat
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat	=
2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat	=
2011-10-25 09:57:17 UTC (rev 15158)
@@ -35,7 +35,6 @@
 =

 rem CXF XJC patched plugins
 set WSPROVIDE_CLASSPATH=3D%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xj=
c-boolean.jar
-set WSPROVIDE_CLASSPATH=3D%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-xj=
c-bug671.jar
 =

 rem shared jaxws libs
 set WSPROVIDE_CLASSPATH=3D%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxb-a=
pi.jar

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovid=
e.sh
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2=
011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2=
011-10-25 09:57:17 UTC (rev 15158)
@@ -89,7 +89,6 @@
 =

 # CXF XJC patched plugins
 WSPROVIDE_CLASSPATH=3D"$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
-WSPROVIDE_CLASSPATH=3D"$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-xjc-bug671.jar"
 =

 # shared jaxws libs
 WSPROVIDE_CLASSPATH=3D"$WSPROVIDE_CLASSPATH:$LIBDIR/jaxb-api.jar"

Modified: stack/cxf/trunk/modules/server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/pom.xml	2011-10-21 09:50:16 UTC (rev 151=
57)
+++ stack/cxf/trunk/modules/server/pom.xml	2011-10-25 09:57:17 UTC (rev 151=
58)
@@ -115,10 +115,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cxf.xjcplugins</groupId>
-      <artifactId>cxf-xjc-bug671</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf.xjcplugins</groupId>
       <artifactId>cxf-xjc-dv</artifactId>
     </dependency>
     <dependency>

Modified: stack/cxf/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/pom.xml	2011-10-21 09:50:16 UTC (rev 15157)
+++ stack/cxf/trunk/pom.xml	2011-10-25 09:57:17 UTC (rev 15158)
@@ -57,7 +57,7 @@
     <ejb.api.version>1.0.1.Final</ejb.api.version>
     <cxf.version>2.4.4-SNAPSHOT</cxf.version>
     <cxf.asm.version>3.3</cxf.asm.version>
-    <cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
+    <cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
     <fastinfoset.api.version>1.2.7</fastinfoset.api.version>
     <jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
     <jboss.logging.version>3.0.0.Beta5</jboss.logging.version>
@@ -803,45 +803,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf.xjcplugins</groupId>
-        <artifactId>cxf-xjc-bug671</artifactId>
-        <version>${cxf.xjcplugins.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-          </exclusion>
-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-asm</artifactId>
-          </exclusion>   =

-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-beans</artifactId>
-          </exclusion> =

-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-context</artifactId>
-          </exclusion> =

-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-core</artifactId>
-          </exclusion>
-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-expression</artifactId>
-          </exclusion>   =

-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-          </exclusion>
-          <exclusion>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-jms</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.cxf.xjcplugins</groupId>
         <artifactId>cxf-xjc-dv</artifactId>
         <version>${cxf.xjcplugins.version}</version>
         <exclusions>


--===============5304508511069427267==--

From jbossws-commits at lists.jboss.org Tue Oct 25 09:38:13 2011
Content-Type: multipart/mixed; boundary="===============5472991666968673129=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15159 - in
 shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4
 other directories.
Date: Tue, 25 Oct 2011 09:38:13 -0400
Message-ID: <201110251338.p9PDcDrQ005090@svn01.web.mwc.hst.phx2.redhat.com>

--===============5472991666968673129==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:38:13 -0400 (Tue, 25 Oct 2011)
New Revision: 15159

Added:
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/AnonymousPOJO.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/POJOIface.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/POJOImpl.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/Usecase1TestCase.java
   shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/j=
bws3276/Usecase2TestCase.java
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-I=
NF/
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-I=
NF/web.xml
Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3276] providing anonymous POJO test cases

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-j=
axws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-25 09:57:17 UTC (rev 15158)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-25 13:38:13 UTC (rev 15159)
@@ -1106,6 +1106,22 @@
                         </webinf>
                 </war>
 		=

+                <!-- jaxws-jbws3276 -->
+                <war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws32=
76-usecase1.war" webxml=3D"${tests.output.dir}/test-resources/jaxws/jbws327=
6/WEB-INF/web.xml">
+                        <classes dir=3D"${tests.output.dir}/test-classes">
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3276=
/POJOIface.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3276=
/POJOImpl.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3276=
/AnonymousPOJO.class"/>
+                        </classes>
+                </war>
+		=

+                <war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws32=
76-usecase2.war" needxmlfile=3D"false">
+                        <classes dir=3D"${tests.output.dir}/test-classes">
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3276=
/POJOIface.class"/>
+                	        <include name=3D"org/jboss/test/ws/jaxws/jbws3276=
/AnonymousPOJO.class"/>
+                        </classes>
+                </war>
+		=

         <!-- jaxws-jbws3293 -->
         <war warfile=3D"${tests.output.dir}/test-libs/jaxws-jbws3293.war" =
webxml=3D"${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml=
">
             <classes dir=3D"${tests.output.dir}/test-classes">

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3276/AnonymousPOJO.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/AnonymousPOJO.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/AnonymousPOJO.java	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+
+/**
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)WebService
+(
+   endpointInterface =3D "org.jboss.test.ws.jaxws.jbws3276.POJOIface",
+   targetNamespace =3D "org.jboss.test.ws.jaxws.jbws3276",
+   serviceName =3D "AnonymousPOJOService"
+)
+public class AnonymousPOJO
+{
+
+    public String echo(final String s)
+    {
+        return s + " from anonymous POJO";
+    }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3276/POJOIface.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/POJOIface.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/POJOIface.java	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)WebService
+(a)SOAPBinding
+public interface POJOIface
+{
+
+   String echo(String s);
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3276/POJOImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/POJOImpl.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/POJOImpl.java	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import javax.jws.WebService;
+
+/**
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+(a)WebService
+(
+   endpointInterface =3D "org.jboss.test.ws.jaxws.jbws3276.POJOIface",
+   targetNamespace =3D "org.jboss.test.ws.jaxws.jbws3276",
+   serviceName =3D "POJOImplService"
+)
+public class POJOImpl
+{
+
+   public String echo(final String s)
+   {
+      return s + " from POJO";
+   }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3276/Usecase1TestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/Usecase1TestCase.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/Usecase1TestCase.java	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3276] Tests anonymous POJO in web archive that contains web.xml w=
ith other endpoint.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class Usecase1TestCase extends JBossWSTest
+{
+
+   public static Test suite()
+   {
+      return new JBossWSTestSetup(Usecase1TestCase.class, "jaxws-jbws3276-=
usecase1.war");
+   }
+
+   public void testAnonymousEndpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
276", "AnonymousPOJOService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jaxws-jbws3276-=
usecase1/AnonymousPOJOService?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final POJOIface port =3D service.getPort(POJOIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("hello from anonymous POJO", result);
+   }
+
+   public void testDeclaredEndpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
276", "POJOImplService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jaxws-jbws3276-=
usecase1/POJOService?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final POJOIface port =3D service.getPort(POJOIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("hello from POJO", result);
+   }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jax=
ws/jbws3276/Usecase2TestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/Usecase2TestCase.java	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/=
jbws3276/Usecase2TestCase.java	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.jbws3276;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3276] Tests anonymous POJO in web archive that is missing web.xml.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class Usecase2TestCase extends JBossWSTest
+{
+
+   public static Test suite()
+   {
+      return new JBossWSTestSetup(Usecase2TestCase.class, "jaxws-jbws3276-=
usecase2.war");
+   }
+
+   public void testAnonymousEndpoint() throws Exception
+   {
+      final QName serviceName =3D new QName("org.jboss.test.ws.jaxws.jbws3=
276", "AnonymousPOJOService");
+      final URL wsdlURL =3D new URL("http://localhost:8080/jaxws-jbws3276-=
usecase2/AnonymousPOJOService?wsdl");
+      final Service service =3D Service.create(wsdlURL, serviceName);
+      final POJOIface port =3D service.getPort(POJOIface.class);
+      final String result =3D port.echo("hello");
+      assertEquals("hello from anonymous POJO", result);
+   }
+
+}

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-=
INF/web.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3276/WEB-=
INF/web.xml	2011-10-25 13:38:13 UTC (rev 15159)
@@ -0,0 +1,15 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<web-app version=3D"3.0"
+         xmlns=3D"http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee http://ja=
va.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         metadata-complete=3D"false">
+    <servlet>
+        <servlet-name>POJOImpl</servlet-name>
+        <servlet-class>org.jboss.test.ws.jaxws.jbws3276.POJOImpl</servlet-=
class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>POJOImpl</servlet-name>
+        <url-pattern>/POJOService</url-pattern>
+    </servlet-mapping>
+</web-app>


--===============5472991666968673129==--

From jbossws-commits at lists.jboss.org Tue Oct 25 09:44:13 2011
Content-Type: multipart/mixed; boundary="===============1764687765119752254=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15160 -
 stack/native/trunk/modules/testsuite.
Date: Tue, 25 Oct 2011 09:44:13 -0400
Message-ID: <201110251344.p9PDiDAi005562@svn01.web.mwc.hst.phx2.redhat.com>

--===============1764687765119752254==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:44:12 -0400 (Tue, 25 Oct 2011)
New Revision: 15160

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
update excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-25 13:38:13 UTC (r=
ev 15159)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-25 13:44:12 UTC (r=
ev 15160)
@@ -569,6 +569,9 @@
 =

                 <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+                <!-- # [JBWS-3276] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -719,6 +722,9 @@
 =

                 <!-- # [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+                <!-- # [JBWS-3276] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -839,6 +845,9 @@
                  <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
 =

+                 <!-- [JBWS-3276] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
@@ -1014,6 +1023,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- waiting for AS7 upstream -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>


--===============1764687765119752254==--

From jbossws-commits at lists.jboss.org Tue Oct 25 09:46:50 2011
Content-Type: multipart/mixed; boundary="===============6910450709495050419=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15161 -
 stack/cxf/trunk/modules/testsuite.
Date: Tue, 25 Oct 2011 09:46:49 -0400
Message-ID: <201110251346.p9PDknau005932@svn01.web.mwc.hst.phx2.redhat.com>

--===============6910450709495050419==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-25 09:46:49 -0400 (Tue, 25 Oct 2011)
New Revision: 15161

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-25 13:44:12 UTC (rev =
15160)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-25 13:46:49 UTC (rev =
15161)
@@ -747,6 +747,9 @@
 =

                 <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+                <!--# [JBWS-3276] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -926,6 +929,9 @@
 =

                 <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                 <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
+
+                <!--# [JBWS-3276] fixed since AS 7.1 -->
+                <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -1050,6 +1056,9 @@
                  <!-- [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
                  <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
 =

+                 <!-- [JBWS-3276] fixed since AS 7.1 -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
                  <!-- TODO: Injections support for WS components -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
@@ -1302,6 +1311,9 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

+                 <!-- waiting for AS7 upstream -->
+                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
+
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>


--===============6910450709495050419==--

From jbossws-commits at lists.jboss.org Wed Oct 26 07:01:53 2011
Content-Type: multipart/mixed; boundary="===============3134109377392356988=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15162 -
 stack/cxf/trunk/modules/testsuite.
Date: Wed, 26 Oct 2011 07:01:53 -0400
Message-ID: <201110261101.p9QB1rH3029266@svn01.web.mwc.hst.phx2.redhat.com>

--===============3134109377392356988==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-26 07:01:52 -0400 (Wed, 26 Oct 2011)
New Revision: 15162

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBPAPP-7430] Adding option for specifying jbossws-native-core filename on =
target AS distro through sys prop


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-25 13:46:49 UTC (rev =
15161)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-26 11:01:52 UTC (rev =
15162)
@@ -1273,6 +1273,8 @@
                 <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</a=
dditionalClasspathElement>
                 <!-- JBossWS Native Core version overwritte by jbossws-nat=
ive stack install -->
                 <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalCla=
sspathElement>
+                <!-- JBossWS Native Core version specified through system =
property -->
+                <additionalClasspathElement>${jboss.home}/modules/org/jbos=
s/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</addit=
ionalClasspathElement>
               </additionalClasspathElements>
               <excludes>
                  <!--# UsernameTestCase requires trustore in jboss-web tom=
cat configuration-->


--===============3134109377392356988==--

From jbossws-commits at lists.jboss.org Wed Oct 26 09:35:38 2011
Content-Type: multipart/mixed; boundary="===============2581688281269254519=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15163 -
 stack/cxf/trunk/modules/testsuite.
Date: Wed, 26 Oct 2011 09:35:38 -0400
Message-ID: <201110261335.p9QDZcvf023286@svn01.web.mwc.hst.phx2.redhat.com>

--===============2581688281269254519==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-26 09:35:38 -0400 (Wed, 26 Oct 2011)
New Revision: 15163

Modified:
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-26 11:01:52 UTC (rev =
15162)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-26 13:35:38 UTC (rev =
15163)
@@ -1313,9 +1313,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- waiting for AS7 upstream -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
-
                  <!-- TODO: EJB3 DD driven deployments -->
                  <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>


--===============2581688281269254519==--

From jbossws-commits at lists.jboss.org Wed Oct 26 09:35:41 2011
Content-Type: multipart/mixed; boundary="===============3492474169552823999=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15164 - in
 thirdparty/cxf/branches/cxf-2.2.12:
 tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal
 and 3 other directories.
Date: Wed, 26 Oct 2011 09:35:41 -0400
Message-ID: <201110261335.p9QDZfJQ023296@svn01.web.mwc.hst.phx2.redhat.com>

--===============3492474169552823999==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jim.ma
Date: 2011-10-26 09:35:40 -0400 (Wed, 26 Oct 2011)
New Revision: 15164

Added:
   thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/resources/=
wsdl2java_wsdl/cxf2193/
   thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/resources/=
wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
Modified:
   thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/=
wsdl11/WSDLServiceBuilder.java
   thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main/=
java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/Processo=
rUtil.java
   thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/a=
pache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Log:
[JBPAPP-7441]:Allow for WRAPPED style code generation for wrapper elements =
with xsd:extension

Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apac=
he/cxf/wsdl11/WSDLServiceBuilder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf=
/wsdl11/WSDLServiceBuilder.java	2011-10-26 13:35:38 UTC (rev 15163)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf=
/wsdl11/WSDLServiceBuilder.java	2011-10-26 13:35:40 UTC (rev 15164)
@@ -83,6 +83,7 @@
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
 =

 import static org.apache.cxf.helpers.CastUtils.cast;
 =

@@ -740,56 +741,76 @@
                                                MessageInfo wrapper, boolea=
n allowRefs) {
         if (type.getParticle() instanceof XmlSchemaSequence) {
             XmlSchemaSequence seq =3D (XmlSchemaSequence)type.getParticle(=
);
-            XmlSchemaObjectCollection items =3D seq.getItems();
-            boolean ret =3D true;
-            for (int x =3D 0; x < items.getCount(); x++) {
-                XmlSchemaObject o =3D items.getItem(x);
-                if (!(o instanceof XmlSchemaElement)) {
+            return buildMessageParts(seq, namespaceURI, wrapper, allowRefs=
);
+        } else if (type.getParticle() =3D=3D null) {
+            if (type.getContentModel() =3D=3D null) {
+                return true;
+            }
+            if (type.getContentModel().getContent() instanceof XmlSchemaCo=
mplexContentExtension) {
+                XmlSchemaComplexContentExtension extension =3D (XmlSchemaC=
omplexContentExtension)type
+                    .getContentModel().getContent();
+                QName baseTypeName =3D extension.getBaseTypeName();
+                ServiceInfo serviceInfo =3D wrapper.getOperation().getInte=
rface().getService();
+                XmlSchemaType schemaType =3D serviceInfo.getXmlSchemaColle=
ction().getTypeByQName(baseTypeName);
+                if (!(schemaType instanceof XmlSchemaComplexType)
+                    || !isWrappableSequence((XmlSchemaComplexType)schemaTy=
pe, namespaceURI, wrapper,
+                                            allowRefs)) {
                     return false;
                 }
-                XmlSchemaElement el =3D (XmlSchemaElement)o;
 =

-                if (el.getSchemaTypeName() !=3D null) {
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(new QNa=
me(namespaceURI, el.getName()));
-                    mpi.setTypeQName(el.getSchemaTypeName());
-                    mpi.setConcreteName(el.getQName());
-                    mpi.setElement(true);
-                    mpi.setElementQName(el.getQName());
-                    mpi.setXmlSchema(el);
-                } else if (el.getRefName() !=3D null) {
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(el.getR=
efName());
-                    mpi.setTypeQName(el.getRefName());
-                    mpi.setElementQName(el.getRefName());
-                    mpi.setElement(true);
-                    mpi.setXmlSchema(el);
-                    mpi.setProperty("isRefElement", true);
-                    // element reference is not permitted for wrapper elem=
ent
-                    if (!allowRefs) {
-                        ret =3D false;
-                    }
-                } else {
-                    // anonymous type
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(new QNa=
me(namespaceURI, el.getName()));
-                    mpi.setConcreteName(el.getQName());
-                    mpi.setElementQName(mpi.getName());
-                    mpi.setElement(true);
-                    mpi.setXmlSchema(el);
+                if (extension.getParticle() instanceof XmlSchemaSequence) {
+                    XmlSchemaSequence seq =3D (XmlSchemaSequence)extension=
.getParticle();
+                    return buildMessageParts(seq, namespaceURI, wrapper, a=
llowRefs);
                 }
-            }
 =

-            return ret;
-        } else if (type.getParticle() =3D=3D null) {
-            if (type.getContentModel() =3D=3D null) {
-                return true;
             }
-            if (type.getContentModel().getContent() instanceof XmlSchemaCo=
mplexContentExtension) {
-                return false;
-            }
             return true;
         }
         return false;
     }
 =

+    private static boolean buildMessageParts(XmlSchemaSequence seq, String=
 namespaceURI, MessageInfo wrapper,
+                                             boolean allowRefs) {
+        XmlSchemaObjectCollection items =3D seq.getItems();
+        boolean ret =3D true;
+
+        for (int i =3D 0; i < items.getCount(); i++) {
+            XmlSchemaObject seqItem =3D items.getItem(i);
+            if (!(seqItem instanceof XmlSchemaElement)) {
+                return false;
+            }
+            XmlSchemaElement el =3D (XmlSchemaElement)seqItem;
+
+            if (el.getSchemaTypeName() !=3D null) {
+                MessagePartInfo mpi =3D wrapper.addMessagePart(new QName(n=
amespaceURI, el.getName()));
+                mpi.setTypeQName(el.getSchemaTypeName());
+                mpi.setElement(true);
+                mpi.setElementQName(el.getQName());
+                mpi.setConcreteName(el.getQName());
+                mpi.setXmlSchema(el);
+            } else if (el.getRefName() !=3D null) {
+                MessagePartInfo mpi =3D wrapper.addMessagePart(el.getRefNa=
me());
+                mpi.setTypeQName(el.getRefName());
+                mpi.setElementQName(el.getRefName());
+                mpi.setElement(true);
+                mpi.setXmlSchema(el);
+                mpi.setProperty("isRefElement", true);
+                // element reference is not permitted for wrapper element
+                if (!allowRefs) {
+                    ret =3D false;
+                }
+            } else {
+                // anonymous type
+                MessagePartInfo mpi =3D wrapper.addMessagePart(new QName(n=
amespaceURI, el.getName()));
+                mpi.setElementQName(mpi.getName());
+                mpi.setConcreteName(el.getQName());
+                mpi.setElement(true);
+                mpi.setXmlSchema(el);
+            }
+        }
+        return ret;
+    }
+    =

     private void buildMessage(AbstractMessageContainer minfo, Message msg)=
 {
         SchemaCollection schemas =3D minfo.getOperation().getInterface().g=
etService()
             .getXmlSchemaCollection();

Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/sr=
c/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/P=
rocessorUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main=
/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/Process=
orUtil.java	2011-10-26 13:35:38 UTC (rev 15163)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/frontend/jaxws/src/main=
/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/Process=
orUtil.java	2011-10-26 13:35:40 UTC (rev 15164)
@@ -49,11 +49,14 @@
 import org.apache.cxf.tools.util.URIParserUtil;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaContent;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaForm;
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
 =

 public final class ProcessorUtil {
     private static final String KEYWORDS_PREFIX =3D "_";
@@ -373,25 +376,53 @@
 =

     public static List<WrapperElement> getWrappedElement(ToolContext conte=
xt, QName partElement) {
         List<WrapperElement> qnames =3D new ArrayList<WrapperElement>();
-        =

+
         ServiceInfo serviceInfo =3D (ServiceInfo)context.get(ServiceInfo.c=
lass);
         SchemaCollection schema =3D serviceInfo.getXmlSchemaCollection();
-       =

+
         XmlSchemaElement elementByName =3D schema.getElementByQName(partEl=
ement);
-        =

+
         XmlSchemaComplexType type =3D (XmlSchemaComplexType)elementByName.=
getSchemaType();
 =

         XmlSchemaSequence seq =3D (XmlSchemaSequence)type.getParticle();
-       =

+
+        qnames.addAll(createWrappedElements(seq));
+
+        // If it's extension
+        if (seq =3D=3D null && type.getContentModel() !=3D null) {
+
+            XmlSchemaContent xmlSchemaConent =3D type.getContentModel().ge=
tContent();
+            if (xmlSchemaConent instanceof XmlSchemaComplexContentExtensio=
n) {
+                XmlSchemaComplexContentExtension extension =3D (XmlSchemaC=
omplexContentExtension)type
+                    .getContentModel().getContent();
+                QName baseTypeName =3D extension.getBaseTypeName();
+                XmlSchemaType schemaType =3D schema.getTypeByQName(baseTyp=
eName);
+                if (schemaType instanceof XmlSchemaComplexType) {
+                    XmlSchemaComplexType complexType =3D (XmlSchemaComplex=
Type)schemaType;
+                    if (complexType.getParticle() instanceof XmlSchemaSequ=
ence) {
+                        seq =3D (XmlSchemaSequence)complexType.getParticle=
();
+                        qnames.addAll(createWrappedElements(seq));
+                    }
+                }
+
+                if (extension.getParticle() instanceof XmlSchemaSequence) {
+                    XmlSchemaSequence xmlSchemaSeq =3D (XmlSchemaSequence)=
extension.getParticle();
+                    qnames.addAll(createWrappedElements(xmlSchemaSeq));
+                }
+            }
+
+        }
+        return qnames;
+    }
+    =

+    private static List<WrapperElement> createWrappedElements(XmlSchemaSeq=
uence seq) {
+
+        List<WrapperElement> qnames =3D new ArrayList<WrapperElement>();
         if (seq !=3D null) {
-
             XmlSchemaObjectCollection items =3D seq.getItems();
-
             Iterator ite =3D items.getIterator();
-
             while (ite.hasNext()) {
                 XmlSchemaElement subElement =3D (XmlSchemaElement)ite.next=
();
-
                 if (subElement.getQName() !=3D null) {
                     qnames.add(new WrapperElement(subElement.getQName(), s=
ubElement.getSchemaTypeName()));
                 } else {

Modified: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/jav=
a/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/=
apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java	2011-10-26 13:35:38 UTC (rev=
 15163)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/java/org/=
apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java	2011-10-26 13:35:40 UTC (rev=
 15164)
@@ -1350,5 +1350,26 @@
         fault =3D classLoader.loadClass("org.apache.cxf.w2j.hello_world_so=
ap_http.BadRecordLitFault");
         assertEquals(fault.getName().hashCode(), ObjectStreamClass.lookup(=
fault).getSerialVersionUID());
     }
+    =

+    =

+    @Test
+    public void testExtensionWrapper() throws Exception {
+        env.put(ToolConstants.CFG_WSDLURL,
+                getLocation("/wsdl2java_wsdl/cxf2193/hello_world_extension=
_wrapped.wsdl"));
+        processor.setContext(env);
+        processor.execute();
 =

+        File infFile =3D new File(output, "org/apache/cxf/w2j/extension_wr=
apped/Greeter.java");
+        assertTrue(infFile.exists());
+
+        Class<?> interfaceClass =3D classLoader.loadClass("org.apache.cxf.=
w2j.extension_wrapped.Greeter");
+
+        Method method =3D interfaceClass.getMethod("greetMe", new Class[] {
+            Holder.class, Holder.class, Holder.class, Holder.class, Holder=
.class
+        });
+        assertTrue("greetMe operation is NOT generated correctly as except=
ed", method !=3D null);
+        RequestWrapper reqWrapper =3D method.getAnnotation(RequestWrapper.=
class);
+        assertNotNull("@RequestWrapper is expected", reqWrapper);
+    }
+
 }

Added: thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/resour=
ces/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/resources=
/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl	                =
        (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/tools/wsdlto/test/src/test/resources=
/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl	2011-10-26 13:35=
:40 UTC (rev 15164)
@@ -0,0 +1,92 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more co=
ntributor =

+	license agreements. See the NOTICE file distributed with this work for ad=
ditional =

+	information regarding copyright ownership. The ASF licenses this file to =

+	you under the Apache License, Version 2.0 (the "License"); you may not us=
e =

+	this file except in compliance with the License. You may obtain a copy of =

+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required =

+	by applicable law or agreed to in writing, software distributed under the =

+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITI=
ONS =

+	OF ANY KIND, either express or implied. See the License for the specific =

+	language governing permissions and limitations under the License. -->
+<wsdl:definitions xmlns=3D"http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap=3D"http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns=3D"http://=
cxf.apache.org/w2j/extension_wrapped"
+	xmlns:x1=3D"http://cxf.apache.org/w2j/extension_wrapped/types"
+	xmlns:wsdl=3D"http://schemas.xmlsoap.org/wsdl/" xmlns:xsd=3D"http://www.w=
3.org/2001/XMLSchema"
+	targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped" name=3D"H=
elloWorld">
+	<wsdl:types>
+		<schema targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped/t=
ypes"
+			xmlns=3D"http://www.w3.org/2001/XMLSchema" xmlns:x1=3D"http://cxf.apach=
e.org/w2j/extension_wrapped/types"
+			elementFormDefault=3D"qualified">
+			<element name=3D"greetMe">
+				<complexType>
+					<sequence>
+						<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" =
/>
+						<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+						<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					</sequence>
+				</complexType>
+			</element>
+
+			<element name=3D"greetMeResponse" type=3D"x1:ComplexContext" />
+
+			<complexType name=3D"ComplexContext">
+				<complexContent>
+					<extension base=3D"x1:ComplexContextType">
+						<sequence>
+							<element name=3D"extraElement" type=3D"xsd:string" />
+						</sequence>
+					</extension>
+				</complexContent>
+			</complexType>
+
+			<complexType name=3D"ComplexContextType">
+				<sequence>
+					<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" />
+					<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"testlist" type=3D"xsd:string" minOccurs=3D"0"
+						maxOccurs=3D"unbounded" />
+				</sequence>
+			</complexType>
+
+
+
+		</schema>
+	</wsdl:types>
+
+	<wsdl:message name=3D"greetMeRequest">
+		<wsdl:part name=3D"in" element=3D"x1:greetMe" />
+	</wsdl:message>
+	<wsdl:message name=3D"greetMeResponse">
+		<wsdl:part name=3D"out" element=3D"x1:greetMeResponse" />
+	</wsdl:message>
+
+	<wsdl:portType name=3D"Greeter">
+		>
+		<wsdl:operation name=3D"greetMe">
+			<wsdl:input name=3D"greetMeRequest" message=3D"tns:greetMeRequest" />
+			<wsdl:output name=3D"greetMeResponse" message=3D"tns:greetMeResponse" />
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name=3D"Greeter_SOAPBinding" type=3D"tns:Greeter">
+		<soap:binding style=3D"document"
+			transport=3D"http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name=3D"greetMe">
+			<soap:operation style=3D"document" />
+			<wsdl:input>
+				<soap:body use=3D"literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use=3D"literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name=3D"SOAPService">
+		<wsdl:port name=3D"SoapPort" binding=3D"tns:Greeter_SOAPBinding">
+			<soap:address location=3D"http://localhost:9000/SoapContext/SoapPort" />
+			<wswa:UsingAddressing xmlns:wswa=3D"http://www.w3.org/2005/02/addressin=
g/wsdl" />
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
+


--===============3492474169552823999==--

From jbossws-commits at lists.jboss.org Wed Oct 26 09:36:31 2011
Content-Type: multipart/mixed; boundary="===============1815823466642146274=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15165 -
 stack/native/trunk/modules/testsuite.
Date: Wed, 26 Oct 2011 09:36:31 -0400
Message-ID: <201110261336.p9QDaVuZ023307@svn01.web.mwc.hst.phx2.redhat.com>

--===============1815823466642146274==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-26 09:36:31 -0400 (Wed, 26 Oct 2011)
New Revision: 15165

Modified:
   stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes

Modified: stack/native/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/pom.xml	2011-10-26 13:35:40 UTC (r=
ev 15164)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-10-26 13:36:31 UTC (r=
ev 15165)
@@ -1023,9 +1023,6 @@
                  <!-- AS7 integration exclusions -->
                  <!-- ////////////////////////// -->
 =

-                 <!-- waiting for AS7 upstream -->
-                 <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
-
                  <!-- # [JBWS-3308] Extends AS7 RemoteDeployer for support=
ing deployment of different security domains -->
                  <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>


--===============1815823466642146274==--

From jbossws-commits at lists.jboss.org Wed Oct 26 09:59:41 2011
Content-Type: multipart/mixed; boundary="===============0845621833347335237=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN:  r15166 - thirdparty/cxf/branches.
Date: Wed, 26 Oct 2011 09:59:41 -0400
Message-ID: <201110261359.p9QDxfLH024986@svn01.web.mwc.hst.phx2.redhat.com>

--===============0845621833347335237==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jim.ma
Date: 2011-10-26 09:59:40 -0400 (Wed, 26 Oct 2011)
New Revision: 15166

Added:
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/
Log:
Create branch for JBPAPP-7441


--===============0845621833347335237==--

From jbossws-commits at lists.jboss.org Wed Oct 26 12:52:50 2011
Content-Type: multipart/mixed; boundary="===============0252907387744050902=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15167 - in stack/cxf/trunk/modules:
 client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration and 2 other
 directories.
Date: Wed, 26 Oct 2011 12:52:50 -0400
Message-ID: <201110261652.p9QGqorh027017@svn01.web.mwc.hst.phx2.redhat.com>

--===============0252907387744050902==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-26 12:52:49 -0400 (Wed, 26 Oct 2011)
New Revision: 15167

Modified:
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cli=
ent/Constants.java
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cli=
ent/configuration/SecurityActions.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/con=
figuration/NonSpringBusHolder.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/dep=
loyment/aspect/BusDeploymentAspect.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/dep=
loyment/aspect/DescriptorDeploymentAspect.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/dep=
loyment/aspect/SecurityActions.java
Log:
[JBWS-3280] Deploy using Spring bus only when Spring is available AND there=
's a jbossws-cxf.xml descriptor in the deployment


Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/=
cxf/client/Constants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/Constants.java	2011-10-26 13:59:40 UTC (rev 15166)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/Constants.java	2011-10-26 16:52:49 UTC (rev 15167)
@@ -31,4 +31,5 @@
 public class Constants
 {
    public static final String DEPLOYMENT_BUS =3D "deployment-bus";
+   public static final String JBOSSWS_CXF_SPRING_DD =3D "jbossws-cxf.xml";
 }

Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/=
cxf/client/configuration/SecurityActions.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/configuration/SecurityActions.java	2011-10-26 13:59:40 UTC (rev 15166)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/configuration/SecurityActions.java	2011-10-26 16:52:49 UTC (rev 15167)
@@ -78,5 +78,24 @@
          });
       }
    }
+   =

+   /**
+    * Return the current value of the specified system property
+    * =

+    * @param name
+    * @param defaultValue
+    * @return
+    */
+   static String getSystemProperty(final String name, final String default=
Value)
+   {
+      PrivilegedAction<String> action =3D new PrivilegedAction<String>()
+      {
+         public String run()
+         {
+            return System.getProperty(name, defaultValue);
+         }
+      };
+      return AccessController.doPrivileged(action);
+   }
 =

 }

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/configuration/NonSpringBusHolder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/co=
nfiguration/NonSpringBusHolder.java	2011-10-26 13:59:40 UTC (rev 15166)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/co=
nfiguration/NonSpringBusHolder.java	2011-10-26 16:52:49 UTC (rev 15167)
@@ -94,7 +94,8 @@
       for (DDEndpoint dde : metadata.getEndpoints())
       {
          EndpointImpl endpoint =3D new EndpointImpl(bus, newInstance(dde.g=
etImplementor()));
-         endpoint.setInvoker((Invoker) newInstance(dde.getInvoker()));
+         if (dde.getInvoker() !=3D null)
+            endpoint.setInvoker((Invoker) newInstance(dde.getInvoker()));
          endpoint.setAddress(dde.getAddress());
          endpoint.setEndpointName(dde.getPortName());
          endpoint.setServiceName(dde.getServiceName());

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/deployment/aspect/BusDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/BusDeploymentAspect.java	2011-10-26 13:59:40 UTC (rev 15166)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/BusDeploymentAspect.java	2011-10-26 16:52:49 UTC (rev 15167)
@@ -76,7 +76,7 @@
          //parent to make sure user provided libs in the deployment do no =
mess up the WS endpoint's deploy if they duplicates
          //libraries already available on the application server modules.
          SecurityActions.setContextClassLoader(new DelegateClassLoader(dep=
.getRuntimeClassLoader(), origClassLoader));
-         if (jbosswsCxfXml !=3D null) // Spring available
+         if (jbosswsCxfXml !=3D null) // Spring available and jbossws-cxf.=
xml provided
          {
             URL cxfServletURL =3D null;
             try
@@ -100,7 +100,7 @@
             }
          }
          else
-         //Spring not available
+         //Spring not available or jbossws-cxf.xml not provided
          {
             DDBeans metadata =3D dep.getAttachment(DDBeans.class);
             holder =3D new NonSpringBusHolder(metadata);

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/deployment/aspect/DescriptorDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/DescriptorDeploymentAspect.java	2011-10-26 13:59:40 UTC (re=
v 15166)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/DescriptorDeploymentAspect.java	2011-10-26 16:52:49 UTC (re=
v 15167)
@@ -38,6 +38,7 @@
 import org.jboss.ws.common.integration.WSConstants;
 import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.stack.cxf.client.Constants;
 import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
 import org.jboss.wsf.stack.cxf.configuration.BusHolder;
 import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
@@ -51,6 +52,8 @@
  */
 public class DescriptorDeploymentAspect extends AbstractDeploymentAspect
 {
+   private static final boolean PREFER_SPRING_DESCRIPTOR_GENERATION =3D Bo=
olean.getBoolean("org.jboss.ws.cxf.prefer_spring_descriptor_generation");
+   =

    private static final ResourceBundle bundle =3D BundleUtils.getBundle(De=
scriptorDeploymentAspect.class);
    // provide logging
    private static final Logger log =3D Logger.getLogger(DescriptorDeployme=
ntAspect.class);
@@ -58,21 +61,29 @@
    @Override
    public void start(Deployment dep)
    {
+      URL cxfURL =3D null;
       if (SpringUtils.isSpringAvailable())
       {
-         URL cxfURL =3D getCXFConfigFromDeployment(dep);
-         if (cxfURL =3D=3D null)
+         //only try reading jbossws-cxf.xml if Spring available...
+         cxfURL =3D getCXFConfigFromDeployment(dep);
+         //... but do not generate it if it's not provided
+         //or unless it's explicitly required to be generated
+         if (cxfURL =3D=3D null && PREFER_SPRING_DESCRIPTOR_GENERATION)
          {
-            cxfURL =3D generateCXFConfigFromDeployment(dep);
+            DDBeans dd =3D generateMetadataFromDeployment(dep);
+            cxfURL =3D dd.createFileURL();
+            log.info("JBossWS-CXF configuration generated: " + cxfURL);
          }
-         putCXFConfigToDeployment(dep, cxfURL);
-
       }
-      else
+      if (cxfURL =3D=3D null)
       {
-         log.debug("Spring not available, skipping check for user provided=
 jbossws-cxf.xml / cxf.xml configuration files.");
          generateMetadataFromDeployment(dep);
       }
+      else
+      {
+         log.info("Actual configuration from file: " + cxfURL);
+         putCXFConfigToDeployment(dep, cxfURL);
+      }
    }
 =

    @Override
@@ -118,7 +129,7 @@
       {
          // get resource URL
          ArchiveDeployment archDep =3D (ArchiveDeployment)dep;
-         cxfURL =3D archDep.getResourceResolver().resolve(metadir + "/jbos=
sws-cxf.xml");
+         cxfURL =3D archDep.getResourceResolver().resolve(metadir + "/" + =
Constants.JBOSSWS_CXF_SPRING_DD);
          log.info("JBossWS-CXF configuration found: " + cxfURL);
       }
       catch (IOException ignore)
@@ -130,22 +141,8 @@
    }
    =

    /**
-    * Generated CXF descriptor from deployment
-    * @param dep deployment
-    * @return CXF descriptor URL
-    */
-   private URL generateCXFConfigFromDeployment(Deployment dep)
-   {
-      // Generate the jbossws-cxf.xml descriptor
-      DDBeans dd =3D generateMetadataFromDeployment(dep);
-      URL cxfURL =3D dd.createFileURL();
-      log.info("JBossWS-CXF configuration generated: " + cxfURL);
-
-      return cxfURL;
-   }
-   =

-   /**
     * Generates the jbossws-cxf metadata from the deployment
+    * and attaches it the deployment
     * @param dep
     * @return
     */

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/deployment/aspect/SecurityActions.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/SecurityActions.java	2011-10-26 13:59:40 UTC (rev 15166)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/SecurityActions.java	2011-10-26 16:52:49 UTC (rev 15167)
@@ -79,4 +79,22 @@
       }
    }
 =

+   /**
+    * Return the current value of the specified system property
+    * =

+    * @param name
+    * @param defaultValue
+    * @return
+    */
+   static String getSystemProperty(final String name, final String default=
Value)
+   {
+      PrivilegedAction<String> action =3D new PrivilegedAction<String>()
+      {
+         public String run()
+         {
+            return System.getProperty(name, defaultValue);
+         }
+      };
+      return AccessController.doPrivileged(action);
+   }
 }


--===============0252907387744050902==--

From jbossws-commits at lists.jboss.org Wed Oct 26 12:54:41 2011
Content-Type: multipart/mixed; boundary="===============4367442642971326028=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15168 -
 stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
Date: Wed, 26 Oct 2011 12:54:40 -0400
Message-ID: <201110261654.p9QGseku027032@svn01.web.mwc.hst.phx2.redhat.com>

--===============4367442642971326028==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-26 12:54:40 -0400 (Wed, 26 Oct 2011)
New Revision: 15168

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/dep=
loyment/aspect/DescriptorDeploymentAspect.java
Log:
[JBWS-3280] Move logs to debug level


Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/deployment/aspect/DescriptorDeploymentAspect.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/DescriptorDeploymentAspect.java	2011-10-26 16:52:49 UTC (re=
v 15167)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/de=
ployment/aspect/DescriptorDeploymentAspect.java	2011-10-26 16:54:40 UTC (re=
v 15168)
@@ -72,7 +72,7 @@
          {
             DDBeans dd =3D generateMetadataFromDeployment(dep);
             cxfURL =3D dd.createFileURL();
-            log.info("JBossWS-CXF configuration generated: " + cxfURL);
+            log.debug("JBossWS-CXF configuration generated: " + cxfURL);
          }
       }
       if (cxfURL =3D=3D null)
@@ -81,7 +81,7 @@
       }
       else
       {
-         log.info("Actual configuration from file: " + cxfURL);
+         log.debug("Actual configuration from file: " + cxfURL);
          putCXFConfigToDeployment(dep, cxfURL);
       }
    }
@@ -130,7 +130,7 @@
          // get resource URL
          ArchiveDeployment archDep =3D (ArchiveDeployment)dep;
          cxfURL =3D archDep.getResourceResolver().resolve(metadir + "/" + =
Constants.JBOSSWS_CXF_SPRING_DD);
-         log.info("JBossWS-CXF configuration found: " + cxfURL);
+         log.debug("JBossWS-CXF configuration found: " + cxfURL);
       }
       catch (IOException ignore)
       {


--===============4367442642971326028==--

From jbossws-commits at lists.jboss.org Thu Oct 27 02:17:58 2011
Content-Type: multipart/mixed; boundary="===============2417864740689225460=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15169 -
 thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization.
Date: Thu, 27 Oct 2011 02:17:57 -0400
Message-ID: <201110270617.p9R6HvWa023239@svn01.web.mwc.hst.phx2.redhat.com>

--===============2417864740689225460==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jim.ma
Date: 2011-10-27 02:17:57 -0400 (Thu, 27 Oct 2011)
New Revision: 15169

Modified:
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fro=
ntend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/custom=
ization/CustomizationParser.java
Log:
Port the CXF-3296 fix to resolve the build failure

Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsd=
lto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws=
/customization/CustomizationParser.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fr=
ontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/custo=
mization/CustomizationParser.java	2011-10-26 16:54:40 UTC (rev 15168)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fr=
ontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/custo=
mization/CustomizationParser.java	2011-10-27 06:17:57 UTC (rev 15169)
@@ -90,11 +90,13 @@
         try {
             wsdlURL =3D URIParserUtil.getAbsoluteURI((String)env.get(ToolC=
onstants.CFG_WSDLURL));
 =

-            wsdlNode =3D getTargetNode(this.wsdlURL);
-
-            if (wsdlNode =3D=3D null && env.get(ToolConstants.CFG_CATALOG)=
 !=3D null) {
+            if (env.get(ToolConstants.CFG_CATALOG) !=3D null) {
                 wsdlNode =3D resolveNodeByCatalog(wsdlURL);
             }
+
+            if (wsdlNode =3D=3D null) {
+                wsdlNode =3D getTargetNode(this.wsdlURL);
+            }
             =

             if (wsdlNode =3D=3D null) {
                 throw new ToolException(new Message("MISSING_WSDL", LOG, w=
sdlURL));
@@ -132,6 +134,9 @@
     }
 =

     public Element getTargetNode(String uri) {
+        if (uri =3D=3D null) {
+            return null;
+        }
         if (uri.equals(wsdlURL) && wsdlNode !=3D null) {
             return wsdlNode;
         }


--===============2417864740689225460==--

From jbossws-commits at lists.jboss.org Thu Oct 27 03:29:55 2011
Content-Type: multipart/mixed; boundary="===============4533836519195315778=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15170 - in
 thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441:
 tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal
 and 3 other directories.
Date: Thu, 27 Oct 2011 03:29:54 -0400
Message-ID: <201110270729.p9R7Ts55003533@svn01.web.mwc.hst.phx2.redhat.com>

--===============4533836519195315778==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jim.ma
Date: 2011-10-27 03:29:53 -0400 (Thu, 27 Oct 2011)
New Revision: 15170

Added:
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/tes=
t/src/test/resources/wsdl2java_wsdl/cxf2193/
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/tes=
t/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.w=
sdl
Modified:
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/rt/core/src/main=
/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fro=
ntend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/proces=
sor/internal/ProcessorUtil.java
   thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/tes=
t/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Log:
[JBPAPP-7441]:Allow for WRAPPED style code generation for elements with xsd=
:extension

Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/rt/core/s=
rc/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/rt/core/src/mai=
n/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java	2011-10-27 06:17:57 UT=
C (rev 15169)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/rt/core/src/mai=
n/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java	2011-10-27 07:29:53 UT=
C (rev 15170)
@@ -83,6 +83,7 @@
 import org.apache.ws.commons.schema.XmlSchemaObject;
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
 =

 import static org.apache.cxf.helpers.CastUtils.cast;
 =

@@ -740,56 +741,76 @@
                                                MessageInfo wrapper, boolea=
n allowRefs) {
         if (type.getParticle() instanceof XmlSchemaSequence) {
             XmlSchemaSequence seq =3D (XmlSchemaSequence)type.getParticle(=
);
-            XmlSchemaObjectCollection items =3D seq.getItems();
-            boolean ret =3D true;
-            for (int x =3D 0; x < items.getCount(); x++) {
-                XmlSchemaObject o =3D items.getItem(x);
-                if (!(o instanceof XmlSchemaElement)) {
+            return buildMessageParts(seq, namespaceURI, wrapper, allowRefs=
);
+        } else if (type.getParticle() =3D=3D null) {
+            if (type.getContentModel() =3D=3D null) {
+                return true;
+            }
+            if (type.getContentModel().getContent() instanceof XmlSchemaCo=
mplexContentExtension) {
+                XmlSchemaComplexContentExtension extension =3D (XmlSchemaC=
omplexContentExtension)type
+                    .getContentModel().getContent();
+                QName baseTypeName =3D extension.getBaseTypeName();
+                ServiceInfo serviceInfo =3D wrapper.getOperation().getInte=
rface().getService();
+                XmlSchemaType schemaType =3D serviceInfo.getXmlSchemaColle=
ction().getTypeByQName(baseTypeName);
+                if (!(schemaType instanceof XmlSchemaComplexType)
+                    || !isWrappableSequence((XmlSchemaComplexType)schemaTy=
pe, namespaceURI, wrapper,
+                                            allowRefs)) {
                     return false;
                 }
-                XmlSchemaElement el =3D (XmlSchemaElement)o;
 =

-                if (el.getSchemaTypeName() !=3D null) {
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(new QNa=
me(namespaceURI, el.getName()));
-                    mpi.setTypeQName(el.getSchemaTypeName());
-                    mpi.setConcreteName(el.getQName());
-                    mpi.setElement(true);
-                    mpi.setElementQName(el.getQName());
-                    mpi.setXmlSchema(el);
-                } else if (el.getRefName() !=3D null) {
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(el.getR=
efName());
-                    mpi.setTypeQName(el.getRefName());
-                    mpi.setElementQName(el.getRefName());
-                    mpi.setElement(true);
-                    mpi.setXmlSchema(el);
-                    mpi.setProperty("isRefElement", true);
-                    // element reference is not permitted for wrapper elem=
ent
-                    if (!allowRefs) {
-                        ret =3D false;
-                    }
-                } else {
-                    // anonymous type
-                    MessagePartInfo mpi =3D wrapper.addMessagePart(new QNa=
me(namespaceURI, el.getName()));
-                    mpi.setConcreteName(el.getQName());
-                    mpi.setElementQName(mpi.getName());
-                    mpi.setElement(true);
-                    mpi.setXmlSchema(el);
+                if (extension.getParticle() instanceof XmlSchemaSequence) {
+                    XmlSchemaSequence seq =3D (XmlSchemaSequence)extension=
.getParticle();
+                    return buildMessageParts(seq, namespaceURI, wrapper, a=
llowRefs);
                 }
-            }
 =

-            return ret;
-        } else if (type.getParticle() =3D=3D null) {
-            if (type.getContentModel() =3D=3D null) {
-                return true;
             }
-            if (type.getContentModel().getContent() instanceof XmlSchemaCo=
mplexContentExtension) {
-                return false;
-            }
             return true;
         }
         return false;
     }
 =

+    private static boolean buildMessageParts(XmlSchemaSequence seq, String=
 namespaceURI, MessageInfo wrapper,
+                                             boolean allowRefs) {
+        XmlSchemaObjectCollection items =3D seq.getItems();
+        boolean ret =3D true;
+
+        for (int i =3D 0; i < items.getCount(); i++) {
+            XmlSchemaObject seqItem =3D items.getItem(i);
+            if (!(seqItem instanceof XmlSchemaElement)) {
+                return false;
+            }
+            XmlSchemaElement el =3D (XmlSchemaElement)seqItem;
+
+            if (el.getSchemaTypeName() !=3D null) {
+                MessagePartInfo mpi =3D wrapper.addMessagePart(new QName(n=
amespaceURI, el.getName()));
+                mpi.setTypeQName(el.getSchemaTypeName());
+                mpi.setElement(true);
+                mpi.setElementQName(el.getQName());
+                mpi.setConcreteName(el.getQName());
+                mpi.setXmlSchema(el);
+            } else if (el.getRefName() !=3D null) {
+                MessagePartInfo mpi =3D wrapper.addMessagePart(el.getRefNa=
me());
+                mpi.setTypeQName(el.getRefName());
+                mpi.setElementQName(el.getRefName());
+                mpi.setElement(true);
+                mpi.setXmlSchema(el);
+                mpi.setProperty("isRefElement", true);
+                // element reference is not permitted for wrapper element
+                if (!allowRefs) {
+                    ret =3D false;
+                }
+            } else {
+                // anonymous type
+                MessagePartInfo mpi =3D wrapper.addMessagePart(new QName(n=
amespaceURI, el.getName()));
+                mpi.setElementQName(mpi.getName());
+                mpi.setConcreteName(el.getQName());
+                mpi.setElement(true);
+                mpi.setXmlSchema(el);
+            }
+        }
+        return ret;
+    }
+    =

     private void buildMessage(AbstractMessageContainer minfo, Message msg)=
 {
         SchemaCollection schemas =3D minfo.getOperation().getInterface().g=
etService()
             .getXmlSchemaCollection();

Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsd=
lto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws=
/processor/internal/ProcessorUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fr=
ontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/proce=
ssor/internal/ProcessorUtil.java	2011-10-27 06:17:57 UTC (rev 15169)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/fr=
ontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/proce=
ssor/internal/ProcessorUtil.java	2011-10-27 07:29:53 UTC (rev 15170)
@@ -49,11 +49,14 @@
 import org.apache.cxf.tools.util.URIParserUtil;
 import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
 import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
 import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaContent;
 import org.apache.ws.commons.schema.XmlSchemaElement;
 import org.apache.ws.commons.schema.XmlSchemaForm;
 import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
 import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaType;
 =

 public final class ProcessorUtil {
     private static final String KEYWORDS_PREFIX =3D "_";
@@ -373,25 +376,53 @@
 =

     public static List<WrapperElement> getWrappedElement(ToolContext conte=
xt, QName partElement) {
         List<WrapperElement> qnames =3D new ArrayList<WrapperElement>();
-        =

+
         ServiceInfo serviceInfo =3D (ServiceInfo)context.get(ServiceInfo.c=
lass);
         SchemaCollection schema =3D serviceInfo.getXmlSchemaCollection();
-       =

+
         XmlSchemaElement elementByName =3D schema.getElementByQName(partEl=
ement);
-        =

+
         XmlSchemaComplexType type =3D (XmlSchemaComplexType)elementByName.=
getSchemaType();
 =

         XmlSchemaSequence seq =3D (XmlSchemaSequence)type.getParticle();
-       =

+
+        qnames.addAll(createWrappedElements(seq));
+
+        // If it's extension
+        if (seq =3D=3D null && type.getContentModel() !=3D null) {
+
+            XmlSchemaContent xmlSchemaConent =3D type.getContentModel().ge=
tContent();
+            if (xmlSchemaConent instanceof XmlSchemaComplexContentExtensio=
n) {
+                XmlSchemaComplexContentExtension extension =3D (XmlSchemaC=
omplexContentExtension)type
+                    .getContentModel().getContent();
+                QName baseTypeName =3D extension.getBaseTypeName();
+                XmlSchemaType schemaType =3D schema.getTypeByQName(baseTyp=
eName);
+                if (schemaType instanceof XmlSchemaComplexType) {
+                    XmlSchemaComplexType complexType =3D (XmlSchemaComplex=
Type)schemaType;
+                    if (complexType.getParticle() instanceof XmlSchemaSequ=
ence) {
+                        seq =3D (XmlSchemaSequence)complexType.getParticle=
();
+                        qnames.addAll(createWrappedElements(seq));
+                    }
+                }
+
+                if (extension.getParticle() instanceof XmlSchemaSequence) {
+                    XmlSchemaSequence xmlSchemaSeq =3D (XmlSchemaSequence)=
extension.getParticle();
+                    qnames.addAll(createWrappedElements(xmlSchemaSeq));
+                }
+            }
+
+        }
+        return qnames;
+    }
+    =

+    private static List<WrapperElement> createWrappedElements(XmlSchemaSeq=
uence seq) {
+
+        List<WrapperElement> qnames =3D new ArrayList<WrapperElement>();
         if (seq !=3D null) {
-
             XmlSchemaObjectCollection items =3D seq.getItems();
-
             Iterator ite =3D items.getIterator();
-
             while (ite.hasNext()) {
                 XmlSchemaElement subElement =3D (XmlSchemaElement)ite.next=
();
-
                 if (subElement.getQName() !=3D null) {
                     qnames.add(new WrapperElement(subElement.getQName(), s=
ubElement.getSchemaTypeName()));
                 } else {

Modified: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsd=
lto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/te=
st/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java	2011-10=
-27 06:17:57 UTC (rev 15169)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/te=
st/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java	2011-10=
-27 07:29:53 UTC (rev 15170)
@@ -1350,5 +1350,26 @@
         fault =3D classLoader.loadClass("org.apache.cxf.w2j.hello_world_so=
ap_http.BadRecordLitFault");
         assertEquals(fault.getName().hashCode(), ObjectStreamClass.lookup(=
fault).getSerialVersionUID());
     }
+    =

+    =

+    @Test
+    public void testExtensionWrapper() throws Exception {
+        env.put(ToolConstants.CFG_WSDLURL,
+                getLocation("/wsdl2java_wsdl/cxf2193/hello_world_extension=
_wrapped.wsdl"));
+        processor.setContext(env);
+        processor.execute();
 =

+        File infFile =3D new File(output, "org/apache/cxf/w2j/extension_wr=
apped/Greeter.java");
+        assertTrue(infFile.exists());
+
+        Class<?> interfaceClass =3D classLoader.loadClass("org.apache.cxf.=
w2j.extension_wrapped.Greeter");
+
+        Method method =3D interfaceClass.getMethod("greetMe", new Class[] {
+            Holder.class, Holder.class, Holder.class, Holder.class, Holder=
.class
+        });
+        assertTrue("greetMe operation is NOT generated correctly as except=
ed", method !=3D null);
+        RequestWrapper reqWrapper =3D method.getAnnotation(RequestWrapper.=
class);
+        assertNotNull("@RequestWrapper is expected", reqWrapper);
+    }
+
 }

Added: thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto=
/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapp=
ed.wsdl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/te=
st/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.=
wsdl	                        (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12-patch-01_JBPAPP-7441/tools/wsdlto/te=
st/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.=
wsdl	2011-10-27 07:29:53 UTC (rev 15170)
@@ -0,0 +1,184 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more co=
ntributor =

+	license agreements. See the NOTICE file distributed with this work for ad=
ditional =

+	information regarding copyright ownership. The ASF licenses this file to =

+	you under the Apache License, Version 2.0 (the "License"); you may not us=
e =

+	this file except in compliance with the License. You may obtain a copy of =

+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required =

+	by applicable law or agreed to in writing, software distributed under the =

+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITI=
ONS =

+	OF ANY KIND, either express or implied. See the License for the specific =

+	language governing permissions and limitations under the License. -->
+<wsdl:definitions xmlns=3D"http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap=3D"http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns=3D"http://=
cxf.apache.org/w2j/extension_wrapped"
+	xmlns:x1=3D"http://cxf.apache.org/w2j/extension_wrapped/types"
+	xmlns:wsdl=3D"http://schemas.xmlsoap.org/wsdl/" xmlns:xsd=3D"http://www.w=
3.org/2001/XMLSchema"
+	targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped" name=3D"H=
elloWorld">
+	<wsdl:types>
+		<schema targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped/t=
ypes"
+			xmlns=3D"http://www.w3.org/2001/XMLSchema" xmlns:x1=3D"http://cxf.apach=
e.org/w2j/extension_wrapped/types"
+			elementFormDefault=3D"qualified">
+			<element name=3D"greetMe">
+				<complexType>
+					<sequence>
+						<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" =
/>
+						<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+						<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					</sequence>
+				</complexType>
+			</element>
+
+			<element name=3D"greetMeResponse" type=3D"x1:ComplexContext" />
+
+			<complexType name=3D"ComplexContext">
+				<complexContent>
+					<extension base=3D"x1:ComplexContextType">
+						<sequence>
+							<element name=3D"extraElement" type=3D"xsd:string" />
+						</sequence>
+					</extension>
+				</complexContent>
+			</complexType>
+
+			<complexType name=3D"ComplexContextType">
+				<sequence>
+					<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" />
+					<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"testlist" type=3D"xsd:string" minOccurs=3D"0"
+						maxOccurs=3D"unbounded" />
+				</sequence>
+			</complexType>
+
+
+
+		</schema>
+	</wsdl:types>
+
+	<wsdl:message name=3D"greetMeRequest">
+		<wsdl:part name=3D"in" element=3D"x1:greetMe" />
+	</wsdl:message>
+	<wsdl:message name=3D"greetMeResponse">
+		<wsdl:part name=3D"out" element=3D"x1:greetMeResponse" />
+	</wsdl:message>
+
+	<wsdl:portType name=3D"Greeter">
+		>
+		<wsdl:operation name=3D"greetMe">
+			<wsdl:input name=3D"greetMeRequest" message=3D"tns:greetMeRequest" />
+			<wsdl:output name=3D"greetMeResponse" message=3D"tns:greetMeResponse" />
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name=3D"Greeter_SOAPBinding" type=3D"tns:Greeter">
+		<soap:binding style=3D"document"
+			transport=3D"http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name=3D"greetMe">
+			<soap:operation style=3D"document" />
+			<wsdl:input>
+				<soap:body use=3D"literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use=3D"literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name=3D"SOAPService">
+		<wsdl:port name=3D"SoapPort" binding=3D"tns:Greeter_SOAPBinding">
+			<soap:address location=3D"http://localhost:9000/SoapContext/SoapPort" />
+			<wswa:UsingAddressing xmlns:wswa=3D"http://www.w3.org/2005/02/addressin=
g/wsdl" />
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
+
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more co=
ntributor =

+	license agreements. See the NOTICE file distributed with this work for ad=
ditional =

+	information regarding copyright ownership. The ASF licenses this file to =

+	you under the Apache License, Version 2.0 (the "License"); you may not us=
e =

+	this file except in compliance with the License. You may obtain a copy of =

+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required =

+	by applicable law or agreed to in writing, software distributed under the =

+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITI=
ONS =

+	OF ANY KIND, either express or implied. See the License for the specific =

+	language governing permissions and limitations under the License. -->
+<wsdl:definitions xmlns=3D"http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap=3D"http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns=3D"http://=
cxf.apache.org/w2j/extension_wrapped"
+	xmlns:x1=3D"http://cxf.apache.org/w2j/extension_wrapped/types"
+	xmlns:wsdl=3D"http://schemas.xmlsoap.org/wsdl/" xmlns:xsd=3D"http://www.w=
3.org/2001/XMLSchema"
+	targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped" name=3D"H=
elloWorld">
+	<wsdl:types>
+		<schema targetNamespace=3D"http://cxf.apache.org/w2j/extension_wrapped/t=
ypes"
+			xmlns=3D"http://www.w3.org/2001/XMLSchema" xmlns:x1=3D"http://cxf.apach=
e.org/w2j/extension_wrapped/types"
+			elementFormDefault=3D"qualified">
+			<element name=3D"greetMe">
+				<complexType>
+					<sequence>
+						<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" =
/>
+						<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+						<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					</sequence>
+				</complexType>
+			</element>
+
+			<element name=3D"greetMeResponse" type=3D"x1:ComplexContext" />
+
+			<complexType name=3D"ComplexContext">
+				<complexContent>
+					<extension base=3D"x1:ComplexContextType">
+						<sequence>
+							<element name=3D"extraElement" type=3D"xsd:string" />
+						</sequence>
+					</extension>
+				</complexContent>
+			</complexType>
+
+			<complexType name=3D"ComplexContextType">
+				<sequence>
+					<element name=3D"content" type=3D"xsd:base64Binary" minOccurs=3D"0" />
+					<element name=3D"id" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"name" type=3D"xsd:string" minOccurs=3D"0" />
+					<element name=3D"testlist" type=3D"xsd:string" minOccurs=3D"0"
+						maxOccurs=3D"unbounded" />
+				</sequence>
+			</complexType>
+
+
+
+		</schema>
+	</wsdl:types>
+
+	<wsdl:message name=3D"greetMeRequest">
+		<wsdl:part name=3D"in" element=3D"x1:greetMe" />
+	</wsdl:message>
+	<wsdl:message name=3D"greetMeResponse">
+		<wsdl:part name=3D"out" element=3D"x1:greetMeResponse" />
+	</wsdl:message>
+
+	<wsdl:portType name=3D"Greeter">
+		>
+		<wsdl:operation name=3D"greetMe">
+			<wsdl:input name=3D"greetMeRequest" message=3D"tns:greetMeRequest" />
+			<wsdl:output name=3D"greetMeResponse" message=3D"tns:greetMeResponse" />
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name=3D"Greeter_SOAPBinding" type=3D"tns:Greeter">
+		<soap:binding style=3D"document"
+			transport=3D"http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name=3D"greetMe">
+			<soap:operation style=3D"document" />
+			<wsdl:input>
+				<soap:body use=3D"literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use=3D"literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name=3D"SOAPService">
+		<wsdl:port name=3D"SoapPort" binding=3D"tns:Greeter_SOAPBinding">
+			<soap:address location=3D"http://localhost:9000/SoapContext/SoapPort" />
+			<wswa:UsingAddressing xmlns:wswa=3D"http://www.w3.org/2005/02/addressin=
g/wsdl" />
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
+


--===============4533836519195315778==--

From jbossws-commits at lists.jboss.org Thu Oct 27 05:18:40 2011
Content-Type: multipart/mixed; boundary="===============6737047057298442558=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15171 - in stack/cxf/trunk/modules:
 server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other
 directory.
Date: Thu, 27 Oct 2011 05:18:40 -0400
Message-ID: <201110270918.p9R9IenK027062@svn01.web.mwc.hst.phx2.redhat.com>

--===============6737047057298442558==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-27 05:18:37 -0400 (Thu, 27 Oct 2011)
New Revision: 15171

Modified:
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cli=
ent/configuration/JBossWSSpringBusFactory.java
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/con=
figuration/SpringBusHolder.java
Log:
[JBWS-3280] Porting to JBossWSSpringBusFactory the Apache CXF SpringBusFact=
ory logic for avoiding creating a Spring Bus when no spring descriptor is f=
ound (basically for client side usage)


Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/=
cxf/client/configuration/JBossWSSpringBusFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/configuration/JBossWSSpringBusFactory.java	2011-10-27 07:29:53 UTC (re=
v 15170)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/cl=
ient/configuration/JBossWSSpringBusFactory.java	2011-10-27 09:18:37 UTC (re=
v 15171)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, 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.
  *
@@ -34,6 +34,7 @@
 import org.apache.cxf.configuration.Configurer;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.Resource;
 =

 /**
  * A JBossWS version of @see{org.apache.cxf.bus.spring.SpringBusFactory} t=
hat
@@ -46,6 +47,8 @@
 public class JBossWSSpringBusFactory extends SpringBusFactory
 {
    private static final Logger LOG =3D LogUtils.getL7dLogger(JBossWSSpring=
BusFactory.class);
+   =

+   private boolean customContextProvided =3D false;
 =

    public JBossWSSpringBusFactory()
    {
@@ -55,18 +58,27 @@
    public JBossWSSpringBusFactory(ApplicationContext context)
    {
       super(context);
+      this.customContextProvided =3D (context !=3D null);
    }
 =

    /**
-    * We override the Apache CXF method to skip the checks on cxf.xml conf=
 file as that would prevent
-    * creating a Spring version of the bus when the jbossws-cxf.xml is ava=
ilable; generally speaking
-    * the JBossWS-CXF integration requires a Spring bus to be created by S=
pring bus factories.
+    * This overrides the Apache CXF method to delegate to
+    * @see{org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBu=
sFactory}
+    * when there's no need for a Spring bus.
     */
    @Override
    public Bus createBus(String cfgFiles[], boolean includeDefaults)
    {
       try
       {
+         String userCfgFile =3D System.getProperty(Configurer.USER_CFG_FIL=
E_PROPERTY_NAME);
+         String sysCfgFileUrl =3D System.getProperty(Configurer.USER_CFG_F=
ILE_PROPERTY_URL);
+         Resource r =3D BusApplicationContext.findResource(Configurer.DEFA=
ULT_USER_CFG_FILE);
+         if (!customContextProvided && userCfgFile =3D=3D null && cfgFiles=
 =3D=3D null && sysCfgFileUrl =3D=3D null
+               && (r =3D=3D null || !r.exists()) && includeDefaults)
+         {
+            return new JBossWSNonSpringBusFactory().createBus();
+         }
          return finishCreatingBus(createApplicationContext(cfgFiles, inclu=
deDefaults));
       }
       catch (BeansException ex)

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/=
cxf/configuration/SpringBusHolder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/co=
nfiguration/SpringBusHolder.java	2011-10-27 07:29:53 UTC (rev 15170)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/co=
nfiguration/SpringBusHolder.java	2011-10-27 09:18:37 UTC (rev 15171)
@@ -86,7 +86,10 @@
     */
    protected void createBus(URL location)
    {
-      bus =3D new JBossWSSpringBusFactory().createBus();
+      //use createBus(URL[] urls) method instead of createBus() to bypass
+      //the cxf/jbossws-cxf check on actual need for spring bus (we know
+      //it's required here as we have the jbossws-cxf.xml descriptor)
+      bus =3D new JBossWSSpringBusFactory().createBus((URL[])null);
       ctx =3D bus.getExtension(BusApplicationContext.class);
       //Load additional configurations from cxf-servlet.xml
       if (location !=3D null)


--===============6737047057298442558==--

From jbossws-commits at lists.jboss.org Fri Oct 28 07:10:45 2011
Content-Type: multipart/mixed; boundary="===============7642639792268273567=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15172 - in
 stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 3 other directories.
Date: Fri, 28 Oct 2011 07:10:45 -0400
Message-ID: <201110281110.p9SBAjnf003224@svn01.web.mwc.hst.phx2.redhat.com>

--===============7642639792268273567==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alessio.soldano(a)jboss.com
Date: 2011-10-28 07:10:44 -0400 (Fri, 28 Oct 2011)
New Revision: 15172

Removed:
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sam=
ples/wsse/policy/jaas/ejb/META-INF/jboss.xml
Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test=
/ws/jaxws/samples/wsse/policy/jaas/EJBServiceImpl.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test=
/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java
   stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sam=
ples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl
   stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Use @SecurityDomain instead of security domain declaration in jboss.xml to =
make the test pass against AS 7.1 too (EJB3 DD support still to be implemen=
ted)


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxw=
s.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	=
2011-10-27 09:18:37 UTC (rev 15171)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	=
2011-10-28 11:10:44 UTC (rev 15172)
@@ -386,7 +386,6 @@
        </fileset>
        <metainf dir=3D"${tests.output.dir}/test-resources/jaxws/samples/ws=
se/policy/jaas/ejb/META-INF">
           <include name=3D"wsdl/*"/>
-          <include name=3D"jboss.xml"/>
           <include name=3D"jaxws-endpoint-config.xml"/>
        </metainf>
        <manifest>

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jbo=
ss/test/ws/jaxws/samples/wsse/policy/jaas/EJBServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/samples/wsse/policy/jaas/EJBServiceImpl.java	2011-10-27 09:18:37=
 UTC (rev 15171)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/samples/wsse/policy/jaas/EJBServiceImpl.java	2011-10-28 11:10:44=
 UTC (rev 15172)
@@ -28,6 +28,7 @@
 =

 import org.apache.cxf.interceptor.InInterceptors;
 import org.jboss.logging.Logger;
+import org.jboss.ejb3.annotation.SecurityDomain;
 import org.jboss.ws.api.annotation.EndpointConfig;
 =

 =

@@ -40,6 +41,7 @@
    targetNamespace =3D "http://www.jboss.org/jbossws/ws-extensions/wssecur=
itypolicy",
    endpointInterface =3D "org.jboss.test.ws.jaxws.samples.wsse.policy.jaas=
.ServiceIface"
 )
+(a)SecurityDomain("JBossWS")
 @EndpointConfig(configFile =3D "META-INF/jaxws-endpoint-config.xml", confi=
gName =3D "Custom WS-Security Endpoint")
 //be sure to have dependency on org.apache.cxf module when on AS7, otherwi=
se Apache CXF annotations are ignored =

 @InInterceptors(interceptors =3D {"org.jboss.wsf.stack.cxf.security.authen=
tication.SubjectCreatingPolicyInterceptor"})

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jbo=
ss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java	2=
011-10-27 09:18:37 UTC (rev 15171)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/tes=
t/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java	2=
011-10-28 11:10:44 UTC (rev 15172)
@@ -91,7 +91,8 @@
       catch (Exception e)
       {
          assertNotNull(e.getMessage());
-         assertTrue(e.getMessage().toLowerCase().contains("unauthorized"));
+         String msg =3D e.getMessage().toLowerCase();
+         assertTrue(msg.contains("unauthorized") || msg.contains("not allo=
wed"));
       }
    }
    =


Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jax=
ws/samples/wsse/policy/jaas/ejb/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sa=
mples/wsse/policy/jaas/ejb/META-INF/jboss.xml	2011-10-27 09:18:37 UTC (rev =
15171)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sa=
mples/wsse/policy/jaas/ejb/META-INF/jboss.xml	2011-10-28 11:10:44 UTC (rev =
15172)
@@ -1,7 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_2.dtd">
-
-<jboss>
-   <security-domain>java:/jaas/JBossWS</security-domain>
-</jboss>

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/ja=
xws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sa=
mples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl	2011-10-27 09=
:18:37 UTC (rev 15171)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/sa=
mples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl	2011-10-28 11=
:10:44 UTC (rev 15172)
@@ -58,7 +58,7 @@
   </binding>
   <service name=3D"SecurityService">
     <port name=3D"SecurityServicePort" binding=3D"tns:SecurityServicePortB=
inding">
-      <soap:address location=3D"http://@jboss.bind.address@:8080/jaxws-sam=
ples-wsse-username-jaas"/>
+      <soap:address location=3D"http://@jboss.bind.address@:8080/jaxws-sam=
ples-wsse-username-jaas-ejb"/>
     </port>
   </service>
   =


Modified: stack/cxf/trunk/modules/testsuite/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-27 09:18:37 UTC (rev =
15171)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2011-10-28 11:10:44 UTC (rev =
15172)
@@ -1330,9 +1330,6 @@
                  <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
                  <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
 =

-                 <!-- TODO: investigate -->
-                 <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaas=
/UsernameAuthorizationEJBTestCase*</exclude>
-
                  <!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFil=
eTestCase on AS7 -->
                  <exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAut=
horizationCustomFileTestCase*</exclude>
 =



--===============7642639792268273567==--

From jbossws-commits at lists.jboss.org Fri Oct 28 15:49:55 2011
Content-Type: multipart/mixed; boundary="===============0803258366659602152=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15173 - in
 thirdparty/cxf/branches/cxf-2.2.12:
 rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws and 1 other directories.
Date: Fri, 28 Oct 2011 15:49:55 -0400
Message-ID: <201110281949.p9SJntBu001429@svn01.web.mwc.hst.phx2.redhat.com>

--===============0803258366659602152==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: klape
Date: 2011-10-28 15:49:55 -0400 (Fri, 28 Oct 2011)
New Revision: 15173

Added:
   thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apac=
he/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.=
java
   thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apac=
he/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
   thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apac=
he/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java
   thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apac=
he/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
   thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apac=
he/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
Modified:
   thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/=
transport/http/WSDLQueryHandler.java
   thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/a=
pache/cxf/jaxws/EndpointImpl.java
Log:
[JBPAPP-7452] soap:address rewrite from Spring configuration

Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apac=
he/cxf/transport/http/WSDLQueryHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf=
/transport/http/WSDLQueryHandler.java	2011-10-28 11:10:44 UTC (rev 15172)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf=
/transport/http/WSDLQueryHandler.java	2011-10-28 19:49:55 UTC (rev 15173)
@@ -57,6 +57,7 @@
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.XMLUtils;
+import org.apache.cxf.message.MessageUtils;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.transports.http.StemMatchingQueryHandler;
@@ -294,10 +295,10 @@
                     LOG,
                     base), e);
         }
-        =

-        Boolean rewriteSoapAddress =3D ei.getProperty("autoRewriteSoapAddr=
ess", Boolean.class);
-        =

-        if (rewriteSoapAddress !=3D null && rewriteSoapAddress.booleanValu=
e()) {
+
+        Object rewriteSoapAddress =3D ei.getProperty("autoRewriteSoapAddre=
ss");
+
+        if (rewriteSoapAddress !=3D null && MessageUtils.isTrue(rewriteSoa=
pAddress)) {
             List<Element> serviceList =3D DOMUtils.findAllElementsByTagNam=
eNS(doc.getDocumentElement(),
                                                               "http://sche=
mas.xmlsoap.org/wsdl/",
                                                               "service");

Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/jav=
a/org/apache/cxf/jaxws/EndpointImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/=
apache/cxf/jaxws/EndpointImpl.java	2011-10-28 11:10:44 UTC (rev 15172)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/=
apache/cxf/jaxws/EndpointImpl.java	2011-10-28 19:49:55 UTC (rev 15173)
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 =

@@ -317,6 +318,14 @@
                     // TODO is there a good place to put this key-string a=
s a constant?
                     endpointInfo.setProperty("publishedEndpointUrl", publi=
shedEndpointUrl);
                 }
+
+                if (null !=3D properties) {
+                    for (Entry<String, Object> entry : properties.entrySet=
()) {
+                        endpointInfo.setProperty(entry.getKey(), entry.get=
Value());
+                    }
+                    System.err.println("\n\n");
+                }
+
                 this.address =3D endpointInfo.getAddress();
             }
             serv.start();

Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/=
apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressT=
est.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest=
.java	                        (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest=
.java	2011-10-28 19:49:55 UTC (rev 15173)
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.handlers;
+
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.LinkedList;
+import java.util.List;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.test.AbstractCXFSpringTest;
+
+/**
+ *
+ */
+public abstract class AbstractSpringConfiguredAutoRewriteSoapAddressTest e=
xtends AbstractCXFSpringTest {
+
+    private Document retrieveWsdlDocument(String hostname, String port) th=
rows Exception {
+        URL wsdlUrlLocalhost =3D new URL("http://" + hostname + ":" + port=
 + "/SpringEndpoint?wsdl");
+        URLConnection urlConnection =3D wsdlUrlLocalhost.openConnection();
+        return DOMUtils.readXml(urlConnection.getInputStream());
+    }
+
+    protected List<String> findAllServiceUrlsFromWsdl(String hostname, Str=
ing port) throws Exception {
+        Document wsdlDocument =3D retrieveWsdlDocument(hostname, port);
+        List<String> serviceUrls =3D new LinkedList<String>();
+        List<Element> serviceList =3D DOMUtils.findAllElementsByTagNameNS(=
wsdlDocument.getDocumentElement(),
+                                                          "http://schemas.=
xmlsoap.org/wsdl/",
+                                                          "service");
+        for (Element serviceEl : serviceList) {
+            List<Element> portList =3D DOMUtils.findAllElementsByTagNameNS=
(serviceEl,
+                                                          "http://schemas.=
xmlsoap.org/wsdl/",
+                                                          "port");
+            for (Element portEl : portList) {
+                List<Element> addressList =3D DOMUtils.findAllElementsByTa=
gNameNS(portEl,
+                                                          "http://schemas.=
xmlsoap.org/wsdl/soap/",
+                                                          "address");
+                for (Element addressEl : addressList) {
+                    serviceUrls.add(addressEl.getAttribute("location"));
+                }
+            }
+        }
+        return serviceUrls;
+    }
+
+}

Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/=
apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java	  =
                      (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java	20=
11-10-28 19:49:55 UTC (rev 15173)
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.handlers;
+
+import java.util.List;
+
+import org.apache.cxf.testutil.common.TestUtil;
+import org.apache.handlers.AddNumbers;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class SpringConfiguredAutoRewriteSoapAddressTest
+        extends AbstractSpringConfiguredAutoRewriteSoapAddressTest {
+    static String port =3D TestUtil.getPortNumber("springportAutoRewriteSo=
apAddressTest");
+
+    @Override
+    protected String[] getConfigLocations() {
+        return new String[] {"classpath:/org/apache/cxf/systest/handlers/b=
eans_autoRewriteSoapAddress.xml" };
+    }
+
+    @Test
+    public void testWsdlAddress() throws Exception {
+        System.err.println("portNumber: " + port);
+        System.err.println(getApplicationContext().getBean("cxfHandlerTest=
Endpoint").
+                                                                   getClas=
s().toString());
+
+        AddNumbers addNumbers =3D (AddNumbers)getApplicationContext().getB=
ean("cxfHandlerTestClientEndpoint",
+                                                                   AddNumb=
ers.class);
+
+        int r =3D addNumbers.addNumbers(10, 15);
+        assertEquals(1015, r);
+
+
+        List<String> serviceUrls =3D findAllServiceUrlsFromWsdl("localhost=
", port);
+        assertEquals(1, serviceUrls.size());
+        assertEquals("http://localhost:" + port + "/SpringEndpoint", servi=
ceUrls.get(0));
+
+        serviceUrls =3D findAllServiceUrlsFromWsdl("127.0.0.1", port);
+        assertEquals(1, serviceUrls.size());
+        assertEquals("http://127.0.0.1:" + port + "/SpringEndpoint", servi=
ceUrls.get(0));
+
+    }
+}

Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/=
apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java	=
                        (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java	=
2011-10-28 19:49:55 UTC (rev 15173)
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.handlers;
+
+import java.util.List;
+
+import org.apache.cxf.testutil.common.TestUtil;
+import org.apache.handlers.AddNumbers;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class SpringConfiguredNoAutoRewriteSoapAddressTest
+        extends AbstractSpringConfiguredAutoRewriteSoapAddressTest {
+    static String port =3D TestUtil.getPortNumber("springportNoAutoRewrite=
SoapAddressTest");
+
+    @Override
+    protected String[] getConfigLocations() {
+        return new String[]
+        {"classpath:/org/apache/cxf/systest/handlers/beans_no_autoRewriteS=
oapAddress.xml" };
+    }
+
+    @Test
+    public void testWsdlAddress() throws Exception {
+        System.err.println("portNumber: " + port);
+        System.err.println(getApplicationContext().getBean("cxfHandlerTest=
Endpoint").
+                                                                   getClas=
s().toString());
+
+        AddNumbers addNumbers =3D (AddNumbers)getApplicationContext().getB=
ean("cxfHandlerTestClientEndpoint",
+                                                                   AddNumb=
ers.class);
+
+        int r =3D addNumbers.addNumbers(10, 15);
+        assertEquals(1015, r);
+
+
+        List<String> serviceUrls =3D findAllServiceUrlsFromWsdl("localhost=
", port);
+        assertEquals(1, serviceUrls.size());
+        assertEquals("http://localhost:" + port + "/SpringEndpoint", servi=
ceUrls.get(0));
+
+        serviceUrls =3D findAllServiceUrlsFromWsdl("127.0.0.1", port);
+        assertEquals(1, serviceUrls.size());
+        assertEquals("http://localhost:" + port + "/SpringEndpoint", servi=
ceUrls.get(0));
+
+    }
+
+}

Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/=
apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml	                 =
       (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml	2011-10-28 19:49:=
55 UTC (rev 15173)
@@ -0,0 +1,77 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?> =

+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ =

+  http://www.apache.org/licenses/LICENSE-2.0
+ =

+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns=3D"http://www.springframework.org/schema/beans" =

+xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" =

+xmlns:jaxws=3D"http://cxf.apache.org/jaxws" =

+xmlns:cxf=3D"http://cxf.apache.org/core" =

+xsi:schemaLocation=3D" =

+http://www.springframework.org/schema/beans http://www.springframework.org=
/schema/beans/spring-beans.xsd =

+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd =

+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> =

+<import resource=3D"classpath:META-INF/cxf/cxf.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-soap.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-http.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /=
> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
+ =

+	<bean class=3D"org.springframework.beans.factory.config.PropertyPlacehold=
erConfigurer"/>
+	=

+	<jaxws:endpoint id=3D"cxfHandlerTestEndpoint"
+		implementor=3D"org.apache.cxf.systest.handlers.AddNumbersNoHandlers"
+		address=3D"http://localhost:${testutil.ports.springportAutoRewriteSoapAd=
dressTest}/SpringEndpoint">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+        <jaxws:properties>
+                <entry key=3D"autoRewriteSoapAddress" value=3D"true"/>
+        </jaxws:properties>
+        </jaxws:endpoint>
+	<jaxws:server id=3D"cxfHandlerTestServer"
+		serviceClass=3D"org.apache.handlers.AddNumbers"
+		address=3D"http://localhost:${testutil.ports.springportAutoRewriteSoapAd=
dressTest}/SpringServer">
+		<jaxws:serviceBean>
+                <bean class=3D"org.apache.cxf.systest.handlers.AddNumbersN=
oHandlers" />
+        </jaxws:serviceBean>
+		=

+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:server>
+
+    <jaxws:client id=3D"cxfHandlerTestClientEndpoint"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportAutoRewriteSoa=
pAddressTest}/SpringEndpoint">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:client> =

+    <jaxws:client id=3D"cxfHandlerTestClientEndpointNoHandler"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportAutoRewriteSoa=
pAddressTest}/SpringEndpoint">
+    </jaxws:client> =

+    <jaxws:client id=3D"cxfHandlerTestClientServer"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportAutoRewriteSoa=
pAddressTest}/SpringServer">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:client> =

+    =

+</beans> =


Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/=
apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml	              =
          (rev 0)
+++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apa=
che/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml	2011-10-28 19:=
49:55 UTC (rev 15173)
@@ -0,0 +1,74 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?> =

+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ =

+  http://www.apache.org/licenses/LICENSE-2.0
+ =

+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns=3D"http://www.springframework.org/schema/beans" =

+xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" =

+xmlns:jaxws=3D"http://cxf.apache.org/jaxws" =

+xmlns:cxf=3D"http://cxf.apache.org/core" =

+xsi:schemaLocation=3D" =

+http://www.springframework.org/schema/beans http://www.springframework.org=
/schema/beans/spring-beans.xsd =

+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd =

+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> =

+<import resource=3D"classpath:META-INF/cxf/cxf.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-soap.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-http.xml" /> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /=
> =

+<import resource=3D"classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
+ =

+	<bean class=3D"org.springframework.beans.factory.config.PropertyPlacehold=
erConfigurer"/>
+	=

+	<jaxws:endpoint id=3D"cxfHandlerTestEndpoint"
+		implementor=3D"org.apache.cxf.systest.handlers.AddNumbersNoHandlers"
+		address=3D"http://localhost:${testutil.ports.springportNoAutoRewriteSoap=
AddressTest}/SpringEndpoint">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+        </jaxws:endpoint>
+	<jaxws:server id=3D"cxfHandlerTestServer"
+		serviceClass=3D"org.apache.handlers.AddNumbers"
+		address=3D"http://localhost:${testutil.ports.springportNoAutoRewriteSoap=
AddressTest}/SpringServer">
+		<jaxws:serviceBean>
+                <bean class=3D"org.apache.cxf.systest.handlers.AddNumbersN=
oHandlers" />
+        </jaxws:serviceBean>
+		=

+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:server>
+
+    <jaxws:client id=3D"cxfHandlerTestClientEndpoint"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportNoAutoRewriteS=
oapAddressTest}/SpringEndpoint">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:client> =

+    <jaxws:client id=3D"cxfHandlerTestClientEndpointNoHandler"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportNoAutoRewriteS=
oapAddressTest}/SpringEndpoint">
+    </jaxws:client> =

+    <jaxws:client id=3D"cxfHandlerTestClientServer"
+    	serviceClass=3D"org.apache.handlers.AddNumbers"
+    	address=3D"http://localhost:${testutil.ports.springportNoAutoRewriteS=
oapAddressTest}/SpringServer">
+    	<jaxws:handlers>
+    		<bean class=3D"org.apache.cxf.systest.handlers.ModifyNumberHandler"/>
+    	</jaxws:handlers>
+    </jaxws:client> =

+    =

+</beans> =



--===============0803258366659602152==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:26:09 2011
Content-Type: multipart/mixed; boundary="===============7075100414943636641=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15174 - in
 spi/trunk/src/main/java/org/jboss/wsf/spi/metadata: webservices and 1 other
 directory.
Date: Mon, 31 Oct 2011 11:26:09 -0400
Message-ID: <201110311526.p9VFQ948003229@svn01.web.mwc.hst.phx2.redhat.com>

--===============7075100414943636641==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:26:08 -0400 (Mon, 31 Oct 2011)
New Revision: 15174

Added:
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebs=
ervicesDescriptorParser.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebs=
ervicesFactory.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebs=
ervicesMetaData.java
Modified:
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortCompo=
nentMetaData.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservic=
eDescriptionMetaData.java
   spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservic=
esFactory.java
Log:
[JBWS-3376] implemented jboss-webservices.xml parser

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstant=
s.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java=
	2011-10-28 19:49:55 UTC (rev 15173)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java=
	2011-10-31 15:26:08 UTC (rev 15174)
@@ -30,10 +30,15 @@
  */
 public abstract class ParserConstants
 {
+   =

    public static final String JAVAEE_NS =3D "http://java.sun.com/xml/ns/ja=
vaee";
    =

+   public static final String JBOSSEE_NS =3D "http://www.jboss.com/xml/ns/=
javaee";
+   =

    public static final String J2EE_NS =3D "http://java.sun.com/xml/ns/j2ee=
";
 =

+   public static final String AUTH_METHOD =3D "auth-method";
+
    public static final String CHAIN_PORT_PATTERN =3D "port-name-pattern";
 =

    public static final String CHAIN_PROTOCOL_BINDING =3D "protocol-binding=
s";
@@ -70,10 +75,14 @@
 =

    public static final String WSDL_FILE =3D "wsdl-file";
 =

+   public static final String WSDL_PUBLISH_LOCATION =3D "wsdl-publish-loca=
tion";
+
    public static final String PORT_COMPONENT =3D "port-component";
 =

    public static final String PORT_COMPONENT_NAME =3D "port-component-name=
";
 =

+   public static final String PORT_COMPONENT_URI =3D "port-component-uri";
+
    public static final String WSDL_SERVICE =3D "wsdl-service";
 =

    public static final String WSDL_PORT =3D "wsdl-port";
@@ -112,19 +121,28 @@
    =

    public static final String CONFIG_NAME =3D "config-name";
    =

+   public static final String CONFIG_FILE =3D "config-file";
+   =

+   public static final String CONTEXT_ROOT =3D "context-root";
+   =

    public static final String PRE_HANDLER_CHAINS =3D "pre-handler-chains";
    =

    public static final String POST_HANDLER_CHAINS =3D "post-handler-chains=
";
    =

    public static final String FEATURE =3D "feature";
    =

+   public static final String FEATURE_DATA =3D "feature-data";
+
+   public static final String FEATURE_NAME =3D "feature-name";
+   =

    public static final String PROPERTY =3D "property";
    =

    public static final String PROPERTY_NAME =3D "property-name";
    =

    public static final String PROPERTY_VALUE =3D "property-value";
+   =

+   public static final String SECURE_WSDL_ACCESS =3D "secure-wsdl-access";
 =

-   public static final String FEATURE_NAME =3D "feature-name";
+   public static final String TRANSPORT_GUARANTEE =3D "transport-guarantee=
";
    =

-   public static final String FEATURE_DATA =3D "feature-data";
 }

Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBoss=
WebservicesDescriptorParser.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesDescriptorParser.java	                        (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesDescriptorParser.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.spi.metadata.webservices;
+
+import org.jboss.wsf.spi.metadata.DescriptorParser;
+
+/**
+ * Parser for WS UMDM.
+ * =

+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public interface JBossWebservicesDescriptorParser extends DescriptorParser=
<JBossWebservicesMetaData>
+{
+}

Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBoss=
WebservicesFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesFactory.java	                        (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesFactory.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -0,0 +1,228 @@
+/*
+ * 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.spi.metadata.webservices;
+
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_FILE;
+import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_NAME;
+import static org.jboss.wsf.spi.metadata.ParserConstants.CONTEXT_ROOT;
+import static org.jboss.wsf.spi.metadata.ParserConstants.JBOSSEE_NS;
+import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES;
+import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRI=
PTION;
+import static org.jboss.wsf.spi.util.StAXUtils.elementAsString;
+import static org.jboss.wsf.spi.util.StAXUtils.match;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ResourceBundle;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.ws.api.util.BundleUtils;
+import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.util.StAXUtils;
+
+/**
+ * A JBossXB factory for {@link JBossWebservicesMetaData}
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class JBossWebservicesFactory extends WebservicesFactory
+{
+   private static final ResourceBundle bundle =3D BundleUtils.getBundle(JB=
ossWebservicesFactory.class);
+   =

+   public JBossWebservicesFactory(URL descriptorURL)
+   {
+      super(descriptorURL);
+   }
+
+   /**
+    * Load jboss-webservices.xml from <code>META-INF/jboss-webservices.xml=
</code>
+    * or <code>WEB-INF/jboss-webservices.xml</code>.
+    *
+    * @param root virtual file root
+    * @return JBossWebservicesMetaData or <code>null</code> if it cannot b=
e found
+    */
+   public static WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile ro=
ot)
+   {
+      WebservicesMetaData webservices =3D null;
+
+      UnifiedVirtualFile wsdd =3D null;
+      try
+      {
+         wsdd =3D root.findChild("META-INF/jboss-webservices.xml");
+      }
+      catch (IOException e)
+      {
+         //
+      }
+
+      // Maybe a web application deployment?
+      if (null =3D=3D wsdd)
+      {
+         try
+         {
+            wsdd =3D root.findChild("WEB-INF/jboss-webservices.xml");
+         }
+         catch (IOException e)
+         {
+            //
+         }
+      }
+
+      // the descriptor is optional
+      if (wsdd !=3D null)
+      {
+         return load(wsdd.toURL());
+      }
+
+      return webservices;
+   }
+   =

+   public static JBossWebservicesMetaData load(URL wsddUrl)
+   {
+      InputStream is =3D null;
+      try
+      {
+         is =3D wsddUrl.openStream();
+         XMLStreamReader xmlr =3D StAXUtils.createXMLStreamReader(is);
+         return parse(xmlr, wsddUrl);
+      }
+      catch (Exception e)
+      {
+         throw new WebServiceException(BundleUtils.getMessage(bundle, "FAI=
LED_TO_UNMARSHALL", wsddUrl),  e);
+      }
+      finally
+      {
+         try
+         {
+            if (is !=3D null) is.close();
+         }
+         catch (IOException e) {} //ignore
+      }
+   }
+   =

+   public static JBossWebservicesMetaData parse(InputStream is)
+   {
+      return parse(is, null);
+   }
+   =

+   public static JBossWebservicesMetaData parse(InputStream is, URL descri=
ptorURL)
+   {
+      try
+      {
+         XMLStreamReader xmlr =3D StAXUtils.createXMLStreamReader(is);
+         return parse(xmlr, descriptorURL);
+      }
+      catch (Exception e)
+      {
+         throw new WebServiceException(e);
+      }
+   }
+   =

+   public static JBossWebservicesMetaData parse(XMLStreamReader reader) th=
rows XMLStreamException
+   {
+      return parse(reader, null);
+   }
+   =

+   private static JBossWebservicesMetaData parse(XMLStreamReader reader, U=
RL descriptorURL) throws XMLStreamException
+   {
+      int iterate;
+      try
+      {
+         iterate =3D reader.nextTag();
+      }
+      catch (XMLStreamException e)
+      {
+         // skip non-tag elements
+         iterate =3D reader.nextTag();
+      }
+      JBossWebservicesMetaData metadata =3D null;
+      switch (iterate)
+      {
+         case END_ELEMENT : {
+            // we're done
+            break;
+         }
+         case START_ELEMENT : {
+
+            if (match(reader, JBOSSEE_NS, WEBSERVICES))
+            {
+               String nsUri =3D reader.getNamespaceURI();
+               JBossWebservicesFactory factory =3D new JBossWebservicesFac=
tory(descriptorURL);
+               metadata =3D factory.parseWebservices(reader, nsUri, descri=
ptorURL);
+            }
+            else
+            {
+               throw new IllegalStateException(BundleUtils.getMessage(bund=
le, "UNEXPECTED_ELEMENT",  reader.getLocalName()));
+            }
+         }
+      }
+      return metadata;
+   }
+   =

+   private JBossWebservicesMetaData parseWebservices(XMLStreamReader reade=
r, String nsUri, URL descriptorURL) throws XMLStreamException
+   {
+      JBossWebservicesMetaData metadata =3D new JBossWebservicesMetaData(d=
escriptorURL);
+      while (reader.hasNext())
+      {
+         switch (reader.nextTag())
+         {
+            case XMLStreamConstants.END_ELEMENT : {
+               if (match(reader, nsUri, WEBSERVICES))
+               {
+                  return metadata;
+               }
+               else
+               {
+                  throw new IllegalStateException(BundleUtils.getMessage(b=
undle, "UNEXPECTED_END_TAG",  reader.getLocalName()));
+               }
+            }
+            case XMLStreamConstants.START_ELEMENT : {
+               if (match(reader, nsUri, CONTEXT_ROOT)) {
+                  metadata.setContextRoot(elementAsString(reader));
+               }
+               else if (match(reader, nsUri, CONFIG_NAME)) {
+                  metadata.setConfigName(elementAsString(reader));
+               }
+               else if (match(reader, nsUri, CONFIG_FILE)) {
+                  metadata.setConfigFile(elementAsString(reader));
+               }
+               else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) {
+                  metadata.addWebserviceDescription(super.parseWebserviceD=
escription(reader, nsUri, metadata));
+               }
+               else
+               {
+                  throw new IllegalStateException(BundleUtils.getMessage(b=
undle, "UNEXPECTED_ELEMENT",  reader.getLocalName()));
+               }
+            }
+         }
+      }
+      throw new IllegalStateException(BundleUtils.getMessage(bundle, "REAC=
HED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
+   }
+   =

+}

Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBoss=
WebservicesMetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesMetaData.java	                        (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWeb=
servicesMetaData.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., 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.spi.metadata.webservices;
+
+import java.net.URL;
+
+/**
+ * XML Binding root element for <code>jboss-webservices.xml</code>
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class JBossWebservicesMetaData extends WebservicesMetaData
+{
+
+   private String contextRoot;
+
+   private String configName;
+
+   private String configFile;
+
+   public JBossWebservicesMetaData()
+   {
+      super();
+   }
+
+   public JBossWebservicesMetaData(final URL descriptorURL)
+   {
+      super(descriptorURL);
+   }
+
+   public String getContextRoot()
+   {
+      return contextRoot;
+   }
+
+   public void setContextRoot(String contextRoot)
+   {
+      this.contextRoot =3D contextRoot;
+   }
+
+   public String getConfigName()
+   {
+      return configName;
+   }
+
+   public void setConfigName(String configName)
+   {
+      this.configName =3D configName;
+   }
+
+   public String getConfigFile()
+   {
+      return configFile;
+   }
+
+   public void setConfigFile(String configFile)
+   {
+      this.configFile =3D configFile;
+   }
+
+}

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Po=
rtComponentMetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComp=
onentMetaData.java	2011-10-28 19:49:55 UTC (rev 15173)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComp=
onentMetaData.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -62,6 +62,12 @@
     * This name must be unique amongst all port component names in a modul=
e.
     */
    private String portComponentName;
+   // The optional <port-component-uri>
+   private String portComponentURI;
+   // The optional <auth-method>
+   private String authMethod;
+   // The optional <transport-guarantee>
+   private String transportGuarantee;
    // The required <wsdl-port> element
    private QName wsdlPort;
    // The required <service-endpoint-interface> element
@@ -117,6 +123,36 @@
       this.portComponentName =3D portComponentName;
    }
 =

+   public String getPortComponentURI()
+   {
+      return portComponentURI;
+   }
+
+   public void setPortComponentURI(String portComponentURI)
+   {
+      this.portComponentURI =3D portComponentURI;
+   }
+
+   public String getAuthMethod()
+   {
+      return authMethod;
+   }
+
+   public void setAuthMethod(String authMethod)
+   {
+      this.authMethod =3D authMethod;
+   }
+
+   public String getTransportGuarantee()
+   {
+      return transportGuarantee;
+   }
+
+   public void setTransportGuarantee(String transportGuarantee)
+   {
+      this.transportGuarantee =3D transportGuarantee;
+   }
+
    public QName getWsdlPort()
    {
       return wsdlPort;

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/We=
bserviceDescriptionMetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservi=
ceDescriptionMetaData.java	2011-10-28 19:49:55 UTC (rev 15173)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservi=
ceDescriptionMetaData.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -55,7 +55,19 @@
    private String jaxrpcMappingFile;
    // The required <port-component> elements
    private ArrayList<PortComponentMetaData> portComponents =3D new ArrayLi=
st<PortComponentMetaData>();
+   // The optional <wsdl-publish-location> element
+   private String wsdlPublishLocation;
 =

+   public String getWsdlPublishLocation()
+   {
+      return wsdlPublishLocation;
+   }
+
+   public void setWsdlPublishLocation(String wsdlPublishLocation)
+   {
+      this.wsdlPublishLocation =3D wsdlPublishLocation;
+   }
+
    public WebserviceDescriptionMetaData(WebservicesMetaData webservices)
    {
       this.webservices =3D webservices;
@@ -120,6 +132,16 @@
       return null;
    }
 =

+   public PortComponentMetaData getPortComponentByEjbLinkName(String ejbNa=
me)
+   {
+      for (PortComponentMetaData pc : portComponents)
+      {
+         if (ejbName.equals(pc.getEjbLink())) return pc;
+      }
+
+      return null;
+   }
+
    public String getWebserviceDescriptionName()
    {
       return webserviceDescriptionName;

Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/We=
bservicesFactory.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservi=
cesFactory.java	2011-10-28 19:49:55 UTC (rev 15173)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/Webservi=
cesFactory.java	2011-10-31 15:26:08 UTC (rev 15174)
@@ -25,6 +25,7 @@
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING;
 import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING_RESPON=
SES;
+import static org.jboss.wsf.spi.metadata.ParserConstants.AUTH_METHOD;
 import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_LINK;
 import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLED;
 import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLE_MTOM;
@@ -36,16 +37,20 @@
 import static org.jboss.wsf.spi.metadata.ParserConstants.MTOM_THRESHOLD;
 import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT;
 import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NA=
ME;
+import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_UR=
I;
 import static org.jboss.wsf.spi.metadata.ParserConstants.PROTOCOL_BINDING;
 import static org.jboss.wsf.spi.metadata.ParserConstants.REQUIRED;
 import static org.jboss.wsf.spi.metadata.ParserConstants.RESPECT_BINDING;
+import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCES=
S;
 import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_ENDPOINT_=
INTERFACE;
 import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_IMPL_BEAN;
 import static org.jboss.wsf.spi.metadata.ParserConstants.SERVLET_LINK;
+import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANT=
EE;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRI=
PTION;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRI=
PTION_NAME;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_FILE;
+import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PUBLISH_LOCA=
TION;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PORT;
 import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_SERVICE;
 import static org.jboss.wsf.spi.util.StAXUtils.elementAsBoolean;
@@ -242,7 +247,7 @@
       throw new IllegalStateException(BundleUtils.getMessage(bundle, "REAC=
HED_END_OF_XML_DOCUMENT_UNEXPECTEDLY"));
    }
    =

-   private WebserviceDescriptionMetaData parseWebserviceDescription(XMLStr=
eamReader reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLS=
treamException
+   WebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReade=
r reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLStreamExc=
eption
    {
       WebserviceDescriptionMetaData description =3D new WebserviceDescript=
ionMetaData(wsMetaData);
       while (reader.hasNext())
@@ -266,9 +271,12 @@
                else if (match(reader, nsUri, WSDL_FILE)) {
                   description.setWsdlFile(elementAsString(reader));
                }
+               else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) {
+                  description.setWsdlPublishLocation(elementAsString(reade=
r));
+               }
                else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) {
-                  description.setJaxrpcMappingFile(elementAsString(reader)=
);
-               }
+                   description.setJaxrpcMappingFile(elementAsString(reader=
));
+                }
                else if (match(reader, nsUri, PORT_COMPONENT)) {
                   description.addPortComponent(parsePortComponent(reader, =
nsUri, description));
                }
@@ -303,12 +311,24 @@
                if (match(reader, nsUri, PORT_COMPONENT_NAME)) {
                   pc.setPortComponentName(elementAsString(reader));
                }
+               else if (match(reader, nsUri, PORT_COMPONENT_URI)) {
+                  pc.setPortComponentURI(elementAsString(reader));
+               }
+               else if (match(reader, nsUri, AUTH_METHOD)) {
+                  pc.setAuthMethod(elementAsString(reader));
+               }
+               else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) {
+                  pc.setTransportGuarantee(elementAsString(reader));
+               }
                else if (match(reader, nsUri, WSDL_SERVICE)) {
                   pc.setWsdlService(elementAsQName(reader));
                }
                else if (match(reader, nsUri, WSDL_PORT)) {
                   pc.setWsdlPort(elementAsQName(reader));
                }
+               else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) {
+                  pc.setSecureWSDLAccess(elementAsBoolean(reader));
+               }
                else if (match(reader, nsUri, ENABLE_MTOM)) {
                   pc.setMtomEnabled(elementAsBoolean(reader));
                }


--===============7075100414943636641==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:26:50 2011
Content-Type: multipart/mixed; boundary="===============6817585251919857801=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15175 -
 common/trunk/src/main/java/org/jboss/ws/common/deployment.
Date: Mon, 31 Oct 2011 11:26:50 -0400
Message-ID: <201110311526.p9VFQoAc003240@svn01.web.mwc.hst.phx2.redhat.com>

--===============6817585251919857801==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:26:50 -0400 (Mon, 31 Oct 2011)
New Revision: 15175

Added:
   common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservic=
esDescriptorParserImpl.java
Log:
[JBWS-3376] implemented jboss-webservices.xml parser

Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebse=
rvicesDescriptorParserImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservi=
cesDescriptorParserImpl.java	                        (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservi=
cesDescriptorParserImpl.java	2011-10-31 15:26:50 UTC (rev 15175)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.ws.common.deployment;
+
+import java.net.URL;
+
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorPa=
rser;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+
+/**
+ * JBoss Webservices descriptor parser implementation.
+ * =

+ * @author <a href=3D"ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class JBossWebservicesDescriptorParserImpl implements JBossWe=
bservicesDescriptorParser
+{
+   private String descriptorName;
+   =

+   @Override
+   public String getDescriptorName()
+   {
+      return this.descriptorName;
+   }
+
+   /**
+    * Invoked via MC.
+    * @param descriptorName
+    */
+   public void setDescriptorName(final String descriptorName)
+   {
+      this.descriptorName =3D descriptorName;
+   }
+
+   @Override
+   public JBossWebservicesMetaData parse(URL url)
+   {
+      return JBossWebservicesFactory.load(url);
+   }
+
+}


--===============6817585251919857801==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:27:34 2011
Content-Type: multipart/mixed; boundary="===============2866364841493495493=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15176 - in
 container/jboss60/branches/jbossws-jboss610/src/main:
 java/org/jboss/webservices/integration/deployers/deployment and 2 other
 directories.
Date: Mon, 31 Oct 2011 11:27:33 -0400
Message-ID: <201110311527.p9VFRXdW003270@svn01.web.mwc.hst.phx2.redhat.com>

--===============2866364841493495493==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:27:32 -0400 (Mon, 31 Oct 2011)
New Revision: 15176

Added:
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/JBossWebservicesDescriptorDeployer.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/WebservicesDescriptorDeployer.java
Removed:
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/WSDescriptorDeployer.java
Modified:
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/WSDeploymentDeployer.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21=
.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.j=
ava
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.j=
ava
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.ja=
va
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/metadata/AbstractMetaDataBuilderEJB.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB21.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB3.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderJSE.java
   container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webs=
ervices/integration/metadata/PublishLocationAdapterImpl.java
   container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-j=
boss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-3376] implemented jboss-webservices.xml parser and updated ASIL proce=
ssing accordingly

Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/=
webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/JBossWebservicesDescriptorDeployer.java	    =
                    (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/JBossWebservicesDescriptorDeployer.java	2011=
-10-31 15:27:32 UTC (rev 15176)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorPa=
rser;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+
+/**
+ * jboss-webservices.xml deployer.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class JBossWebservicesDescriptorDeployer extends AbstractDesc=
riptorDeployer<JBossWebservicesDescriptorParser, JBossWebservicesMetaData>
+{
+
+   /**
+    * Constructor.
+    */
+   public JBossWebservicesDescriptorDeployer()
+   {
+      super(JBossWebservicesMetaData.class);
+   }
+
+   /**
+    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
+    * @param parser the parser
+    */
+   @Override
+   public void setParser(final JBossWebservicesDescriptorParser parser)
+   {
+      super.setParser(parser);
+   }
+
+}

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/deployers/WSDeploymentDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WSDeploymentDeployer.java	2011-10-31 15:26:5=
0 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WSDeploymentDeployer.java	2011-10-31 15:27:3=
2 UTC (rev 15176)
@@ -28,6 +28,7 @@
 import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.webservices.integration.deployers.deployment.WSDeployment=
Builder;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
 =

 /**
@@ -47,6 +48,7 @@
       // inputs
       this.addInput(JBossWebMetaData.class);
       this.addInput(WebservicesMetaData.class);
+      this.addInput(JBossWebservicesMetaData.class);
       this.addInput(WebServiceDeployment.class);
 =

       // outputs

Deleted: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbos=
s/webservices/integration/deployers/WSDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WSDescriptorDeployer.java	2011-10-31 15:26:5=
0 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WSDescriptorDeployer.java	2011-10-31 15:27:3=
2 UTC (rev 15176)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.webservices.integration.deployers;
-
-import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-
-/**
- * webservices.xml deployer.
- *
- * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
- */
-public final class WSDescriptorDeployer extends AbstractDescriptorDeployer=
<WebservicesDescriptorParser, WebservicesMetaData>
-{
-
-   /**
-    * Constructor.
-    */
-   public WSDescriptorDeployer()
-   {
-      super(WebservicesMetaData.class);
-   }
-
-   /**
-    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
-    * @param parser the parser
-    */
-   @Override
-   public void setParser(final WebservicesDescriptorParser parser)
-   {
-      super.setParser(parser);
-   }
-
-}

Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/=
webservices/integration/deployers/WebservicesDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WebservicesDescriptorDeployer.java	         =
               (rev 0)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/WebservicesDescriptorDeployer.java	2011-10-3=
1 15:27:32 UTC (rev 15176)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * webservices.xml deployer.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebservicesDescriptorDeployer extends AbstractDescripto=
rDeployer<WebservicesDescriptorParser, WebservicesMetaData>
+{
+
+   /**
+    * Constructor.
+    */
+   public WebservicesDescriptorDeployer()
+   {
+      super(WebservicesMetaData.class);
+   }
+
+   /**
+    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
+    * @param parser the parser
+    */
+   @Override
+   public void setParser(final WebservicesDescriptorParser parser)
+   {
+      super.setParser(parser);
+   }
+
+}

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRP=
C_EJB21.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB2=
1.java	2011-10-31 15:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB2=
1.java	2011-10-31 15:27:32 UTC (rev 15176)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.webservices.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -60,6 +61,10 @@
       final JBossMetaData jbmd =3D this.getAndPropagateAttachment(JBossMet=
aData.class, unit, dep);
       final WebservicesMetaData wsMetaData =3D this.getAndPropagateAttachm=
ent(WebservicesMetaData.class, unit, dep);
       this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep=
);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXRPC EJB21 endpoints meta data model");
       for (final WebserviceDescriptionMetaData webserviceDescriptionMD : w=
sMetaData.getWebserviceDescriptions())

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRP=
C_JSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.=
java	2011-10-31 15:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.=
java	2011-10-31 15:27:32 UTC (rev 15176)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -59,6 +60,10 @@
    {
       final JBossWebMetaData webMetaData =3D this.getAndPropagateAttachmen=
t(JBossWebMetaData.class, unit, dep);
       final WebservicesMetaData wsMetaData =3D this.getAndPropagateAttachm=
ent(WebservicesMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXRPC JSE endpoints meta data model");
       for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDes=
criptions())

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS=
_EJB3.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.=
java	2011-10-31 15:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.=
java	2011-10-31 15:27:32 UTC (rev 15176)
@@ -29,6 +29,7 @@
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.webservices.integration.WebServiceDeclaration;
 import org.jboss.webservices.integration.WebServiceDeployment;
 =

@@ -58,6 +59,10 @@
    {
       this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep=
);
       this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXWS EJB3 endpoints meta data model");
       for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(u=
nit))

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS=
_JSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.j=
ava	2011-10-31 15:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.j=
ava	2011-10-31 15:27:32 UTC (rev 15176)
@@ -31,6 +31,7 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 =

 /**
  * Creates new JAXWS JSE deployment.
@@ -57,6 +58,10 @@
    protected void build(final Deployment dep, final DeploymentUnit unit)
    {
       this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXWS JSE endpoints meta data model");
       final List<ServletMetaData> servlets =3D ASHelper.getJaxwsServlets(u=
nit);

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java	2011-10-31 15=
:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java	2011-10-31 15=
:27:32 UTC (rev 15176)
@@ -21,19 +21,14 @@
  */
 package org.jboss.webservices.integration.metadata;
 =

-import java.util.Iterator;
-
 import org.jboss.logging.Logger;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 =

 /**
  * Common class for EJB meta data builders.
@@ -86,67 +81,41 @@
     */
    private void buildWebservicesMetaData(final Deployment dep, final EJBAr=
chiveMetaData ejbArchiveMD)
    {
-      final JBossMetaData jbossMD =3D WSHelper.getRequiredAttachment(dep, =
JBossMetaData.class);
-      final WebservicesMetaData webservicesMD =3D jbossMD.getWebservices();
+      final JBossWebservicesMetaData webservicesMD =3D WSHelper.getOptiona=
lAttachment(dep, JBossWebservicesMetaData.class);
 =

-      if (webservicesMD =3D=3D null)
-      {
-         return;
-      }
+      if (webservicesMD =3D=3D null) return;
 =

       // set context root
-      String contextRoot =3D webservicesMD.getContextRoot();
-      final WebserviceDescriptionsMetaData wsDescriptionsMD =3D webservice=
sMD.getWebserviceDescriptions();
-
-      if (wsDescriptionsMD !=3D null)
-      {
-         // set wsdl location resolver
-         final PublishLocationAdapter resolver =3D new PublishLocationAdap=
terImpl(wsDescriptionsMD);
-         ejbArchiveMD.setPublishLocationAdapter(resolver);
-
-         final WebserviceDescriptionMetaData wsDescriptionMD =3D ASHelper
-               .getWebserviceDescriptionMetaData(wsDescriptionsMD);
-         if (wsDescriptionMD !=3D null)
-         {
-            if (contextRoot =3D=3D null && !hasContextRoot(ejbArchiveMD))
-            {
-               contextRoot =3D wsDescriptionMD.getWebserviceDescriptionNam=
e(); // TCK6 fallback
-            }
-
-            final String configName =3D wsDescriptionMD.getConfigName();
-            final String configFile =3D wsDescriptionMD.getConfigFile();
-
-            // set config name
-            this.log.debug("Setting config name: " + configName);
-            ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
-
-            // set config file
-            this.log.debug("Setting config file: " + configFile);
-            ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
-         }
-      }
-
+      final String contextRoot =3D webservicesMD.getContextRoot();
       ejbArchiveMD.setWebServiceContextRoot(contextRoot);
       this.log.debug("Setting context root: " + contextRoot);
+
+      // set config name
+      final String configName =3D webservicesMD.getConfigName();
+      this.log.debug("Setting config name: " + configName);
+      ejbArchiveMD.setConfigName(configName);
+
+      // set config file
+      final String configFile =3D webservicesMD.getConfigFile();
+      this.log.debug("Setting config file: " + configFile);
+      ejbArchiveMD.setConfigFile(configFile);
+      =

+      // set wsdl location resolver
+      final WebserviceDescriptionMetaData[] wsDescriptionsMD =3D webservic=
esMD.getWebserviceDescriptions();
+      final PublishLocationAdapter resolver =3D new PublishLocationAdapter=
Impl(wsDescriptionsMD);
+      ejbArchiveMD.setPublishLocationAdapter(resolver);
    }
 =

-   /**
-    * Returns true if has context root, false otherwise.
-    *
-    * @param ejbArchiveMD ejb archive MD
-    * @return true if has context root, false otherwise
-    */
-   private boolean hasContextRoot(final EJBArchiveMetaData ejbArchiveMD)
-   {
-      for (final Iterator<EJBMetaData> ejbMDs =3D ejbArchiveMD.getEnterpri=
seBeans(); ejbMDs.hasNext(); )
-      {
-         final EJBMetaData ejbMD =3D ejbMDs.next();
-         if (ejbMD.getPortComponentURI() !=3D null)
-         {
-            return true;
-         }
-      }
+   protected PortComponentMetaData getPortComponent(final String ejbName, =
final JBossWebservicesMetaData jbossWebservicesMD) {
+       if (jbossWebservicesMD =3D=3D null) return null;
 =

-      return false;
+       PortComponentMetaData portComponentMD =3D null;
+       for (final WebserviceDescriptionMetaData webserviceDescriptionMD : =
jbossWebservicesMD.getWebserviceDescriptions()) {
+           portComponentMD =3D webserviceDescriptionMD.getPortComponentByE=
jbLinkName(ejbName);
+           if (portComponentMD !=3D null) return portComponentMD;
+       }
+       =

+       return null;
    }
+
 }

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB21.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java	2011-10-31 15:26:50=
 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java	2011-10-31 15:27:32=
 UTC (rev 15176)
@@ -27,13 +27,14 @@
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 =

 /**
  * Builds container independent meta data from EJB21 container meta data. =

@@ -63,10 +64,11 @@
    {
       final JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment=
(dep, JBossMetaData.class);
       final List<EJBMetaData> wsEjbsMD =3D new LinkedList<EJBMetaData>();
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
 =

       for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.ge=
tEnterpriseBeans())
       {
-         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebse=
rvicesMD);
       }
 =

       ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
@@ -83,7 +85,7 @@
     * @param jbossEjbMD jboss specific EJB meta data
     */
    private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD,
-         final JBossEnterpriseBeanMetaData jbossEjbMD)
+         final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservi=
cesMetaData jbossWebservicesMD)
    {
       final EJBMetaData wsEjbMD =3D newEjbMetaData(jbossEjbMD);
 =

@@ -106,19 +108,19 @@
             wsEjbMD.setJndiName(sessionEjbMD.determineJndiName());
             wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName());
 =

-            final PortComponent portComponentMD =3D sessionEjbMD.getPortCo=
mponent();
+            final PortComponentMetaData portComponentMD =3D getPortCompone=
nt(jbossEjbMD.getEjbName(), jbossWebservicesMD);
             if (portComponentMD !=3D null)
             {
-               // set port component meta data
-               wsEjbMD.setPortComponentName(portComponentMD.getPortCompone=
ntName());
-               wsEjbMD.setPortComponentURI(portComponentMD.getPortComponen=
tURI());
+                // set port component meta data
+                wsEjbMD.setPortComponentName(portComponentMD.getPortCompon=
entName());
+                wsEjbMD.setPortComponentURI(portComponentMD.getPortCompone=
ntURI());
 =

-               // set security meta data
-               final EJBSecurityMetaData smd =3D new EJBSecurityMetaData();
-               smd.setAuthMethod(portComponentMD.getAuthMethod());
-               smd.setTransportGuarantee(portComponentMD.getTransportGuara=
ntee());
-               smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess=
());
-               wsEjbMD.setSecurityMetaData(smd);
+                // set security meta data
+                final EJBSecurityMetaData smd =3D new EJBSecurityMetaData(=
);
+                smd.setAuthMethod(portComponentMD.getAuthMethod());
+                smd.setTransportGuarantee(portComponentMD.getTransportGuar=
antee());
+                smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAcces=
s());
+                wsEjbMD.setSecurityMetaData(smd);
             }
          }
 =


Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB3.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java	2011-10-31 15:26:50 =
UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java	2011-10-31 15:27:32 =
UTC (rev 15176)
@@ -26,16 +26,16 @@
 =

 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.webservices.integration.WebServiceDeclaration;
-import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 =

 /**
  * Builds container independent meta data from EJB3 container meta data. =

@@ -65,12 +65,13 @@
       final JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment=
(dep, JBossMetaData.class);
       final WebServiceDeployment ejb3Deployment =3D WSHelper.getRequiredAt=
tachment(dep, WebServiceDeployment.class);
       final List<EJBMetaData> wsEjbsMD =3D new LinkedList<EJBMetaData>();
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
 =

       for (final WebServiceDeclaration ejbEndpoint : ejb3Deployment.getSer=
viceEndpoints())
       {
          final String ejbName =3D ejbEndpoint.getComponentName();
          final JBossEnterpriseBeanMetaData jbossEjbMD =3D jbossMetaData.ge=
tEnterpriseBean(ejbName);
-         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebse=
rvicesMD);
       }
 =

       ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
@@ -82,7 +83,7 @@
     * @param wsEjbsMD jboss agnostic EJBs meta data
     * @param jbossEjbMD jboss specific EJB meta data
     */
-   private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD, final JBossEnterpriseBeanMetaData jbossEjbMD)
+   private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD, final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMet=
aData jbossWebservicesMD)
    {
       log.debug("Creating JBoss agnostic EJB3 meta data for session bean: =
" + jbossEjbMD.getEjbClass());
       final EJBMetaData wsEjbMD =3D new SLSBMetaData();
@@ -91,8 +92,7 @@
 =

       if (jbossEjbMD.isSession())
       {
-         final JBossSessionBeanMetaData sessionEjbMD =3D (JBossSessionBean=
MetaData) jbossEjbMD;
-         final PortComponent portComponentMD =3D sessionEjbMD.getPortCompo=
nent();
+         final PortComponentMetaData portComponentMD =3D getPortComponent(=
jbossEjbMD.getEjbName(), jbossWebservicesMD);
          if (portComponentMD !=3D null)
          {
             // set port component meta data

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderJSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderJSE.java	2011-10-31 15:26:50 U=
TC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderJSE.java	2011-10-31 15:27:32 U=
TC (rev 15176)
@@ -49,6 +49,7 @@
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceColl=
ection;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 =

 /**
  * Builds container independent meta data from WEB container meta data.
@@ -97,16 +98,20 @@
       jseArchiveMD.setSecurityDomain(securityDomain);
 =

       // set wsdl location resolver
-      final PublishLocationAdapter resolver =3D new PublishLocationAdapter=
Impl(jbossWebMD.getWebserviceDescriptions());
-      jseArchiveMD.setPublishLocationAdapter(resolver);
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
+      if (jbossWebservicesMD !=3D null)
+      {
+          final PublishLocationAdapter resolver =3D new PublishLocationAda=
pterImpl(jbossWebservicesMD.getWebserviceDescriptions());
+          jseArchiveMD.setPublishLocationAdapter(resolver);
+      }
 =

+      // set config name and file
+      this.setConfigNameAndFile(jseArchiveMD, jbossWebMD, jbossWebservices=
MD);
+
       // set security meta data
       final List<JSESecurityMetaData> jseSecurityMDs =3D this.getSecurityM=
etaData(jbossWebMD.getSecurityConstraints());
       jseArchiveMD.setSecurityMetaData(jseSecurityMDs);
 =

-      // set config name and file
-      this.setConfigNameAndFile(jseArchiveMD, jbossWebMD);
-
       return jseArchiveMD;
    }
 =

@@ -116,16 +121,14 @@
     * @param jseArchiveMD universal JSE meta data model
     * @param jbossWebMD jboss web meta data
     */
-   private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD=
, final JBossWebMetaData jbossWebMD)
+   private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD=
, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWe=
bservicesMD)
    {
-      final WebserviceDescriptionsMetaData wsDescriptionsMD =3D jbossWebMD=
.getWebserviceDescriptions();
-      final WebserviceDescriptionMetaData wsDescriptionMD =3D ASHelper.get=
WebserviceDescriptionMetaData(wsDescriptionsMD);
-      if (wsDescriptionMD !=3D null)
+      if (jbossWebservicesMD !=3D null)
       {
-         if (wsDescriptionMD.getConfigName() !=3D null)
+         if (jbossWebservicesMD.getConfigName() !=3D null)
          {
-            jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
-            jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
+            jseArchiveMD.setConfigName(jbossWebservicesMD.getConfigName());
+            jseArchiveMD.setConfigFile(jbossWebservicesMD.getConfigFile());
 =

             // ensure higher priority against web.xml context parameters
             return;

Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jbo=
ss/webservices/integration/metadata/PublishLocationAdapterImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java	2011-10-31 15=
:26:50 UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java	2011-10-31 15=
:27:32 UTC (rev 15176)
@@ -21,9 +21,8 @@
  */
 package org.jboss.webservices.integration.metadata;
 =

-import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 =

 /**
  * Publish location adapter implementation.
@@ -34,17 +33,15 @@
 final class PublishLocationAdapterImpl implements PublishLocationAdapter
 {
    /** Webservice descriptions meta data. */
-   private final WebserviceDescriptionsMetaData wsDescriptionsMD;
+   private final WebserviceDescriptionMetaData[] wsDescriptionsMD;
 =

    /**
     * Constructor.
     *
     * @param wsDescriptionsMD webservice descriptions meta data
     */
-   PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescr=
iptionsMD)
+   PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDesc=
riptionsMD)
    {
-      super();
-
       this.wsDescriptionsMD =3D wsDescriptionsMD;
    }
 =

@@ -56,13 +53,12 @@
     */
    public String getWsdlPublishLocationByName(final String endpointName)
    {
-      if (this.wsDescriptionsMD !=3D null)
+      if (wsDescriptionsMD !=3D null)
       {
-         final WebserviceDescriptionMetaData endpointMD =3D this.wsDescrip=
tionsMD.get(endpointName);
-
-         if (endpointMD !=3D null)
+         for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDesc=
riptionsMD)
          {
-            return endpointMD.getWsdlPublishLocation();
+             if (endpointName.equals(wsDescriptionMD.getWebserviceDescript=
ionName()))
+                 return wsDescriptionMD.getWsdlPublishLocation();
          }
       }
 =


Modified: container/jboss60/branches/jbossws-jboss610/src/main/resources/jb=
ossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-=
jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2011-10-31 15:26:50 =
UTC (rev 15175)
+++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-=
jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2011-10-31 15:27:32 =
UTC (rev 15176)
@@ -54,9 +54,12 @@
   </bean>
 =

   <!-- deployers -->
-  <bean name=3D"WSDescriptorDeployer" class=3D"org.jboss.webservices.integ=
ration.deployers.WSDescriptorDeployer">
+  <bean name=3D"WSWebservicesDescriptorDeployer" class=3D"org.jboss.webser=
vices.integration.deployers.WebservicesDescriptorDeployer">
     <incallback method=3D"setParser"/>
   </bean>
+  <bean name=3D"WSJBossWebservicesDescriptorDeployer" class=3D"org.jboss.w=
ebservices.integration.deployers.JBossWebservicesDescriptorDeployer">
+    <incallback method=3D"setParser"/>
+  </bean>
 =

   <bean name=3D"WSEJBAdapterDeployer" class=3D"org.jboss.webservices.integ=
ration.deployers.WSEJBAdapterDeployer"/>
 =



--===============2866364841493495493==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:28:05 2011
Content-Type: multipart/mixed; boundary="===============9020089386828803731=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15177 - in
 container/jboss60/branches/jbossws-jboss600/src/main:
 java/org/jboss/webservices/integration/deployers/deployment and 2 other
 directories.
Date: Mon, 31 Oct 2011 11:28:05 -0400
Message-ID: <201110311528.p9VFS584003281@svn01.web.mwc.hst.phx2.redhat.com>

--===============9020089386828803731==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:28:04 -0400 (Mon, 31 Oct 2011)
New Revision: 15177

Added:
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/JBossWebservicesDescriptorDeployer.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/WebservicesDescriptorDeployer.java
Removed:
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/WSDescriptorDeployer.java
Modified:
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/WSDeploymentDeployer.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21=
.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.j=
ava
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.j=
ava
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.ja=
va
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/metadata/AbstractMetaDataBuilderEJB.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB21.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB3.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderJSE.java
   container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webs=
ervices/integration/metadata/PublishLocationAdapterImpl.java
   container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-j=
boss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-3376] implemented jboss-webservices.xml parser and updated ASIL proce=
ssing accordingly

Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/=
webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/JBossWebservicesDescriptorDeployer.java	    =
                    (rev 0)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/JBossWebservicesDescriptorDeployer.java	2011=
-10-31 15:28:04 UTC (rev 15177)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorPa=
rser;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+
+/**
+ * jboss-webservices.xml deployer.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class JBossWebservicesDescriptorDeployer extends AbstractDesc=
riptorDeployer<JBossWebservicesDescriptorParser, JBossWebservicesMetaData>
+{
+
+   /**
+    * Constructor.
+    */
+   public JBossWebservicesDescriptorDeployer()
+   {
+      super(JBossWebservicesMetaData.class);
+   }
+
+   /**
+    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
+    * @param parser the parser
+    */
+   @Override
+   public void setParser(final JBossWebservicesDescriptorParser parser)
+   {
+      super.setParser(parser);
+   }
+
+}

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/deployers/WSDeploymentDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WSDeploymentDeployer.java	2011-10-31 15:27:3=
2 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WSDeploymentDeployer.java	2011-10-31 15:28:0=
4 UTC (rev 15177)
@@ -28,6 +28,7 @@
 import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.webservices.integration.deployers.deployment.WSDeployment=
Builder;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
 =

 /**
@@ -47,6 +48,7 @@
       // inputs
       this.addInput(JBossWebMetaData.class);
       this.addInput(WebservicesMetaData.class);
+      this.addInput(JBossWebservicesMetaData.class);
       this.addInput(WebServiceDeployment.class);
 =

       // outputs

Deleted: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbos=
s/webservices/integration/deployers/WSDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WSDescriptorDeployer.java	2011-10-31 15:27:3=
2 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WSDescriptorDeployer.java	2011-10-31 15:28:0=
4 UTC (rev 15177)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.webservices.integration.deployers;
-
-import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
-import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
-
-/**
- * webservices.xml deployer.
- *
- * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
- */
-public final class WSDescriptorDeployer extends AbstractDescriptorDeployer=
<WebservicesDescriptorParser, WebservicesMetaData>
-{
-
-   /**
-    * Constructor.
-    */
-   public WSDescriptorDeployer()
-   {
-      super(WebservicesMetaData.class);
-   }
-
-   /**
-    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
-    * @param parser the parser
-    */
-   @Override
-   public void setParser(final WebservicesDescriptorParser parser)
-   {
-      super.setParser(parser);
-   }
-
-}

Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/=
webservices/integration/deployers/WebservicesDescriptorDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WebservicesDescriptorDeployer.java	         =
               (rev 0)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/WebservicesDescriptorDeployer.java	2011-10-3=
1 15:28:04 UTC (rev 15177)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.webservices.integration.deployers;
+
+import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+
+/**
+ * webservices.xml deployer.
+ *
+ * @author <a href=3D"mailto:ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebservicesDescriptorDeployer extends AbstractDescripto=
rDeployer<WebservicesDescriptorParser, WebservicesMetaData>
+{
+
+   /**
+    * Constructor.
+    */
+   public WebservicesDescriptorDeployer()
+   {
+      super(WebservicesMetaData.class);
+   }
+
+   /**
+    * MC incallback method. It will be invoked each time WebservicesDescri=
ptorParser bean will be installed.
+    * @param parser the parser
+    */
+   @Override
+   public void setParser(final WebservicesDescriptorParser parser)
+   {
+      super.setParser(parser);
+   }
+
+}

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRP=
C_EJB21.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB2=
1.java	2011-10-31 15:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB2=
1.java	2011-10-31 15:28:04 UTC (rev 15177)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.webservices.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -60,6 +61,10 @@
       final JBossMetaData jbmd =3D this.getAndPropagateAttachment(JBossMet=
aData.class, unit, dep);
       final WebservicesMetaData wsMetaData =3D this.getAndPropagateAttachm=
ent(WebservicesMetaData.class, unit, dep);
       this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep=
);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXRPC EJB21 endpoints meta data model");
       for (final WebserviceDescriptionMetaData webserviceDescriptionMD : w=
sMetaData.getWebserviceDescriptions())

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRP=
C_JSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.=
java	2011-10-31 15:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.=
java	2011-10-31 15:28:04 UTC (rev 15177)
@@ -29,6 +29,7 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -59,6 +60,10 @@
    {
       final JBossWebMetaData webMetaData =3D this.getAndPropagateAttachmen=
t(JBossWebMetaData.class, unit, dep);
       final WebservicesMetaData wsMetaData =3D this.getAndPropagateAttachm=
ent(WebservicesMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXRPC JSE endpoints meta data model");
       for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDes=
criptions())

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS=
_EJB3.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.=
java	2011-10-31 15:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.=
java	2011-10-31 15:28:04 UTC (rev 15177)
@@ -29,6 +29,7 @@
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 import org.jboss.webservices.integration.WebServiceDeclaration;
 import org.jboss.webservices.integration.WebServiceDeployment;
 =

@@ -58,6 +59,10 @@
    {
       this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep=
);
       this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXWS EJB3 endpoints meta data model");
       for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(u=
nit))

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS=
_JSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.j=
ava	2011-10-31 15:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.j=
ava	2011-10-31 15:28:04 UTC (rev 15177)
@@ -31,6 +31,7 @@
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 =

 /**
  * Creates new JAXWS JSE deployment.
@@ -57,6 +58,10 @@
    protected void build(final Deployment dep, final DeploymentUnit unit)
    {
       this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
+      if (unit.isAttachmentPresent(JBossWebservicesMetaData.class))
+      {
+         this.getAndPropagateAttachment(JBossWebservicesMetaData.class, un=
it, dep);
+      }
 =

       this.log.debug("Creating JAXWS JSE endpoints meta data model");
       final List<ServletMetaData> servlets =3D ASHelper.getJaxwsServlets(u=
nit);

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java	2011-10-31 15=
:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java	2011-10-31 15=
:28:04 UTC (rev 15177)
@@ -21,19 +21,14 @@
  */
 package org.jboss.webservices.integration.metadata;
 =

-import java.util.Iterator;
-
 import org.jboss.logging.Logger;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.webservices.integration.util.ASHelper;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 =

 /**
  * Common class for EJB meta data builders.
@@ -86,67 +81,41 @@
     */
    private void buildWebservicesMetaData(final Deployment dep, final EJBAr=
chiveMetaData ejbArchiveMD)
    {
-      final JBossMetaData jbossMD =3D WSHelper.getRequiredAttachment(dep, =
JBossMetaData.class);
-      final WebservicesMetaData webservicesMD =3D jbossMD.getWebservices();
+      final JBossWebservicesMetaData webservicesMD =3D WSHelper.getOptiona=
lAttachment(dep, JBossWebservicesMetaData.class);
 =

-      if (webservicesMD =3D=3D null)
-      {
-         return;
-      }
+      if (webservicesMD =3D=3D null) return;
 =

       // set context root
-      String contextRoot =3D webservicesMD.getContextRoot();
-      final WebserviceDescriptionsMetaData wsDescriptionsMD =3D webservice=
sMD.getWebserviceDescriptions();
-
-      if (wsDescriptionsMD !=3D null)
-      {
-         // set wsdl location resolver
-         final PublishLocationAdapter resolver =3D new PublishLocationAdap=
terImpl(wsDescriptionsMD);
-         ejbArchiveMD.setPublishLocationAdapter(resolver);
-
-         final WebserviceDescriptionMetaData wsDescriptionMD =3D ASHelper
-               .getWebserviceDescriptionMetaData(wsDescriptionsMD);
-         if (wsDescriptionMD !=3D null)
-         {
-            if (contextRoot =3D=3D null && !hasContextRoot(ejbArchiveMD))
-            {
-               contextRoot =3D wsDescriptionMD.getWebserviceDescriptionNam=
e(); // TCK6 fallback
-            }
-
-            final String configName =3D wsDescriptionMD.getConfigName();
-            final String configFile =3D wsDescriptionMD.getConfigFile();
-
-            // set config name
-            this.log.debug("Setting config name: " + configName);
-            ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
-
-            // set config file
-            this.log.debug("Setting config file: " + configFile);
-            ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
-         }
-      }
-
+      final String contextRoot =3D webservicesMD.getContextRoot();
       ejbArchiveMD.setWebServiceContextRoot(contextRoot);
       this.log.debug("Setting context root: " + contextRoot);
+
+      // set config name
+      final String configName =3D webservicesMD.getConfigName();
+      this.log.debug("Setting config name: " + configName);
+      ejbArchiveMD.setConfigName(configName);
+
+      // set config file
+      final String configFile =3D webservicesMD.getConfigFile();
+      this.log.debug("Setting config file: " + configFile);
+      ejbArchiveMD.setConfigFile(configFile);
+      =

+      // set wsdl location resolver
+      final WebserviceDescriptionMetaData[] wsDescriptionsMD =3D webservic=
esMD.getWebserviceDescriptions();
+      final PublishLocationAdapter resolver =3D new PublishLocationAdapter=
Impl(wsDescriptionsMD);
+      ejbArchiveMD.setPublishLocationAdapter(resolver);
    }
 =

-   /**
-    * Returns true if has context root, false otherwise.
-    *
-    * @param ejbArchiveMD ejb archive MD
-    * @return true if has context root, false otherwise
-    */
-   private boolean hasContextRoot(final EJBArchiveMetaData ejbArchiveMD)
-   {
-      for (final Iterator<EJBMetaData> ejbMDs =3D ejbArchiveMD.getEnterpri=
seBeans(); ejbMDs.hasNext(); )
-      {
-         final EJBMetaData ejbMD =3D ejbMDs.next();
-         if (ejbMD.getPortComponentURI() !=3D null)
-         {
-            return true;
-         }
-      }
+   protected PortComponentMetaData getPortComponent(final String ejbName, =
final JBossWebservicesMetaData jbossWebservicesMD) {
+       if (jbossWebservicesMD =3D=3D null) return null;
 =

-      return false;
+       PortComponentMetaData portComponentMD =3D null;
+       for (final WebserviceDescriptionMetaData webserviceDescriptionMD : =
jbossWebservicesMD.getWebserviceDescriptions()) {
+           portComponentMD =3D webserviceDescriptionMD.getPortComponentByE=
jbLinkName(ejbName);
+           if (portComponentMD !=3D null) return portComponentMD;
+       }
+       =

+       return null;
    }
+
 }

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB21.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java	2011-10-31 15:27:32=
 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java	2011-10-31 15:28:04=
 UTC (rev 15177)
@@ -27,13 +27,14 @@
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 =

 /**
  * Builds container independent meta data from EJB21 container meta data. =

@@ -63,10 +64,11 @@
    {
       final JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment=
(dep, JBossMetaData.class);
       final List<EJBMetaData> wsEjbsMD =3D new LinkedList<EJBMetaData>();
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
 =

       for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.ge=
tEnterpriseBeans())
       {
-         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebse=
rvicesMD);
       }
 =

       ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
@@ -83,7 +85,7 @@
     * @param jbossEjbMD jboss specific EJB meta data
     */
    private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD,
-         final JBossEnterpriseBeanMetaData jbossEjbMD)
+         final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservi=
cesMetaData jbossWebservicesMD)
    {
       final EJBMetaData wsEjbMD =3D newEjbMetaData(jbossEjbMD);
 =

@@ -106,19 +108,19 @@
             wsEjbMD.setJndiName(sessionEjbMD.determineJndiName());
             wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName());
 =

-            final PortComponent portComponentMD =3D sessionEjbMD.getPortCo=
mponent();
+            final PortComponentMetaData portComponentMD =3D getPortCompone=
nt(jbossEjbMD.getEjbName(), jbossWebservicesMD);
             if (portComponentMD !=3D null)
             {
-               // set port component meta data
-               wsEjbMD.setPortComponentName(portComponentMD.getPortCompone=
ntName());
-               wsEjbMD.setPortComponentURI(portComponentMD.getPortComponen=
tURI());
+                // set port component meta data
+                wsEjbMD.setPortComponentName(portComponentMD.getPortCompon=
entName());
+                wsEjbMD.setPortComponentURI(portComponentMD.getPortCompone=
ntURI());
 =

-               // set security meta data
-               final EJBSecurityMetaData smd =3D new EJBSecurityMetaData();
-               smd.setAuthMethod(portComponentMD.getAuthMethod());
-               smd.setTransportGuarantee(portComponentMD.getTransportGuara=
ntee());
-               smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess=
());
-               wsEjbMD.setSecurityMetaData(smd);
+                // set security meta data
+                final EJBSecurityMetaData smd =3D new EJBSecurityMetaData(=
);
+                smd.setAuthMethod(portComponentMD.getAuthMethod());
+                smd.setTransportGuarantee(portComponentMD.getTransportGuar=
antee());
+                smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAcces=
s());
+                wsEjbMD.setSecurityMetaData(smd);
             }
          }
 =


Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB3.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java	2011-10-31 15:27:32 =
UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java	2011-10-31 15:28:04 =
UTC (rev 15177)
@@ -26,16 +26,16 @@
 =

 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.PortComponent;
+import org.jboss.webservices.integration.WebServiceDeclaration;
+import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.ws.common.integration.WSHelper;
 import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.webservices.integration.WebServiceDeclaration;
-import org.jboss.webservices.integration.WebServiceDeployment;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
+import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
 =

 /**
  * Builds container independent meta data from EJB3 container meta data. =

@@ -65,12 +65,13 @@
       final JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment=
(dep, JBossMetaData.class);
       final WebServiceDeployment ejb3Deployment =3D WSHelper.getRequiredAt=
tachment(dep, WebServiceDeployment.class);
       final List<EJBMetaData> wsEjbsMD =3D new LinkedList<EJBMetaData>();
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
 =

       for (final WebServiceDeclaration ejbEndpoint : ejb3Deployment.getSer=
viceEndpoints())
       {
          final String ejbName =3D ejbEndpoint.getComponentName();
          final JBossEnterpriseBeanMetaData jbossEjbMD =3D jbossMetaData.ge=
tEnterpriseBean(ejbName);
-         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+         this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebse=
rvicesMD);
       }
 =

       ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
@@ -82,7 +83,7 @@
     * @param wsEjbsMD jboss agnostic EJBs meta data
     * @param jbossEjbMD jboss specific EJB meta data
     */
-   private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD, final JBossEnterpriseBeanMetaData jbossEjbMD)
+   private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbs=
MD, final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMet=
aData jbossWebservicesMD)
    {
       log.debug("Creating JBoss agnostic EJB3 meta data for session bean: =
" + jbossEjbMD.getEjbClass());
       final EJBMetaData wsEjbMD =3D new SLSBMetaData();
@@ -91,8 +92,7 @@
 =

       if (jbossEjbMD.isSession())
       {
-         final JBossSessionBeanMetaData sessionEjbMD =3D (JBossSessionBean=
MetaData) jbossEjbMD;
-         final PortComponent portComponentMD =3D sessionEjbMD.getPortCompo=
nent();
+         final PortComponentMetaData portComponentMD =3D getPortComponent(=
jbossEjbMD.getEjbName(), jbossWebservicesMD);
          if (portComponentMD !=3D null)
          {
             // set port component meta data

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderJSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderJSE.java	2011-10-31 15:27:32 U=
TC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderJSE.java	2011-10-31 15:28:04 U=
TC (rev 15177)
@@ -49,6 +49,7 @@
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceColl=
ection;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData;
 =

 /**
  * Builds container independent meta data from WEB container meta data.
@@ -97,16 +98,20 @@
       jseArchiveMD.setSecurityDomain(securityDomain);
 =

       // set wsdl location resolver
-      final PublishLocationAdapter resolver =3D new PublishLocationAdapter=
Impl(jbossWebMD.getWebserviceDescriptions());
-      jseArchiveMD.setPublishLocationAdapter(resolver);
+      final JBossWebservicesMetaData jbossWebservicesMD =3D WSHelper.getOp=
tionalAttachment(dep, JBossWebservicesMetaData.class);
+      if (jbossWebservicesMD !=3D null)
+      {
+          final PublishLocationAdapter resolver =3D new PublishLocationAda=
pterImpl(jbossWebservicesMD.getWebserviceDescriptions());
+          jseArchiveMD.setPublishLocationAdapter(resolver);
+      }
 =

+      // set config name and file
+      this.setConfigNameAndFile(jseArchiveMD, jbossWebMD, jbossWebservices=
MD);
+
       // set security meta data
       final List<JSESecurityMetaData> jseSecurityMDs =3D this.getSecurityM=
etaData(jbossWebMD.getSecurityConstraints());
       jseArchiveMD.setSecurityMetaData(jseSecurityMDs);
 =

-      // set config name and file
-      this.setConfigNameAndFile(jseArchiveMD, jbossWebMD);
-
       return jseArchiveMD;
    }
 =

@@ -116,16 +121,14 @@
     * @param jseArchiveMD universal JSE meta data model
     * @param jbossWebMD jboss web meta data
     */
-   private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD=
, final JBossWebMetaData jbossWebMD)
+   private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD=
, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWe=
bservicesMD)
    {
-      final WebserviceDescriptionsMetaData wsDescriptionsMD =3D jbossWebMD=
.getWebserviceDescriptions();
-      final WebserviceDescriptionMetaData wsDescriptionMD =3D ASHelper.get=
WebserviceDescriptionMetaData(wsDescriptionsMD);
-      if (wsDescriptionMD !=3D null)
+      if (jbossWebservicesMD !=3D null)
       {
-         if (wsDescriptionMD.getConfigName() !=3D null)
+         if (jbossWebservicesMD.getConfigName() !=3D null)
          {
-            jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
-            jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
+            jseArchiveMD.setConfigName(jbossWebservicesMD.getConfigName());
+            jseArchiveMD.setConfigFile(jbossWebservicesMD.getConfigFile());
 =

             // ensure higher priority against web.xml context parameters
             return;

Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jbo=
ss/webservices/integration/metadata/PublishLocationAdapterImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java	2011-10-31 15=
:27:32 UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java	2011-10-31 15=
:28:04 UTC (rev 15177)
@@ -21,9 +21,8 @@
  */
 package org.jboss.webservices.integration.metadata;
 =

-import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
-import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
 import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
+import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaDat=
a;
 =

 /**
  * Publish location adapter implementation.
@@ -34,17 +33,15 @@
 final class PublishLocationAdapterImpl implements PublishLocationAdapter
 {
    /** Webservice descriptions meta data. */
-   private final WebserviceDescriptionsMetaData wsDescriptionsMD;
+   private final WebserviceDescriptionMetaData[] wsDescriptionsMD;
 =

    /**
     * Constructor.
     *
     * @param wsDescriptionsMD webservice descriptions meta data
     */
-   PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescr=
iptionsMD)
+   PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDesc=
riptionsMD)
    {
-      super();
-
       this.wsDescriptionsMD =3D wsDescriptionsMD;
    }
 =

@@ -56,13 +53,12 @@
     */
    public String getWsdlPublishLocationByName(final String endpointName)
    {
-      if (this.wsDescriptionsMD !=3D null)
+      if (wsDescriptionsMD !=3D null)
       {
-         final WebserviceDescriptionMetaData endpointMD =3D this.wsDescrip=
tionsMD.get(endpointName);
-
-         if (endpointMD !=3D null)
+         for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDesc=
riptionsMD)
          {
-            return endpointMD.getWsdlPublishLocation();
+             if (endpointName.equals(wsDescriptionMD.getWebserviceDescript=
ionName()))
+                 return wsDescriptionMD.getWsdlPublishLocation();
          }
       }
 =


Modified: container/jboss60/branches/jbossws-jboss600/src/main/resources/jb=
ossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-=
jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2011-10-31 15:27:32 =
UTC (rev 15176)
+++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-=
jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml	2011-10-31 15:28:04 =
UTC (rev 15177)
@@ -54,9 +54,12 @@
   </bean>
 =

   <!-- deployers -->
-  <bean name=3D"WSDescriptorDeployer" class=3D"org.jboss.webservices.integ=
ration.deployers.WSDescriptorDeployer">
+  <bean name=3D"WSWebservicesDescriptorDeployer" class=3D"org.jboss.webser=
vices.integration.deployers.WebservicesDescriptorDeployer">
     <incallback method=3D"setParser"/>
   </bean>
+  <bean name=3D"WSJBossWebservicesDescriptorDeployer" class=3D"org.jboss.w=
ebservices.integration.deployers.JBossWebservicesDescriptorDeployer">
+    <incallback method=3D"setParser"/>
+  </bean>
 =

   <bean name=3D"WSEJBAdapterDeployer" class=3D"org.jboss.webservices.integ=
ration.deployers.WSEJBAdapterDeployer"/>
 =



--===============9020089386828803731==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:29:23 2011
Content-Type: multipart/mixed; boundary="===============7121933333972410673=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15178 - in
 shared-testsuite/trunk/testsuite/src/test:
 resources/jaxrpc/samples/jsr109ejb/doclit/META-INF and 6 other directories.
Date: Mon, 31 Oct 2011 11:29:22 -0400
Message-ID: <201110311529.p9VFTMYY003300@svn01.web.mwc.hst.phx2.redhat.com>

--===============7121933333972410673==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:29:21 -0400 (Mon, 31 Oct 2011)
New Revision: 15178

Added:
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9ejb/doclit/META-INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9ejb/rpclit/META-INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9pojo/rpclit/WEB-INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secur=
eejb/META-INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-=
INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-=
INF/jboss-webservices.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-=
INF/jboss-webservices.xml
Removed:
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9ejb/doclit/META-INF/jboss.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9ejb/rpclit/META-INF/jboss.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr10=
9pojo/rpclit/WEB-INF/jboss-web.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-=
INF/jboss.xml
Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrp=
c.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secur=
eejb/META-INF/jboss.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-=
INF/jboss.xml
   shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-=
INF/jboss.xml
Log:
[JBWS-3376] migrate data from jboss.xml to jboss-webservices.xml

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-j=
axws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.x=
ml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -418,7 +418,7 @@
 				<include name=3D"org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class" =
/>
 			</fileset>
 			<metainf dir=3D"${tests.output.dir}/test-resources/jaxws/jbws1813/META-=
INF">
-				<include name=3D"jboss.xml" />
+				<include name=3D"jboss-webservices.xml" />
 			</metainf>
 		</jar>
 		<jar destfile=3D"${tests.output.dir}/test-libs/jaxws-jbws1813.ear">
@@ -483,6 +483,7 @@
 				<include name=3D"wsdl/*" />
 				<include name=3D"ejb-jar.xml" />
 				<include name=3D"jboss.xml" />
+				<include name=3D"jboss-webservices.xml" />
 			</metainf>
 		</jar>
 =

@@ -697,6 +698,7 @@
 			</fileset>
 			<metainf dir=3D"${tests.output.dir}/test-resources/jaxws/jbws2241/META-=
INF">
 				<include name=3D"jboss.xml" />
+				<include name=3D"jboss-webservices.xml" />
 			</metainf>
 		</jar>
 =


Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-sample=
s-jaxrpc.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxr=
pc.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxr=
pc.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -171,7 +171,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/js=
r109ejb/rpclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -200,7 +200,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/js=
r109ejb/doclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -231,7 +231,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/jsr=
109pojo/rpclit/WEB-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
-        <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
     </war>
@@ -401,6 +401,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
     </jar>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/j=
sr109ejb/doclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/doclit/META-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/doclit/META-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15=
178)
@@ -0,0 +1,21 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root>
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <port-component>
+      <port-component-name>TestServicePort</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>TestService</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples=
/jsr109ejb/doclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/doclit/META-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/doclit/META-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -1,20 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root>
-  </webservices>
-  =

-  <enterprise-beans>
-    <session>
-      <ejb-name>TestService</ejb-name>
-      <port-component>
-        <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/j=
sr109ejb/rpclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/rpclit/META-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/rpclit/META-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15=
178)
@@ -0,0 +1,22 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples=
-jsr109ejb-rpc?wsdl</wsdl-publish-location>
+    <port-component>
+      <port-component-name>TestServicePort</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>TestService</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples=
/jsr109ejb/rpclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/rpclit/META-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09ejb/rpclit/META-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -1,24 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-
-  <webservices>
-    <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
-    <webservice-description>
-      <webservice-description-name>TestService</webservice-description-nam=
e>
-      <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-sampl=
es-jsr109ejb-rpc?wsdl</wsdl-publish-location>
-    </webservice-description>
-  </webservices>
-  =

-  <enterprise-beans>
-    <session>
-      <ejb-name>TestService</ejb-name>
-      <port-component>
-        <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples=
/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09pojo/rpclit/WEB-INF/jboss-web.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09pojo/rpclit/WEB-INF/jboss-web.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -1,12 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-  =

-  <webservice-description>
-    <webservice-description-name>TestService</webservice-description-name>
-    <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples=
-jsr109pojo-rpc?wsdl</wsdl-publish-location>
-  </webservice-description>
-  =

-</jboss-web>
\ No newline at end of file

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/j=
sr109pojo/rpclit/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09pojo/rpclit/WEB-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr1=
09pojo/rpclit/WEB-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15=
178)
@@ -0,0 +1,13 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples=
-jsr109pojo-rpc?wsdl</wsdl-publish-location>
+  </webservice-description>
+
+</webservices>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/s=
ecureejb/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secu=
reejb/META-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secu=
reejb/META-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -0,0 +1,40 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-ejb</context-root>
+
+  <webservice-description>
+    <webservice-description-name>OrganizationServiceEJB</webservice-descri=
ption-name>
+    <port-component>
+      <port-component-name>RoleSecured</port-component-name>
+      <port-component-uri>/RoleSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>RoleSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>BasicSecured</port-component-name>
+      <port-component-uri>/BasicSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>BasicSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>ConfidentialSecured</port-component-name>
+      <port-component-uri>/ConfidentialSecured</port-component-uri>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>ConfidentialSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/sample=
s/secureejb/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secu=
reejb/META-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secu=
reejb/META-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -6,39 +6,19 @@
 =

   <security-domain>JBossWS</security-domain>
 =

-  <webservices>
-    <context-root>/jaxrpc-samples-ejb</context-root>
-  </webservices>
-  =

   <enterprise-beans>
     <session>
       <ejb-name>RoleSecuredSLSB</ejb-name>
       <jndi-name>ejb/RoleSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>RoleSecured</port-component-name>
-        <port-component-uri>/RoleSecured</port-component-uri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-      </port-component>
     </session>
     <session>
       <ejb-name>BasicSecuredSLSB</ejb-name>
       <jndi-name>ejb/BasicSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>BasicSecured</port-component-name>
-        <port-component-uri>/BasicSecured</port-component-uri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-      </port-component>
     </session>
     <session>
       <ejb-name>ConfidentialSLSB</ejb-name>
       <jndi-name>ejb/ConfidentialSLSB</jndi-name>
-      <port-component>
-        <port-component-name>ConfidentialSecured</port-component-name>
-        <port-component-uri>/ConfidentialSecured</port-component-uri>
-        <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/M=
ETA-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META=
-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META=
-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/test-context</context-root>
+
+</webservices>

Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813=
/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META=
-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META=
-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -1,10 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_2.dtd">
-
-<jboss>
-
-   <webservices>
-      <context-root>/test-context</context-root>       =

-   </webservices>
-</jboss>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/M=
ETA-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META=
-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META=
-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxws-jbws1841</context-root>
+
+</webservices>

Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws184=
1/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META=
-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META=
-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -1,10 +1,9 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_5_0.dtd">
 =

 <jboss>
-   <webservices>
-      <context-root>/jaxws-jbws1841</context-root>       =

-   </webservices>
+
    <enterprise-beans>
       <session>
          <ejb-name>StatelessBean</ejb-name>
@@ -20,4 +19,5 @@
          </service-ref>
       </session>
    </enterprise-beans>
-</jboss>        =

\ No newline at end of file
+
+</jboss>

Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/M=
ETA-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META=
-INF/jboss-webservices.xml	                        (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META=
-INF/jboss-webservices.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -0,0 +1,24 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/contextRoot</context-root>
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <port-component>
+      <port-component-name>TestPortComponent</port-component-name>
+      <port-component-uri>/urlPattern/test</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <secure-wsdl-access>false</secure-wsdl-access>
+      <service-impl-bean>
+        <ejb-link>EJB3Bean</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws224=
1/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META=
-INF/jboss.xml	2011-10-31 15:28:04 UTC (rev 15177)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META=
-INF/jboss.xml	2011-10-31 15:29:21 UTC (rev 15178)
@@ -3,21 +3,14 @@
 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_2.dtd">
 =

 <jboss>
+
   <security-domain>JBossWS</security-domain>
-  <webservices>
-    <context-root>/contextRoot</context-root>       =

-  </webservices>
+
   <enterprise-beans>
     <session>
       <ejb-name>EJB3Bean</ejb-name>
       <jndi-name>ejb/EJB3Bean</jndi-name>
-      <port-component>
-        <port-component-name>TestPortComponent</port-component-name>
-        <port-component-uri>/urlPattern/test</port-component-uri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-        <secure-wsdl-access>false</secure-wsdl-access>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>


--===============7121933333972410673==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:30:34 2011
Content-Type: multipart/mixed; boundary="===============2264517557696750655=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15179 -
 stack/cxf/trunk/modules/server/src/main/resources.
Date: Mon, 31 Oct 2011 11:30:34 -0400
Message-ID: <201110311530.p9VFUYvr003697@svn01.web.mwc.hst.phx2.redhat.com>

--===============2264517557696750655==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:30:34 -0400 (Mon, 31 Oct 2011)
New Revision: 15179

Modified:
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6=
.xml
Log:
[JBWS-3376] register jboss-webservices.xml parser

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-con=
fig-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-31 15:29:21 UTC (rev 15178)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as=
6.xml	2011-10-31 15:30:34 UTC (rev 15179)
@@ -11,9 +11,12 @@
   </bean>
 =

   <!-- This should actually be in the stack-agnostic config file, it's her=
e to avoid installing a CI -->
-  <bean name=3D"WSDescriptorParser" class=3D"org.jboss.ws.common.deploymen=
t.WebservicesDescriptorParserImpl">
+  <bean name=3D"WSWebservicesDescriptorParser" class=3D"org.jboss.ws.commo=
n.deployment.WebservicesDescriptorParserImpl">
     <property name=3D"descriptorName">webservices.xml</property>
   </bean>
+  <bean name=3D"WSJBossWebservicesDescriptorParser" class=3D"org.jboss.ws.=
common.deployment.JBossWebservicesDescriptorParserImpl">
+    <property name=3D"descriptorName">jboss-webservices.xml</property>
+  </bean>
   =

   <!-- Installed Record Processors-->
   <bean name=3D"WSMemoryBufferRecorder" class=3D"org.jboss.ws.common.monit=
oring.MemoryBufferRecorder">


--===============2264517557696750655==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:32:00 2011
Content-Type: multipart/mixed; boundary="===============6267433701428834896=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15180 - in
 stack/native/trunk/modules/core/src/main/resources: schema and 1 other
 directory.
Date: Mon, 31 Oct 2011 11:31:59 -0400
Message-ID: <201110311531.p9VFVxee003781@svn01.web.mwc.hst.phx2.redhat.com>

--===============6267433701428834896==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:31:59 -0400 (Mon, 31 Oct 2011)
New Revision: 15180

Added:
   stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_serv=
ices_1.0.xsd
Modified:
   stack/native/trunk/modules/core/src/main/resources/jbossws-native-config=
-as6.xml
Log:
[JBWS-3376] register jboss-webservices.xml parser

Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native=
-config-as6.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as6.xml	2011-10-31 15:30:34 UTC (rev 15179)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-confi=
g-as6.xml	2011-10-31 15:31:59 UTC (rev 15180)
@@ -8,9 +8,12 @@
   </bean>
 =

   <!-- This should actually be in the stack-agnostic config file, it's her=
e to avoid installing a CI -->
-  <bean name=3D"WSDescriptorParser" class=3D"org.jboss.ws.common.deploymen=
t.WebservicesDescriptorParserImpl">
+  <bean name=3D"WSWebservicesDescriptorParser" class=3D"org.jboss.ws.commo=
n.deployment.WebservicesDescriptorParserImpl">
     <property name=3D"descriptorName">webservices.xml</property>
   </bean>
+  <bean name=3D"WSJBossWebservicesDescriptorParser" class=3D"org.jboss.ws.=
common.deployment.JBossWebservicesDescriptorParserImpl">
+    <property name=3D"descriptorName">jboss-webservices.xml</property>
+  </bean>
 =

   <!-- Installed Record Processors-->
   <bean name=3D"WSMemoryBufferRecorder" class=3D"org.jboss.ws.common.monit=
oring.MemoryBufferRecorder">

Added: stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_=
services_1.0.xsd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_ser=
vices_1.0.xsd	                        (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_ser=
vices_1.0.xsd	2011-10-31 15:31:59 UTC (rev 15180)
@@ -0,0 +1,47 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<xsd:schema
+  targetNamespace=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:jboss=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsd=3D"http://www.w3.org/2001/XMLSchema"
+  elementFormDefault=3D"qualified"
+  attributeFormDefault=3D"unqualified"
+  version=3D"1.1">
+
+  <xsd:element name=3D"webservices" type=3D"jboss:webservicesType"/>
+
+  <xsd:complexType name=3D"webservicesType">
+    <xsd:sequence>
+      <xsd:element name=3D"context-root" type=3D"xsd:token" minOccurs=3D"0=
"/>
+      <xsd:element name=3D"config-name" type=3D"xsd:token" minOccurs=3D"0"=
/>
+      <xsd:element name=3D"config-file" type=3D"xsd:token" minOccurs=3D"0"=
/>
+      <xsd:element name=3D"webservice-description" type=3D"jboss:webservic=
e-descriptionType" minOccurs=3D"1" maxOccurs=3D"unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name=3D"webservice-descriptionType">
+    <xsd:sequence>
+      <xsd:element name=3D"webservice-description-name" type=3D"xsd:token"=
/>
+      <xsd:element name=3D"wsdl-publish-location" type=3D"xsd:token" minOc=
curs=3D"0"/>
+      <xsd:element name=3D"port-component" type=3D"jboss:port-componentTyp=
e" minOccurs=3D"1" maxOccurs=3D"unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name=3D"port-componentType">
+    <xsd:sequence>
+      <xsd:element name=3D"port-component-name" type=3D"xsd:token"/>
+      <xsd:element name=3D"port-component-uri" type=3D"xsd:token" minOccur=
s=3D"0"/>
+      <xsd:element name=3D"auth-method" type=3D"xsd:token" minOccurs=3D"0"=
/>
+      <xsd:element name=3D"transport-guarantee" type=3D"xsd:token" minOccu=
rs=3D"0"/>
+      <xsd:element name=3D"secure-wsdl-access" type=3D"xsd:boolean" minOcc=
urs=3D"0"/>
+      <xsd:element name=3D"service-impl-bean" type=3D"jboss:service-impl-b=
eanType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name=3D"service-impl-beanType">
+    <xsd:choice>
+      <xsd:element name=3D"ejb-link" type=3D"xsd:token"/>
+      <xsd:element name=3D"servlet-link" type=3D"xsd:token"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+</xsd:schema>


--===============6267433701428834896==--

From jbossws-commits at lists.jboss.org Mon Oct 31 11:33:00 2011
Content-Type: multipart/mixed; boundary="===============7752473219764959750=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15181 - in
 stack/native/trunk/modules/testsuite/native-tests:
 src/test/resources/benchmark/jaxrpc/doclit/META-INF and 22 other directories.
Date: Mon, 31 Oct 2011 11:33:00 -0400
Message-ID: <201110311533.p9VFX01e003794@svn01.web.mwc.hst.phx2.redhat.com>

--===============7752473219764959750==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: richard.opalka(a)jboss.com
Date: 2011-10-31 11:32:58 -0400 (Mon, 31 Oct 2011)
New Revision: 15181

Added:
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ben=
chmark/jaxrpc/doclit/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ben=
chmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/enventry/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbas897/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws1011/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-both/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-ctxroot/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-pcuri/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws331/WS-META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws358/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws626/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws723/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws772/META-INF-ONE/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/secureejb/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsdlpublish/WEB-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/account-signup/WEB-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/rpc/WEB-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/username/META-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/webclient/WEB-INF/jboss-webservices.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
ws/jbws1309/META-INF/jboss-webservices.xml
Removed:
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ben=
chmark/jaxrpc/doclit/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ben=
chmark/jaxrpc/rpclit/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/enventry/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbas897/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws1011/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws331/WS-META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws358/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws626/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws772/META-INF-ONE/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109ejb/doclit/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsdlpublish/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/account-signup/WEB-INF/jboss-web.xml
Modified:
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jax=
rpc.xml
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jax=
ws.xml
   stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-=
jaxrpc.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-both/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-ctxroot/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws165/META-INF-pcuri/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/jbws723/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/samples/secureejb/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/rpc/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/username/META-INF/jboss.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
rpc/wsse/webclient/WEB-INF/jboss-web.xml
   stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jax=
ws/jbws1309/META-INF/jboss.xml
Log:
[JBWS-3376] migrate data from jboss.xml to jboss-webservices.xml

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-j=
ars-jaxrpc.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-ja=
xrpc.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-ja=
xrpc.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -98,7 +98,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/benchmark/jaxrpc/=
rpclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -142,7 +142,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/benchmark/jaxrpc/=
doclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -278,7 +278,7 @@
       </metainf>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/enventry/M=
ETA-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
       </metainf>
     </jar>
@@ -306,7 +306,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbas897/ME=
TA-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
@@ -318,7 +318,7 @@
         <include name=3D"org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"=
/>
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbas897/ME=
TA-INF">
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
@@ -697,6 +697,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
@@ -710,6 +711,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
@@ -723,6 +725,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
@@ -736,6 +739,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
@@ -923,7 +927,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbws331/WS=
-META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
@@ -998,7 +1002,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbws358/ME=
TA-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
@@ -1414,7 +1418,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbws626/ME=
TA-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/TestService.wsdl"/>
@@ -1748,6 +1752,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
     </jar>
@@ -1830,7 +1835,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbws772/ME=
TA-INF-ONE">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"wsdl/**"/>
@@ -2031,7 +2036,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/jbws1011/M=
ETA-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jbosscmp-jdbc.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
@@ -2822,7 +2827,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsdlpublish=
/WEB-INF">
         <include name=3D"webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
-        <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
     </war>
@@ -2839,7 +2844,7 @@
         <include name=3D"org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardIn=
fo.class"/>
       </classes>
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/accoun=
t-signup/WEB-INF">
-        <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jboss-wsse-server.xml"/>
@@ -2878,6 +2883,7 @@
       </classes>
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WE=
B-INF">
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"jboss-wsse-server.xml"/>
@@ -2933,6 +2939,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WE=
B-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
@@ -2974,6 +2981,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WE=
B-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
@@ -3015,6 +3023,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WE=
B-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
@@ -3058,6 +3067,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WE=
B-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
@@ -3105,6 +3115,7 @@
       </webinf>
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/webcli=
ent/WEB-INF">
         <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jboss-wsse-client.xml"/>
       </webinf>
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse">
@@ -3127,6 +3138,7 @@
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/wsse/usern=
ame/META-INF">
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"jboss-wsse-server.xml"/>
         <include name=3D"webservices.xml"/>

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-j=
ars-jaxws.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-ja=
xws.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-ja=
xws.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -185,6 +185,7 @@
 			<metainf dir=3D"${tests.output.dir}/test-resources/jaxws/jbws1309/META-=
INF">
 				<include name=3D"jboss-wsse-server.xml" />
 				<include name=3D"jboss.xml" />
+				<include name=3D"jboss-webservices.xml" />
 			</metainf>
 			<metainf dir=3D"${tests.output.dir}/test-resources/jaxws/jbws1309/">
 				<include name=3D"wsse.truststore" />

Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-s=
amples-jaxrpc.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples=
-jaxrpc.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples=
-jaxrpc.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -200,7 +200,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/js=
r109ejb/rpclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -229,7 +229,7 @@
       </fileset>
       <metainf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/js=
r109ejb/doclit/META-INF">
         <include name=3D"ejb-jar.xml"/>
-        <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
         <include name=3D"wsdl/**"/>
@@ -260,7 +260,7 @@
       <webinf dir=3D"${tests.output.dir}/test-resources/jaxrpc/samples/jsr=
109pojo/rpclit/WEB-INF">
         <include name=3D"jaxrpc-mapping.xml"/>
         <include name=3D"webservices.xml"/>
-        <include name=3D"jboss-web.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </webinf>
     </war>
@@ -427,6 +427,7 @@
         <include name=3D"webservices.xml"/>
         <include name=3D"ejb-jar.xml"/>
         <include name=3D"jboss.xml"/>
+        <include name=3D"jboss-webservices.xml"/>
         <include name=3D"wsdl/**"/>
       </metainf>
     </jar>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml	                      =
  (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UT=
C (rev 15181)
@@ -0,0 +1,19 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>BenchmarkDocLitEJBWS</webservice-descript=
ion-name>
+    <port-component>
+      <port-component-name>BenchmarkDocLitEJBWS</port-component-name>
+      <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>BenchmarkDocLit</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/benchmark/jaxrpc/doclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/doclit/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/doclit/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,15 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  <enterprise-beans>
-    <session>
-      <ejb-name>BenchmarkDocLit</ejb-name>
-      <port-component>
-        <port-component-name>BenchmarkDocLitEJBWS</port-component-name>
-        <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-ur=
i>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml	                      =
  (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UT=
C (rev 15181)
@@ -0,0 +1,19 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>BenchmarkDocLitEJBWS</webservice-descript=
ion-name>
+    <port-component>
+      <port-component-name>BenchmarkRpcLitEJBWS</port-component-name>
+      <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>BenchmarkRpcLit</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/benchmark/jaxrpc/rpclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/rpclit/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/be=
nchmark/jaxrpc/rpclit/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,15 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  <enterprise-beans>
-    <session>
-      <ejb-name>BenchmarkRpcLit</ejb-name>
-      <port-component>
-        <port-component-name>BenchmarkRpcLitEJBWS</port-component-name>
-        <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-ur=
i>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/enventry/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/enventry/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/enventry/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 1=
5181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-enventry</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/enventry/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/enventry/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/enventry/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-enventry</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbas897/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbas897/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbas897/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbas897</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbas897/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbas897/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbas897/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbas897</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws1011/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws1011/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws1011/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 1=
5181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbws1011</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbws1011/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws1011/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws1011/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbws1011</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-both/jboss-webservices.xml	                        (r=
ev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-both/jboss-webservices.xml	2011-10-31 15:32:58 UTC (r=
ev 15181)
@@ -0,0 +1,22 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <!-- contains both <context-root> and <port-component-uri> --> =

+  <context-root>/Explicit/Both</context-root>
+
+  <webservice-description>
+    <webservice-description-name>HelloServiceBoth</webservice-description-=
name>
+    <port-component>
+      <port-component-name>HelloBoth</port-component-name>
+      <port-component-uri>/Explicit/Path</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>HelloBoth</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/jbws165/META-INF-both/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-both/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-both/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -2,22 +2,13 @@
 =

 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
 =

-<!-- contains a <context-root> but no <port-component-uri> --> =

-
 <jboss>
-  =

-  <webservices>
-    <context-root>/Explicit/Both</context-root>
-  </webservices>
-  =

+
   <enterprise-beans>
     <session>
       <ejb-name>HelloBoth</ejb-name>
       <jndi-name>ejb/HelloBoth</jndi-name>
-      <port-component>
-        <port-component-name>HelloBoth</port-component-name>
-        <port-component-uri>/Explicit/Path</port-component-uri>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml	                       =
 (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml	2011-10-31 15:32:58 UTC=
 (rev 15181)
@@ -0,0 +1,12 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <!-- contains a <context-root> but no <port-component-uri> --> =

+
+  <context-root>/Explicit/Context</context-root>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/jbws165/META-INF-ctxroot/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-ctxroot/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-ctxroot/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -2,18 +2,13 @@
 =

 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
 =

-<!-- contains a <context-root> but no <port-component-uri> --> =

-
 <jboss>
-  =

-  <webservices>
-    <context-root>/Explicit/Context</context-root>
-  </webservices>
-  =

+
   <enterprise-beans>
     <session>
       <ejb-name>HelloContextRoot</ejb-name>
       <jndi-name>ejb/HelloContextRoot</jndi-name>
     </session>
   </enterprise-beans>
+
 </jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-pcuri/jboss-webservices.xml	                        (=
rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-pcuri/jboss-webservices.xml	2011-10-31 15:32:58 UTC (=
rev 15181)
@@ -0,0 +1,31 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <!-- contains no <context-root> but a <port-component-uri> -->
+
+  <webservice-description>
+    <webservice-description-name>HelloServicePcURI1</webservice-descriptio=
n-name>
+    <port-component>
+      <port-component-name>HelloPCOne</port-component-name>
+      <port-component-uri>/Explicit/Path/HelloPCOne</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>HelloPCOne</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+  <webservice-description>
+    <webservice-description-name>HelloServicePcURI2</webservice-descriptio=
n-name>
+    <port-component>
+      <port-component-name>HelloPCTwo</port-component-name>
+      <port-component-uri>/Explicit/Path/HelloPCTwo</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>HelloPCTwo</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/jbws165/META-INF-pcuri/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-pcuri/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws165/META-INF-pcuri/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -2,25 +2,17 @@
 =

 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
 =

-<!-- contains no <context-root> but a <port-component-uri> --> =

-
 <jboss>
+
   <enterprise-beans>
     <session>
       <ejb-name>HelloPCOne</ejb-name>
       <jndi-name>ejb/HelloPCOne</jndi-name>
-      <port-component>
-        <port-component-name>HelloPCOne</port-component-name>
-        <port-component-uri>/Explicit/Path/HelloPCOne</port-component-uri>
-      </port-component>
     </session>
     <session>
       <ejb-name>HelloPCTwo</ejb-name>
       <jndi-name>ejb/HelloPCTwo</jndi-name>
-      <port-component>
-        <port-component-name>HelloPCTwo</port-component-name>
-        <port-component-uri>/Explicit/Path/HelloPCTwo</port-component-uri>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws331/WS-META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws331/WS-META-INF/jboss-webservices.xml	                        (rev=
 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws331/WS-META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev=
 15181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbws331</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbws331/WS-META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws331/WS-META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws331/WS-META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbws331</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws358/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws358/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws358/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbws358</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbws358/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws358/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws358/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbws358</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws626/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws626/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws626/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbws626</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbws626/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws626/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws626/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbws626</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws723/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws723/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws723/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,42 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>OrganizationServiceEJB</webservice-descri=
ption-name>
+    <port-component>
+      <port-component-name>RoleSecured</port-component-name>
+      <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <!-- default secure-wsdl-access (false for jaxrpc) -->
+      <service-impl-bean>
+        <ejb-link>JBWS723RoleSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>BasicSecured</port-component-name>
+      <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <secure-wsdl-access>true</secure-wsdl-access>
+      <service-impl-bean>
+        <ejb-link>JBWS723BasicSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>ConfidentialSecured</port-component-name>
+      <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-compon=
ent-uri>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      <secure-wsdl-access>false</secure-wsdl-access>
+      <service-impl-bean>
+        <ejb-link>JBWS723ConfidentialSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/jbws723/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws723/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws723/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -10,34 +10,15 @@
     <session>
       <ejb-name>JBWS723RoleSecuredSLSB</ejb-name>
       <jndi-name>ejb/JBWS723RoleSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>RoleSecured</port-component-name>
-        <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-ur=
i>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-        <!-- default secure-wsdl-access (false for jaxrpc) -->
-      </port-component>
     </session>
     <session>
       <ejb-name>JBWS723BasicSecuredSLSB</ejb-name>
       <jndi-name>ejb/JBWS723BasicSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>BasicSecured</port-component-name>
-        <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-u=
ri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-        <secure-wsdl-access>true</secure-wsdl-access>
-      </port-component>
     </session>
     <session>
       <ejb-name>JBWS723ConfidentialSLSB</ejb-name>
       <jndi-name>ejb/JBWS723ConfidentialSLSB</jndi-name>
-      <port-component>
-        <port-component-name>ConfidentialSecured</port-component-name>
-        <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-comp=
onent-uri>
-        <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        <secure-wsdl-access>false</secure-wsdl-access>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/jbws772/META-INF-ONE/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws772/META-INF-ONE/jboss-webservices.xml	                        (re=
v 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws772/META-INF-ONE/jboss-webservices.xml	2011-10-31 15:32:58 UTC (re=
v 15181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-jbws772</context-root>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/jbws772/META-INF-ONE/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws772/META-INF-ONE/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/jbws772/META-INF-ONE/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,11 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-jbws772</context-root>
-  </webservices>
-  =

-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml	              =
          (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml	2011-10-31 15:=
32:58 UTC (rev 15181)
@@ -0,0 +1,21 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root>
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <port-component>
+      <port-component-name>TestServicePort</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>TestService</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (r=
ev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (r=
ev 15181)
@@ -1,20 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-  =

-  <webservices>
-    <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root>
-  </webservices>
-  =

-  <enterprise-beans>
-    <session>
-      <ejb-name>TestService</ejb-name>
-      <port-component>
-        <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml	              =
          (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml	2011-10-31 15:=
32:58 UTC (rev 15181)
@@ -0,0 +1,22 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <wsdl-publish-location>file:@wsdl.publish.location@/jsr109ejb</wsdl-pu=
blish-location>
+    <port-component>
+      <port-component-name>TestServicePort</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>TestService</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (r=
ev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (r=
ev 15181)
@@ -1,24 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
-
-<jboss>
-
-  <webservices>
-    <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root>
-    <webservice-description>
-      <webservice-description-name>TestService</webservice-description-nam=
e>
-      <wsdl-publish-location>file:@wsdl.publish.location@/jsr109ejb</wsdl-=
publish-location>
-    </webservice-description>
-  </webservices>
-  =

-  <enterprise-beans>
-    <session>
-      <ejb-name>TestService</ejb-name>
-      <port-component>
-        <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
-    </session>
-  </enterprise-beans>
-</jboss>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml	2011-10-31 15:31:59 UT=
C (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml	2011-10-31 15:32:58 UT=
C (rev 15181)
@@ -1,12 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-  =

-  <webservice-description>
-    <webservice-description-name>TestService</webservice-description-name>
-    <wsdl-publish-location>file:@wsdl.publish.location@/jsr109pojo</wsdl-p=
ublish-location>
-  </webservice-description>
-  =

-</jboss-web>
\ No newline at end of file

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml	              =
          (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml	2011-10-31 15:=
32:58 UTC (rev 15181)
@@ -0,0 +1,13 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <wsdl-publish-location>file:@wsdl.publish.location@/jsr109pojo</wsdl-p=
ublish-location>
+  </webservice-description>
+
+</webservices>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/secureejb/META-INF/jboss-webservices.xml	                     =
   (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/secureejb/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 U=
TC (rev 15181)
@@ -0,0 +1,40 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-samples-ejb</context-root>
+
+  <webservice-description>
+    <webservice-description-name>OrganizationServiceEJB</webservice-descri=
ption-name>
+    <port-component>
+      <port-component-name>RoleSecured</port-component-name>
+      <port-component-uri>/RoleSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>RoleSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>BasicSecured</port-component-name>
+      <port-component-uri>/BasicSecured</port-component-uri>
+      <auth-method>BASIC</auth-method>
+      <transport-guarantee>NONE</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>BasicSecuredSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+    <port-component>
+      <port-component-name>ConfidentialSecured</port-component-name>
+      <port-component-uri>/ConfidentialSecured</port-component-uri>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+      <service-impl-bean>
+        <ejb-link>ConfidentialSLSB</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/samples/secureejb/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/secureejb/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 1518=
0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/samples/secureejb/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 1518=
1)
@@ -6,39 +6,19 @@
 =

   <security-domain>JBossWS</security-domain>
 =

-  <webservices>
-    <context-root>/jaxrpc-samples-ejb</context-root>
-  </webservices>
-  =

   <enterprise-beans>
     <session>
       <ejb-name>RoleSecuredSLSB</ejb-name>
       <jndi-name>ejb/RoleSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>RoleSecured</port-component-name>
-        <port-component-uri>/RoleSecured</port-component-uri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-      </port-component>
     </session>
     <session>
       <ejb-name>BasicSecuredSLSB</ejb-name>
       <jndi-name>ejb/BasicSecuredSLSB</jndi-name>
-      <port-component>
-        <port-component-name>BasicSecured</port-component-name>
-        <port-component-uri>/BasicSecured</port-component-uri>
-        <auth-method>BASIC</auth-method>
-        <transport-guarantee>NONE</transport-guarantee>
-      </port-component>
     </session>
     <session>
       <ejb-name>ConfidentialSLSB</ejb-name>
       <jndi-name>ejb/ConfidentialSLSB</jndi-name>
-      <port-component>
-        <port-component-name>ConfidentialSecured</port-component-name>
-        <port-component-uri>/ConfidentialSecured</port-component-uri>
-        <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </port-component>
     </session>
   </enterprise-beans>
+
 </jboss>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsdlpublish/WEB-INF/jboss-web.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsdlpublish/WEB-INF/jboss-web.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -1,9 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-  <webservice-description>
-    <webservice-description-name>TestService</webservice-description-name>
-    <wsdl-publish-location>file:@wsdl.publish.location@/some-wsdl-location=
</wsdl-publish-location>
-  </webservice-description>
-</jboss-web>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/wsdlpublish/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsdlpublish/WEB-INF/jboss-webservices.xml	                        (rev=
 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsdlpublish/WEB-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev=
 15181)
@@ -0,0 +1,13 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <wsdl-publish-location>file:@wsdl.publish.location@/some-wsdl-location=
</wsdl-publish-location>
+  </webservice-description>
+
+</webservices>

Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resourc=
es/jaxrpc/wsse/account-signup/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/account-signup/WEB-INF/jboss-web.xml	2011-10-31 15:31:59 UTC (rev=
 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/account-signup/WEB-INF/jboss-web.xml	2011-10-31 15:32:58 UTC (rev=
 15181)
@@ -1,12 +0,0 @@
-<?xml version=3D"1.0" encoding=3D"UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
-  =

-	<webservice-description>
-		<webservice-description-name>HelloService</webservice-description-name>
-		<config-name>Standard WSSecurity Endpoint</config-name>
-	</webservice-description>
-	=

-</jboss-web>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml	                    =
    (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml	2011-10-31 15:32:58 =
UTC (rev 15181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <config-name>Standard WSSecurity Endpoint</config-name>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/rpc/WEB-INF/jboss-web.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/rpc/WEB-INF/jboss-web.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -3,12 +3,7 @@
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 =

 <jboss-web>
-  =

-	<context-root>jaxrpc-wsse-rpc</context-root>
-	=

-	<webservice-description>
-		<webservice-description-name>HelloService</webservice-description-name>
-		<config-name>Standard WSSecurity Endpoint</config-name>
-	</webservice-description>
-	=

+
+  <context-root>jaxrpc-wsse-rpc</context-root>
+
 </jboss-web>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/wsse/rpc/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/rpc/WEB-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/rpc/WEB-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <config-name>Standard WSSecurity Endpoint</config-name>
+
+</webservices>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/wsse/username/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/username/META-INF/jboss-webservices.xml	                        (=
rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/username/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (=
rev 15181)
@@ -0,0 +1,21 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxrpc-wsse-username</context-root>
+  <config-name>Standard WSSecurity Endpoint</config-name>
+  <webservice-description>
+    <webservice-description-name>TestService</webservice-description-name>
+    <port-component>
+      <port-component-name>TestServicePort</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>TestService</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/wsse/username/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/username/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/username/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -3,23 +3,7 @@
 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_0.dtd">
 =

 <jboss>
+
   <security-domain>JBossWS</security-domain>
-  =

-  <webservices>
-    <context-root>/jaxrpc-wsse-username</context-root>
-    <webservice-description>
-      <webservice-description-name>TestService</webservice-description-nam=
e>
-      <config-name>Standard WSSecurity Endpoint</config-name>
-    </webservice-description>
-  </webservices>
-  =

-  <enterprise-beans>
-    <session>
-      <ejb-name>TestService</ejb-name>
-      <port-component>
-        <port-component-name>TestServicePort</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
-    </session>
-  </enterprise-beans>
+
 </jboss>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/webclient/WEB-INF/jboss-web.xml	2011-10-31 15:31:59 UTC (rev 1518=
0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/webclient/WEB-INF/jboss-web.xml	2011-10-31 15:32:58 UTC (rev 1518=
1)
@@ -3,17 +3,13 @@
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http:/=
/www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 =

 <jboss-web>
+
   <context-root>jaxrpc-wsse-rpc</context-root>
-  =

-  <webservice-description>
-    <webservice-description-name>HelloService</webservice-description-name>
-    <config-name>Standard WSSecurity Endpoint</config-name>
-  </webservice-description>
-  =

+
   <service-ref>
     <service-ref-name>service/HelloService</service-ref-name>
     <config-name>Standard WSSecurity Client</config-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc/Hello?=
wsdl</wsdl-override>
   </service-ref>
-  =

+
 </jboss-web>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxrpc/wsse/webclient/WEB-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/webclient/WEB-INF/jboss-webservices.xml	                        (=
rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xrpc/wsse/webclient/WEB-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (=
rev 15181)
@@ -0,0 +1,10 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <config-name>Standard WSSecurity Endpoint</config-name>
+
+</webservices>

Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources=
/jaxws/jbws1309/META-INF/jboss-webservices.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xws/jbws1309/META-INF/jboss-webservices.xml	                        (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xws/jbws1309/META-INF/jboss-webservices.xml	2011-10-31 15:32:58 UTC (rev 15=
181)
@@ -0,0 +1,22 @@
+<?xml version=3D"1.1" encoding=3D"UTF-8"?>
+<webservices
+  xmlns=3D"http://www.jboss.com/xml/ns/javaee"
+  xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+  version=3D"1.0"
+  xsi:schemaLocation=3D"http://www.jboss.com/xml/ns/javaee http://www.jbos=
s.org/j2ee/schema/jboss_webservices_1_0.xsd">
+
+  <context-root>/jaxws-jbws1309</context-root>
+  <config-name>Standard WSSecurity Endpoint</config-name>
+
+  <webservice-description>
+    <webservice-description-name>jbws1309-ws-description</webservice-descr=
iption-name>
+    <port-component>
+      <port-component-name>TestPortComponent</port-component-name>
+      <port-component-uri>/*</port-component-uri>
+      <service-impl-bean>
+        <ejb-link>HelloBean</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
+
+</webservices>

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resour=
ces/jaxws/jbws1309/META-INF/jboss.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xws/jbws1309/META-INF/jboss.xml	2011-10-31 15:31:59 UTC (rev 15180)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/ja=
xws/jbws1309/META-INF/jboss.xml	2011-10-31 15:32:58 UTC (rev 15181)
@@ -3,21 +3,12 @@
 <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org=
/j2ee/dtd/jboss_4_2.dtd">
 =

 <jboss>
-  <webservices>
-    <context-root>/jaxws-jbws1309</context-root>
-    <webservice-description>
-      <webservice-description-name>jbws1309-ws-description</webservice-des=
cription-name>
-      <config-name>Standard WSSecurity Endpoint</config-name>
-    </webservice-description>
-  </webservices>
+
   <enterprise-beans>
     <session>
       <ejb-name>HelloBean</ejb-name>
       <jndi-name>ejb/HelloBean</jndi-name>
-      <port-component>
-        <port-component-name>TestPortComponent</port-component-name>
-        <port-component-uri>/*</port-component-uri>
-      </port-component>
     </session>
   </enterprise-beans>
-</jboss>
\ No newline at end of file
+
+</jboss>


--===============7752473219764959750==--

From jbossws-commits at lists.jboss.org Mon Oct 31 12:08:45 2011
Content-Type: multipart/mixed; boundary="===============3926160055922450869=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r15182 -
 thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws.
Date: Mon, 31 Oct 2011 12:08:44 -0400
Message-ID: <201110311608.p9VG8i5F013208@svn01.web.mwc.hst.phx2.redhat.com>

--===============3926160055922450869==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: klape
Date: 2011-10-31 12:08:44 -0400 (Mon, 31 Oct 2011)
New Revision: 15182

Modified:
   thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/a=
pache/cxf/jaxws/EndpointImpl.java
Log:
[JBPAPP-7452] Removing extraneous System.err.println

Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/jav=
a/org/apache/cxf/jaxws/EndpointImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/=
apache/cxf/jaxws/EndpointImpl.java	2011-10-31 15:32:58 UTC (rev 15181)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/=
apache/cxf/jaxws/EndpointImpl.java	2011-10-31 16:08:44 UTC (rev 15182)
@@ -323,7 +323,6 @@
                     for (Entry<String, Object> entry : properties.entrySet=
()) {
                         endpointInfo.setProperty(entry.getKey(), entry.get=
Value());
                     }
-                    System.err.println("\n\n");
                 }
 =

                 this.address =3D endpointInfo.getAddress();


--===============3926160055922450869==--