Author: alessio.soldano(a)jboss.com
Date: 2011-12-14 10:21:25 -0500 (Wed, 14 Dec 2011)
New Revision: 15373
Modified:
stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml
Log:
Further minor cleanups
Modified:
stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java
===================================================================
---
stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-14
15:20:43 UTC (rev 15372)
+++
stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-14
15:21:25 UTC (rev 15373)
@@ -32,6 +32,7 @@
import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.stack.cxf.client.Constants;
import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory;
/**
@@ -96,7 +97,7 @@
URL url = null;
try
{
- url = vfsRoot.findChild("WEB-INF/jbossws-cxf.xml").toURL();
+ url = vfsRoot.findChild("WEB-INF/" +
Constants.JBOSSWS_CXF_SPRING_DD).toURL();
}
catch (Exception e)
{
@@ -106,7 +107,7 @@
{
try
{
- url = vfsRoot.findChild("META-INF/jbossws-cxf.xml").toURL();
+ url = vfsRoot.findChild("META-INF/" +
Constants.JBOSSWS_CXF_SPRING_DD).toURL();
}
catch (Exception e)
{
Modified:
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
---
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-14
15:20:43 UTC (rev 15372)
+++
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-14
15:21:25 UTC (rev 15373)
@@ -30,7 +30,6 @@
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
-import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.policy.PolicyEngine;
import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector;
Modified:
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java
===================================================================
---
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-14
15:20:43 UTC (rev 15372)
+++
stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-14
15:21:25 UTC (rev 15373)
@@ -4,7 +4,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
@@ -50,9 +49,9 @@
if (mbeanServer == null)
{
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator();
i.hasNext();)
+ for (Iterator<MBeanServer> i =
MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
{
- mbeanServer = (MBeanServer)i.next();
+ mbeanServer = i.next();
if (mbeanServer.getClass().getName().startsWith("org.jboss"))
{
break;
Modified:
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
===================================================================
---
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-14
15:20:43 UTC (rev 15372)
+++
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-14
15:21:25 UTC (rev 15373)
@@ -44,7 +44,6 @@
</deploymentAspect>
<deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <!--property name="requires"
class="java.lang.String">JmsEndpointAddress</property--> <!-- TODO:
why this requires, investigate? -->
<property name="provides"
class="java.lang.String">ResourceResolver</property>
<property name="forJaxRpc"
class="boolean">false</property>
</deploymentAspect>
@@ -66,7 +65,6 @@
<property name="forJaxRpc"
class="boolean">false</property>
</deploymentAspect>
- <!--deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect"-->
<!-- TODO: investigate why? -->
<deploymentAspect
class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
<property name="provides"
class="java.lang.String">BusHolder</property>
<property name="requires"
class="java.lang.String">ResourceResolver,StackDescriptor</property>
Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 15:20:43 UTC (rev
15372)
+++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 15:21:25 UTC (rev
15373)
@@ -24,7 +24,6 @@
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
- <hibernate.version>3.2.4.sp1</hibernate.version>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
<org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
Show replies by date