[jbossws-commits] JBossWS SVN: r14548 - in stack/native/trunk/modules/core/src/main: java/org/jboss/ws/metadata/builder and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-06-14 09:49:48 -0400 (Tue, 14 Jun 2011)
New Revision: 14548

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
   stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
Log:
- [JBWS-3312] Avoid using deprecated Endpoint methods
- remove commented reference on eventing deployment aspect


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java	2011-06-14 13:48:15 UTC (rev 14547)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyHttpServerAdapter.java	2011-06-14 13:49:48 UTC (rev 14548)
@@ -47,6 +47,7 @@
 import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
 import org.jboss.wsf.spi.deployment.DeploymentAspect;
 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.PublishContractDeploymentAspect;
 import org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect;
@@ -182,7 +183,7 @@
       final ArchiveDeployment dep = (ArchiveDeployment) NettyHttpServerAdapter.DEPLOYMENT_FACTORY.newDeployment(contextRoot, loader);
       final org.jboss.wsf.spi.deployment.Endpoint endpoint = NettyHttpServerAdapter.DEPLOYMENT_FACTORY.newHttpEndpoint(endpointClass.getName());
       endpoint.setShortName(this.getEndpointRegistryPath(epImpl));
-      endpoint.setURLPattern(epImpl.getPathWithoutContext());
+      ((HttpEndpoint)endpoint).setURLPattern(epImpl.getPathWithoutContext());
       dep.getService().addEndpoint(endpoint);
       dep.setRootFile(new ResourceLoaderAdapter(loader));
       dep.setRuntimeClassLoader(loader);

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java	2011-06-14 13:48:15 UTC (rev 14547)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java	2011-06-14 13:49:48 UTC (rev 14548)
@@ -72,6 +72,7 @@
 import org.jboss.wsf.spi.deployment.ArchiveDeployment;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.HttpEndpoint;
 import org.jboss.wsf.spi.management.ServerConfig;
 import org.jboss.wsf.spi.management.ServerConfigFactory;
 import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
@@ -146,7 +147,7 @@
       {
          Endpoint endpoint = dep.getService().getEndpointByName(linkName);
          if (endpoint != null)
-            urlPattern = endpoint.getURLPattern();
+            urlPattern = ((HttpEndpoint)endpoint).getURLPattern();
       }
 
       // Endpoint API hack

Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml	2011-06-14 13:48:15 UTC (rev 14547)
+++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as7.xml	2011-06-14 13:49:48 UTC (rev 14548)
@@ -77,11 +77,6 @@
       </list>
     </property>
   </deploymentAspect>
-
-  <deploymentAspect class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
-    <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
-  </deploymentAspect>
-
   -->
 
 </deploymentAspects>