Author: thomas.diesler(a)jboss.com Date: 2008-04-18 08:02:27 -0400 (Fri, 18 Apr 2008) New Revision: 6499 Added: stack/cxf/branches/tdiesler/trunk/profiles-example.xml Modified: stack/cxf/branches/tdiesler/trunk/ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml Log: deploy-jbos422 ok Property changes on: stack/cxf/branches/tdiesler/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties clipboard.* target version.properties.md5 .settings + ant.properties clipboard.* target version.properties.md5 .settings profiles.xml Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -30,6 +30,7 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> + <include name="jbossws-jboss42.jar"/> <include name="juddi-service.sar"/> </fileset> <fileset dir="${cxf.management.dir}/target"> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -185,6 +185,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-jboss42.jar"/> </fileset> </copy> </sequential> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -1,5 +1,5 @@ -<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"> +<?xml version="1.0" encoding="UTF-8"?> +<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"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF</name> @@ -24,6 +24,7 @@ <!-- Properties --> <properties> + <jboss.integration.target>jboss422</jboss.integration.target> <cxf-version>2.0.5-incubator</cxf-version> </properties> @@ -91,6 +92,7 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>2.2.5.GA</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -104,8 +106,20 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${version}</version> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss42</artifactId> - <version>4.2.1.SP1</version> + <version>4.2.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>4.2.2-SNAPSHOT</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -142,57 +156,6 @@ </plugins> </build> - <profiles> - <profile> - <id>jboss422</id> - <properties> - <jboss.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss.home> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-deployer-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - <configuration> - <jbossHome>target/test-jboss-home</jbossHome> - <layoutDirectory>target/test-layout</layoutDirectory> - <layoutResult>target/test-layout/deploy-layout.txt</layoutResult> - <keepLayout>true</keepLayout> - <!-- relative to jbossHome --> - <undeploy> - <include>../test-classes/deploy-jboss-pom.xml</include> - <include>../test-classes/bogus</include> - </undeploy> - <deployments> - <deployment> - <targetDir>bin</targetDir> - <sourceDir>src/main/java</sourceDir> - <includes> - <include>**/*.java</include> - </includes> - </deployment> - </deployments> - <!-- - does not work from test case - http://svn.apache.org/viewvc/maven/plugins/tags/maven-plugins-10/maven-de... - - <dependencies> - <deployment> - <targetDir>libs</targetDir> - <includes> - <include>commons-validator</include> - </includes> - </deployment> - </dependencies> - --> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <!-- Repositories --> <repositories> <repository> @@ -208,4 +171,4 @@ <layout>legacy</layout> </repository> </repositories> -</project> +</project> \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -0,0 +1,22 @@ +<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"> + + <!-- This profile can also be defined in ~/.m2/settings.xml --> + <profiles> + <profile> + <id>user-profile-cxf</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss.integration.target>jboss422</jboss.integration.target> + <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> + <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> + </properties> + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/profiles-example.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -62,11 +62,21 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss42</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> <classifier>resources</classifier> <type>zip</type> </dependency> Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 12:02:27 UTC (rev 6499) @@ -34,11 +34,12 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; /** - * A deployer that generates cxf.xml + * A deployer that locates or generates cxf.xml * * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 @@ -60,92 +61,153 @@ { this.invokerJSE = invokerJSE; } + + @Override + public void create(Deployment dep, WSFRuntime runtime) + { + URL cxfURL = getCXFConfigFromClassLoader(dep); + if (cxfURL == null) + { + cxfURL = getCXFConfigFromDeployment(dep); + if (cxfURL == null) + { + cxfURL = generateCXFConfigFromDeployment(dep); + } + putCXFConfigToDeployment(dep, cxfURL); + } + } @Override - public void create(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { - // Look for cxf.xml descriptor + DDBeans dd = dep.getAttachment(DDBeans.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } + + /** + * Looks for <b>cxf.xml</b> in classloader + * @param dep deployment which initial classloader will be used + * @return <b>cxf.xml URL</b> or <b>null</b> if not found + */ + private static URL getCXFConfigFromClassLoader(Deployment dep) + { ClassLoader initCL = dep.getInitialClassLoader(); URL cxfURL = initCL.getResource("cxf.xml"); if (cxfURL != null) { log.info("CXF configuration found: " + cxfURL); } + return cxfURL; + } + + /** + * Looks for <b>jbossws-cxf.xml</b> in: + * <ul> + * <li><b>META-INF</b> resource directory for EJB3 deployment</li> + * <li><b>WEB-INF</b> resource directory for POJO deployment</li> + * </ul> + * @param dep deployment where to look for resources + * @return <b>jbossws-cxf.xml URL</b> or <b>null</b> if not found + */ + private static URL getCXFConfigFromDeployment(Deployment dep) + { + DeploymentType depType = dep.getType(); + + String metadir; + if (depType == DeploymentType.JAXWS_EJB3) + { + // expected resource location for EJB3 deployments + metadir = "META-INF"; + } + else if (depType == DeploymentType.JAXWS_JSE) + { + // expected resource location for POJO deployments + metadir = "WEB-INF"; + } else { - // Look for jbossws-cxf.xml descriptor - DeploymentType depType = dep.getType(); - - String metadir; + // only POJO and EJB3 deployments are supported + throw new IllegalStateException("Unsupported deployment type: " + depType); + } + + URL cxfURL = null; + try + { + // get resource URL + ArchiveDeployment archDep = (ArchiveDeployment)dep; + cxfURL = archDep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); + log.info("JBossWS-CXF configuration found: " + cxfURL); + } + catch (IOException ignore) + { + // resource not found + } + + return cxfURL; + } + + /** + * Generated CXF descriptor from deployment + * @param dep deployment + * @return CXF descriptor URL + */ + private URL generateCXFConfigFromDeployment(Deployment dep) + { + // Generate the jbossws-cxf.xml descriptor + DeploymentType depType = dep.getType(); + + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String id = ep.getShortName(); + String address = ep.getAddress(); + String implementor = ep.getTargetBeanName(); + + DDEndpoint ddep = new DDEndpoint(id, address, implementor); + if (depType == DeploymentType.JAXWS_EJB3) - metadir = "META-INF"; - else if (depType == DeploymentType.JAXWS_JSE) - metadir = "WEB-INF"; - else - throw new IllegalStateException("Unsupported deployment type: " + depType); - - try { - ArchiveDeployment archdep = (ArchiveDeployment)dep; - cxfURL = archdep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); - log.info("JBossWS-CXF configuration found: " + cxfURL); + ddep.setInvoker(invokerEJB3); } - catch (IOException ex) + + if (depType == DeploymentType.JAXWS_JSE) { - // ignore, jbossws-cxf.xml not found + ddep.setInvoker(invokerJSE); } - - // Generate the jbossws-cxf.xml descriptor - if (cxfURL == null) - { - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String id = ep.getShortName(); - String address = ep.getAddress(); - String implementor = ep.getTargetBeanName(); - DDEndpoint ddep = new DDEndpoint(id, address, implementor); + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } - if (depType == DeploymentType.JAXWS_EJB3) - { - ddep.setInvoker(invokerEJB3); - } + URL cxfURL = dd.createFileURL(); + log.info("JBossWS-CXF configuration generated: " + cxfURL); - if (depType == DeploymentType.JAXWS_JSE) - { - ddep.setInvoker(invokerJSE); - } + dep.addAttachment(DDBeans.class, dd); - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } - - cxfURL = dd.createFileURL(); - log.info("JBossWS-CXF configuration generated: " + cxfURL); - - dep.addAttachment(DDBeans.class, dd); - } - - String propKey = "org.jboss.ws.webapp.ContextParameterMap"; - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); - if (contextParams == null) - { - contextParams = new HashMap<String, String>(); - dep.setProperty(propKey, contextParams); - } - - contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); - } + return cxfURL; } - @Override - public void destroy(Deployment dep) + /** + * Puts CXF config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map + * @param dep deployment where to put + * @param cxfURL to be put + */ + private static void putCXFConfigToDeployment(Deployment dep, URL cxfURL) { - DDBeans dd = dep.getAttachment(DDBeans.class); - if (dd != null) + // get property map + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) { - dd.destroyFileURL(); + // if there's no associated map with the property create it now + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); } + // put cxf config URL to the property map + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); } -} \ No newline at end of file + +} Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 12:02:27 UTC (rev 6499) @@ -53,88 +53,110 @@ { private static Logger log = Logger.getLogger(ServletControllerExt.class); - private ServletTransportFactory transport; + private ServletTransportFactory cxfTransport; private CXFServlet cxfServlet; - public ServletControllerExt(ServletTransportFactory transport, CXFServlet servlet) + public ServletControllerExt(ServletTransportFactory cxfTransport, CXFServlet cxfServlet) { - super(transport, servlet); - this.transport = transport; - this.cxfServlet = servlet; + super(cxfTransport, cxfServlet); + this.cxfTransport = cxfTransport; + this.cxfServlet = cxfServlet; } - - public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + + /** + * Finds destination based on request URI + * @param requestURI to be recognized + * @return destination associated with the request URI + * @throws ServletException when destination wasn't found + */ + private ServletDestination findDestination(HttpServletRequest req) throws ServletException { - try + // Find destination based on request URI + String requestURI = req.getRequestURI(); + Collection<ServletDestination> destinations = cxfTransport.getDestinations(); + for (ServletDestination destination : destinations) { - // Find destination based on request URI - String requestURI = req.getRequestURI(); - ServletDestination dest = null; - Collection<ServletDestination> destinations = transport.getDestinations(); - for (ServletDestination aux : destinations) + EndpointInfo endpointInfo = destination.getEndpointInfo(); + String address = endpointInfo.getAddress(); + + // Fix invalid leading slash + if (address.startsWith("/http://")) { - EndpointInfo ei = aux.getEndpointInfo(); - String address = ei.getAddress(); - - // Fix invalid leading slash - if (address.startsWith("/http://")) - { - address = address.substring(1); - ei.setAddress(address); - } - - String path = address; - try - { - path = new URL(address).getPath(); - } - catch (MalformedURLException ex) - { - // ignore - } - - if (requestURI.startsWith(path)) - { - dest = aux; - break; - } + address = address.substring(1); + endpointInfo.setAddress(address); } - if (dest == null) - throw new ServletException("Cannot obtain destination for: " + requestURI); + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (requestURI.startsWith(path)) + { + return destination; + } + } - EndpointInfo ei = dest.getEndpointInfo(); - Bus bus = cxfServlet.getBus(); - if (null != req.getQueryString() && req.getQueryString().length() > 0 && bus.getExtension(QueryHandlerRegistry.class) != null) + throw new ServletException("Cannot obtain destination for: " + requestURI); + } + + /** + * When request includes query it tries to lookup the query handler and tries to handle the request message + * @param req request + * @param res response + * @param dest destination + * @return true if there was a query handler that successfully handled the request, false otherwise + * @throws ServletException if some problem occurs + */ + private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest) + throws ServletException + { + Bus bus = cxfServlet.getBus(); + boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); + boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; + + if (hasQuery && queryHandlerRegistryExists) + { + String ctxUri = req.getRequestURI(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + EndpointInfo endpointInfo = dest.getEndpointInfo(); + + for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) { - String ctxUri = requestURI; //req.getPathInfo(); - String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); - - for (QueryHandler qh : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) { - if (qh.isRecognizedQuery(baseUri, ctxUri, ei)) + res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); + try { - - res.setContentType(qh.getResponseContentType(baseUri, ctxUri)); OutputStream out = res.getOutputStream(); - try - { - qh.writeResponse(baseUri, ctxUri, ei, out); - out.flush(); - return; - } - catch (Exception e) - { - throw new ServletException(e); - } + queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); + out.flush(); + return true; } + catch (Exception e) + { + throw new ServletException(e); + } } } + } + + return false; + } + public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + { + ServletDestination dest = findDestination(req); + boolean requestHandled = handleQuery(req, res, dest); + + if (false == requestHandled) + { invokeDestination(req, res, dest); } - catch (IOException e) - { - throw new ServletException(e); - } } } Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -24,11 +24,6 @@ --> </bean> - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - <!-- Logging redirector --> <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> <property name="namespaces"> @@ -46,6 +41,8 @@ <property name="recording">false</property> </bean> + <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/> + <!-- The stack specific deployment aspects --> @@ -85,29 +82,19 @@ <!-- Deployment aspect installers --> <!-- Phase 2 --> - <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSCXFContextPropertiesDeploymentAspect"/> <inject bean="WSCXFDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - - <!-- Phase 2 --> - <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <!-- phase 2 --> <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> + <depends>WSDeploymentAspectInstallerJSE</depends> </bean> <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">