[jbossws-commits] JBossWS SVN: r3414 - in trunk/integration: jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-03 17:54:02 -0400 (Sun, 03 Jun 2007)
New Revision: 3414

Added:
   trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java
Modified:
   trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
   trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
   trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
Log:
Fix jboss40 serviceref

Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java	2007-06-03 21:33:12 UTC (rev 3413)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java	2007-06-03 21:54:02 UTC (rev 3414)
@@ -35,6 +35,7 @@
 import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
 import org.jboss.ws.integration.URLLoaderAdapter;
 import org.jboss.wsf.container.jboss42.DeploymentInfoAdapter;
+import org.jboss.wsf.container.jboss42.DeploymentInfoAdapterFactory;
 import org.jboss.wsf.spi.deployment.BasicDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.JAXRPCClientDeployment;
@@ -70,7 +71,8 @@
             // Build the container independent deployment info
             Deployment dep = new BasicDeployment();
             UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT);
-            new DeploymentInfoAdapter().buildDeploymentInfo(dep, udi, di);
+            DeploymentInfoAdapter adapter = DeploymentInfoAdapterFactory.getDeploymentInfoAdapter();
+            adapter.buildDeploymentInfo(dep, udi, di);
             
             UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef);
             usr.setVfsRoot(new URLLoaderAdapter(udi.url));

Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java	2007-06-03 21:33:12 UTC (rev 3413)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java	2007-06-03 21:54:02 UTC (rev 3414)
@@ -34,6 +34,7 @@
 import org.jboss.ws.integration.ResourceLoaderAdapter;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 
 /**
  * Build container independent deployment info. 
@@ -120,10 +121,9 @@
       {
          udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData);
       }
-      else if (udi.deployedObject != null)
+      else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3)
       {
          udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
-         ;
       }
    }
 }

Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java	                        (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java	2007-06-03 21:54:02 UTC (rev 3414)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss42;
+
+// $Id$
+
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.ws.integration.KernelLocator;
+
+/**
+ * @author Thomas.Diesler at jboss.org
+ * @since 10-Mar-2007
+ */
+public class DeploymentInfoAdapterFactory
+{
+   // Hide ctor
+   private DeploymentInfoAdapterFactory()
+   {
+   }
+
+   public static DeploymentInfoAdapter getDeploymentInfoAdapter()
+   {
+      KernelRegistry registry = KernelLocator.getKernel().getRegistry();
+      KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter");
+      return (DeploymentInfoAdapter)entry.getTarget();
+   }
+}


Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java	2007-06-03 21:33:12 UTC (rev 3413)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java	2007-06-03 21:54:02 UTC (rev 3414)
@@ -103,18 +103,18 @@
 
    private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception
    {
-      if (unit.getAttachment(Ejb3Deployment.class) != null)
+      if (unit.getAttachment(WebMetaData.class) != null)
       {
-         udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
+         udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
+         udi.webappURL = udi.vfRoot.toURL();
       }
       else if (unit.getAttachment(ApplicationMetaData.class) != null)
       {
          udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit);
       }
-      else if (unit.getAttachment(WebMetaData.class) != null)
+      else if (unit.getAttachment(Ejb3Deployment.class) != null)
       {
-         udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit);
-         udi.webappURL = udi.vfRoot.toURL();
+         udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit);
       }
    }
 }