You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2010/09/28 23:55:44 UTC

svn commit: r1002369 [7/7] - in /openejb/trunk/openejb3: ./ assembly/ assembly/itest-runner/ assembly/openejb-jetty/ assembly/openejb-jetty/openejb-jetty-common/ assembly/openejb-jetty/openejb-jetty-webapp/ assembly/openejb-standalone/ assembly/openejb...

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/Axis2WsContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/Axis2WsContainer.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/Axis2WsContainer.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/Axis2WsContainer.java Tue Sep 28 21:55:40 2010
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.server.axis2;
 
 import org.apache.axiom.om.util.UUIDGenerator;
@@ -48,7 +47,6 @@ import org.apache.openejb.server.axis2.c
 import org.apache.openejb.server.httpd.HttpRequest;
 import org.apache.openejb.server.httpd.HttpResponse;
 import org.apache.openejb.server.httpd.HttpListener;
-import org.apache.openejb.server.webservices.WsConstants;
 import org.apache.openejb.server.webservices.saaj.SaajUniverse;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.LogCategory;
@@ -64,11 +62,10 @@ import java.net.URL;
 import java.util.List;
 
 public abstract class Axis2WsContainer implements HttpListener {
-    private static final Logger logger = Logger.getInstance(LogCategory.AXIS2, Axis2WsContainer.class);
 
+    private static final Logger logger = Logger.getInstance(LogCategory.AXIS2, Axis2WsContainer.class);
     public static final String REQUEST = Axis2WsContainer.class.getName() + "@Request";
     public static final String RESPONSE = Axis2WsContainer.class.getName() + "@Response";
-
     protected String endpointClassName;
     protected PortData port;
     protected ConfigurationContext configurationContext;
@@ -104,11 +101,11 @@ public abstract class Axis2WsContainer i
         wsdlQueryHandler = new WsdlQueryHandler(service);
 
         /*
-        * This replaces HandlerLifecycleManagerFactory for all web services.
-        * This should be ok as we do our own handler instance managment and injection.
-        * Also, this does not affect service-ref clients, as we install our own
-        * HandlerResolver.
-        */
+         * This replaces HandlerLifecycleManagerFactory for all web services.
+         * This should be ok as we do our own handler instance managment and injection.
+         * Also, this does not affect service-ref clients, as we install our own
+         * HandlerResolver.
+         */
         FactoryRegistry.setFactory(HandlerLifecycleManagerFactory.class, new HandlerLifecycleManagerFactoryImpl());
     }
 
@@ -120,6 +117,7 @@ public abstract class Axis2WsContainer i
         doService(request, response);
     }
 
+    @Override
     public void onMessage(HttpRequest request, HttpResponse response) throws Exception {
         SaajUniverse universe = new SaajUniverse();
         universe.set(SaajUniverse.AXIS2);
@@ -141,10 +139,8 @@ public abstract class Axis2WsContainer i
         msgContext.setProperty(MessageContext.REMOTE_ADDR, request.getRemoteAddr());
 
         try {
-            TransportOutDescription transportOut = this.configurationContext.getAxisConfiguration()
-                    .getTransportOut(Constants.TRANSPORT_HTTP);
-            TransportInDescription transportIn = this.configurationContext.getAxisConfiguration()
-                    .getTransportIn(Constants.TRANSPORT_HTTP);
+            TransportOutDescription transportOut = this.configurationContext.getAxisConfiguration().getTransportOut(Constants.TRANSPORT_HTTP);
+            TransportInDescription transportIn = this.configurationContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_HTTP);
 
             msgContext.setConfigurationContext(this.configurationContext);
 
@@ -246,12 +242,14 @@ public abstract class Axis2WsContainer i
     }
 
     public static class Axis2TransportInfo implements OutTransportInfo {
+
         private HttpResponse response;
 
         public Axis2TransportInfo(HttpResponse response) {
             this.response = response;
         }
 
+        @Override
         public void setContentType(String contentType) {
             response.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, contentType);
         }
@@ -325,8 +323,8 @@ public abstract class Axis2WsContainer i
             soapAction = "\"\"";
         }
 
-        ConfigurationContext configurationContext = msgContext.getConfigurationContext();
-        configurationContext.fillServiceContextAndServiceGroupContext(msgContext);
+        ConfigurationContext cc = msgContext.getConfigurationContext();
+        cc.fillServiceContextAndServiceGroupContext(msgContext);
 
         setMsgContextProperties(request, response, service, msgContext);
 
@@ -334,8 +332,8 @@ public abstract class Axis2WsContainer i
     }
 
     /*
-    * Gets the right handlers for the port/service/bindings and performs injection.
-    */
+     * Gets the right handlers for the port/service/bindings and performs injection.
+     */
     protected void configureHandlers() throws Exception {
         EndpointDescription desc = AxisServiceGenerator.getEndpointDescription(this.service);
         if (desc != null) {

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java Tue Sep 28 21:55:40 2010
@@ -232,7 +232,8 @@ public class AxisServiceGenerator {
             this.def = def;
         }
 
-        public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException {
+        public WsdlComposite generateWsdl(String implClass, EndpointDescription endpointDesc)
+            throws WebServiceException {
             // Need WSDL generation code
             WsdlComposite composite = new WsdlComposite();
             composite.setWsdlFileName(implClass);

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java Tue Sep 28 21:55:40 2010
@@ -24,10 +24,16 @@ import org.apache.axis2.jaxws.injection.
 import org.apache.axis2.jaxws.lifecycle.LifecycleException;
 
 import javax.xml.ws.handler.Handler;
+import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.lifecycle.BaseLifecycleManager;
+import org.apache.axis2.jaxws.runtime.description.injection.ResourceInjectionServiceRuntimeDescription;
+import org.apache.axis2.jaxws.runtime.description.injection.ResourceInjectionServiceRuntimeDescriptionFactory;
 
-public class HandlerLifecycleManagerImpl implements HandlerLifecycleManager {
+public class HandlerLifecycleManagerImpl extends BaseLifecycleManager implements HandlerLifecycleManager {
+
+    @Override
     public Handler createHandlerInstance(MessageContext context, Class handlerClass) throws LifecycleException, ResourceInjectionException {
-        Handler instance = null;
+        instance = null;
 
         try {
             instance = (Handler) handlerClass.newInstance();
@@ -35,12 +41,22 @@ public class HandlerLifecycleManagerImpl
             throw new LifecycleException("Failed to create handler", e);
         }
 
-        return instance;
+        return (Handler) instance;
     }
 
-    public void invokePostConstruct() throws LifecycleException {
-    }
+    @Override
+    public void destroyHandlerInstance(MessageContext mc, Handler handler) throws LifecycleException, ResourceInjectionException {
+        this.instance = handler;
+
+        ServiceDescription serviceDesc = mc.getEndpointDescription().getServiceDescription();
+        ResourceInjectionServiceRuntimeDescription injectionDesc = null;
+        if (serviceDesc != null) {
+            injectionDesc = ResourceInjectionServiceRuntimeDescriptionFactory.get(serviceDesc, handler.getClass());
+        }
+
+        if (injectionDesc != null && injectionDesc.getPreDestroyMethod() != null) {
+            invokePreDestroy(injectionDesc.getPreDestroyMethod());
+        }
 
-    public void invokePreDestroy() throws LifecycleException {
     }
 }

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java Tue Sep 28 21:55:40 2010
@@ -40,7 +40,7 @@ public class Axis2ClientConfigurationFac
     }
 
     public ConfigurationContext getClientConfigurationContext() {
-        ClassLoader cl = ClassLoaderUtils.getContextClassLoader();
+        ClassLoader cl = ClassLoaderUtils.getContextClassLoader(null);
         if (cl == null) {
             if (this.reuseConfigurationContext) {
                 cl = ClientConfigurationFactory.class.getClassLoader();

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java Tue Sep 28 21:55:40 2010
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.openejb.server.axis2.ejb;
 
 import org.apache.axis2.AxisFault;
@@ -24,7 +23,6 @@ import org.apache.axis2.context.Operatio
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.jaxws.core.InvocationContext;
 import org.apache.axis2.jaxws.core.InvocationContextFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.util.MessageUtils;
@@ -34,8 +32,10 @@ import org.apache.axis2.wsdl.WSDLConstan
 
 import javax.interceptor.AroundInvoke;
 import javax.xml.ws.Binding;
+import org.apache.axis2.jaxws.server.EndpointInvocationContext;
 
 public class EjbInterceptor {
+
     private MessageContext requestMsgCtx;
 
     public EjbInterceptor(MessageContext requestCtx) {
@@ -50,7 +50,7 @@ public class EjbInterceptor {
         EjbEndpointController controller = new EjbEndpointController(invContext);
 
         Binding binding = (Binding) this.requestMsgCtx.getAxisMessageContext().getProperty(JAXWSMessageReceiver.PARAM_BINDING);
-        InvocationContext ic = InvocationContextFactory.createInvocationContext(binding);
+        EndpointInvocationContext ic = InvocationContextFactory.createEndpointInvocationContext(binding);
         ic.setRequestMessageContext(this.requestMsgCtx);
 
         controller.invoke(ic);
@@ -91,13 +91,12 @@ public class EjbInterceptor {
     }
 
     private boolean isMepInOnly(String mep) {
-        boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) || 
-                mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) ||
-                mep.equals(WSDL2Constants.MEP_URI_IN_ONLY) ||
-                mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY) ||
-                mep.equals(WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY) ||
-                mep.equals(WSDL20_2006Constants.MEP_URI_IN_ONLY);
+        boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY)
+            || mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY)
+            || mep.equals(WSDL2Constants.MEP_URI_IN_ONLY)
+            || mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY)
+            || mep.equals(WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY)
+            || mep.equals(WSDL20_2006Constants.MEP_URI_IN_ONLY);
         return inOnly;
     }
-
 }

Modified: openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java (original)
+++ openejb/trunk/openejb3/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java Tue Sep 28 21:55:40 2010
@@ -21,8 +21,9 @@ package org.apache.openejb.server.axis2.
 import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleException;
 import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleManager;
 import org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.EndpointLifecycleManagerFactory;
+import org.apache.axis2.jaxws.server.endpoint.lifecycle.impl.EndpointLifecycleManagerImpl;
 
-public class PojoEndpointLifecycleManagerFactory extends EndpointLifecycleManagerFactory {
+public class PojoEndpointLifecycleManagerFactory implements EndpointLifecycleManagerFactory {
 
     private EndpointLifecycleManager lifecycleManager;
 
@@ -30,10 +31,16 @@ public class PojoEndpointLifecycleManage
         this.lifecycleManager = new PojoEndpointLifecycleManager();
     }
 
+    @Override
     public EndpointLifecycleManager createEndpointLifecycleManager(Object endpointInstance) throws EndpointLifecycleException {
-        throw new UnsupportedOperationException();
+        if (endpointInstance == null) {
+            throw new EndpointLifecycleException("PojoEndpointLifecycleManagerFactory.createEndpointLifecycleManager");
+        }
+        return new EndpointLifecycleManagerImpl(endpointInstance);
+
     }
 
+    @Override
     public EndpointLifecycleManager createEndpointLifecycleManager() {
         return this.lifecycleManager;
     }

Modified: openejb/trunk/openejb3/server/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-client/pom.xml Tue Sep 28 21:55:40 2010
@@ -21,11 +21,11 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-<parent>
+  <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-client</artifactId>
   <packaging>jar</packaging>

Modified: openejb/trunk/openejb3/server/openejb-corba/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-corba/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-corba/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-corba/pom.xml Tue Sep 28 21:55:40 2010
@@ -24,7 +24,7 @@
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-corba</artifactId>
   <packaging>jar</packaging>

Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Tue Sep 28 21:55:40 2010
@@ -19,12 +19,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-  </parent> 
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-cxf</artifactId>
   <packaging>jar</packaging>
@@ -50,6 +51,11 @@
   </build>
   <dependencies>
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
       <version>6.0-SNAPSHOT</version>
@@ -69,24 +75,62 @@
       <artifactId>openejb-webservices</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>wsdl4j</groupId>
       <artifactId>wsdl4j</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>wss4j</groupId>
+      <artifactId>wss4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.neethi</groupId>
+      <artifactId>neethi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-finder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.components</groupId>
+      <artifactId>geronimo-transaction</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-reflect</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-bundle</artifactId>
-      <version>2.2.4</version>
+      <version>2.2.10</version>
       <exclusions>
         <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>aopalliance</groupId>
           <artifactId>aopalliance</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>bouncycastle</groupId>
-          <artifactId>bcprov-jdk14</artifactId>
+          <groupId>asm</groupId>
+          <artifactId>asm</artifactId>
         </exclusion>
         <exclusion>
           <groupId>com.sun.xml.bind</groupId>
@@ -97,12 +141,12 @@
           <artifactId>jaxb-xjc</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.annotation</groupId>
-          <artifactId>jsr250-api</artifactId>
+          <groupId>com.sun.xml.fastinfoset</groupId>
+          <artifactId>FastInfoset</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.jws</groupId>
-          <artifactId>jsr181-api</artifactId>
+          <groupId>javax.jw.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>javax.xml.bind</groupId>
@@ -113,24 +157,28 @@
           <artifactId>saaj-api</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>javax.xml.ws</groupId>
-          <artifactId>jaxws-api</artifactId>
-        </exclusion>
-        <exclusion>
           <groupId>jaxen</groupId>
           <artifactId>jaxen</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>jdom</groupId>
-          <artifactId>jdom</artifactId>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-extensions-json</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-extensions-main</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>net.java.dev.stax-utils</groupId>
-          <artifactId>stax-utils</artifactId>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-i18n</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.cxf</groupId>
-          <artifactId>cxf-bundle</artifactId>
+          <groupId>org.apache.abdera</groupId>
+          <artifactId>abdera-parser</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
@@ -146,6 +194,10 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-jms_1.1_spec</artifactId>
         </exclusion>
         <exclusion>
@@ -161,96 +213,108 @@
           <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.apache.neethi</groupId>
+          <artifactId>neethi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.santuario</groupId>
+          <artifactId>xmlsec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.velocity</groupId>
+          <artifactId>velocity</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ws.commons.axiom</groupId>
+          <artifactId>axiom-impl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ws.security</groupId>
+          <artifactId>wss4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.xmlbeans</groupId>
+          <artifactId>xmlbeans</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jettison</groupId>
+          <artifactId>jettison</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.codehaus.jra</groupId>
           <artifactId>jra</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
+          <groupId>org.codehaus.woodstox</groupId>
+          <artifactId>wstx-asl</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jetty</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-util</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
+          <artifactId>spring-beans</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-web</artifactId>
+          <artifactId>spring-context</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-dao</artifactId>
+          <artifactId>spring-context-support</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-jms</artifactId>
+          <artifactId>spring-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-support</artifactId>
+          <artifactId>spring-jms</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-context-support</artifactId>
+          <artifactId>spring-tx</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-tx</artifactId>
+          <artifactId>spring-web</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>org.apache.xmlbeans</groupId>
-          <artifactId>xmlbeans</artifactId>
+          <groupId>oro</groupId>
+          <artifactId>oro</artifactId>
         </exclusion>
         <exclusion>
           <groupId>rhino</groupId>
           <artifactId>js</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity-dep</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity-deps</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>wss4j</groupId>
-          <artifactId>wss4j</artifactId>
+          <groupId>xalan</groupId>
+          <artifactId>serializer</artifactId>
         </exclusion>
         <exclusion>
           <groupId>xalan</groupId>
           <artifactId>xalan</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-security</groupId>
-          <artifactId>xmlsec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xmlbeans</groupId>
-          <artifactId>xbean</artifactId>
+          <groupId>xml-resolver</groupId>
+          <artifactId>xml-resolver</artifactId>
         </exclusion>
       </exclusions>
     </dependency>

Modified: openejb/trunk/openejb3/server/openejb-ejbd/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/pom.xml Tue Sep 28 21:55:40 2010
@@ -24,7 +24,7 @@
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-ejbd</artifactId>
   <packaging>jar</packaging>

Modified: openejb/trunk/openejb3/server/openejb-multicast/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-multicast/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-multicast/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-multicast/pom.xml Tue Sep 28 21:55:40 2010
@@ -24,7 +24,7 @@
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-multicast</artifactId>
   <packaging>jar</packaging>

Modified: openejb/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-server/pom.xml Tue Sep 28 21:55:40 2010
@@ -47,11 +47,11 @@
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.felix</groupId>
-	<artifactId>maven-bundle-plugin</artifactId>
-	<configuration>
-	  <instructions>
-	    <Bundle-Activator>org.apache.openejb.server.osgi.Activator</Bundle-Activator>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-Activator>org.apache.openejb.server.osgi.Activator</Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>
@@ -83,6 +83,10 @@
       <artifactId>xbean-asm-shaded</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-reflect</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
     </dependency>

Modified: openejb/trunk/openejb3/server/openejb-telnet/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-telnet/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-telnet/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-telnet/pom.xml Tue Sep 28 21:55:40 2010
@@ -24,7 +24,7 @@
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.2-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-telnet</artifactId>
   <packaging>jar</packaging>

Modified: openejb/trunk/openejb3/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/pom.xml?rev=1002369&r1=1002368&r2=1002369&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/pom.xml Tue Sep 28 21:55:40 2010
@@ -74,16 +74,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.messaging.saaj</groupId>
-        <artifactId>saaj-impl</artifactId>
-        <version>1.3</version>
-        <scope>test</scope>
-        <exclusions>
-            <exclusion>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-            </exclusion>
-        </exclusions>
+      <groupId>com.sun.xml.messaging.saaj</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.activation</groupId>
+          <artifactId>activation</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>