[jbossws-commits] JBossWS SVN: r4042 - in trunk/integration: jboss42/src/main/resources and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jul 31 12:15:38 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-31 12:15:37 -0400 (Tue, 31 Jul 2007)
New Revision: 4042
Modified:
trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration/native/src/main/resources/jbossws-native-config.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml
Log:
Sort deployment aspects in installer
Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -112,6 +112,7 @@
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
<property name="provides">ContainerEndpointHandler</property>
</bean>
@@ -176,6 +177,7 @@
<!-- Deployment aspect installers -->
<bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
@@ -193,6 +195,7 @@
</bean>
<bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
@@ -211,6 +214,7 @@
</bean>
<bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointAPIDeploymentAspect"/>
Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -114,6 +114,7 @@
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
<property name="provides">ContainerEndpointHandler</property>
</bean>
@@ -177,6 +178,7 @@
<!-- Deployment aspect installers -->
<bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
@@ -194,6 +196,7 @@
</bean>
<bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
@@ -212,6 +215,7 @@
</bean>
<bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointAPIDeploymentAspect"/>
Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -159,6 +159,7 @@
</bean>
<bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
<property name="provides">ContainerEndpointHandler</property>
</bean>
@@ -214,6 +215,7 @@
<!-- Deployment aspect installers -->
<bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
@@ -231,6 +233,7 @@
</bean>
<bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSContainerMetaDataDeploymentAspect"/>
Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -91,6 +91,7 @@
<!-- Deployment aspect installers -->
<bean name="WSNativeDeploymentAspectInstallerJSE" 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="WSNativeContextPropertiesDeploymentAspect"/>
@@ -101,9 +102,11 @@
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
</bean>
<bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
@@ -115,9 +118,11 @@
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
</bean>
<bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
@@ -129,5 +134,6 @@
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
</bean>
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java 2007-07-31 16:15:37 UTC (rev 4042)
@@ -23,23 +23,30 @@
//$Id$
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
import java.util.Set;
/**
* A deployment aspect installer.
*
- * Use this installer with microkernel version 1.x
- *
* @author Thomas.Diesler at jboss.com
* @since 20-Apr-2007
*/
public class DeploymentAspectInstaller
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(DeploymentAspectInstaller.class);
+
private DeploymentAspectManager manager;
private Set<DeploymentAspect> aspects;
+ private boolean sortAspectsOnCreate;
public void setManager(DeploymentAspectManager manager)
{
@@ -51,11 +58,106 @@
this.aspects = aspects;
}
+ public void setSortAspectsOnCreate(boolean sortAspectsOnCreate)
+ {
+ this.sortAspectsOnCreate = sortAspectsOnCreate;
+ }
+
public void create()
{
- for (DeploymentAspect aspect : aspects)
+ List<DeploymentAspect> unsortedAspects = new ArrayList<DeploymentAspect>();
+ unsortedAspects.addAll(manager.getDeploymentAspects());
+ unsortedAspects.addAll(aspects);
+
+ List<DeploymentAspect> sortedAspects = unsortedAspects;
+ if (sortAspectsOnCreate)
{
- manager.addDeploymentAspect(aspect);
+ sortedAspects = new ArrayList<DeploymentAspect>();
+ List<DeploymentAspect> allAspects = new ArrayList<DeploymentAspect>(unsortedAspects);
+
+ // Add aspects with no requirements first
+ Iterator<DeploymentAspect> itAll = allAspects.iterator();
+ while (itAll.hasNext())
+ {
+ DeploymentAspect aspect = itAll.next();
+ if (aspect.getRequires() == null)
+ {
+ sortedAspects.add(aspect);
+ itAll.remove();
+ }
+ }
+
+ // Add aspects that have requirements that already added aspects provide
+ itAll = allAspects.iterator();
+ while (itAll.hasNext())
+ {
+ DeploymentAspect aspect = itAll.next();
+ int index = getAspectIndex(sortedAspects, aspect);
+ if (index != -1)
+ {
+ sortedAspects.add(index, aspect);
+ itAll.remove();
+
+ itAll = allAspects.iterator();
+ }
+ }
+
+ // Add LAST_DEPLOYMENT_ASPECT
+ itAll = allAspects.iterator();
+ while (itAll.hasNext())
+ {
+ DeploymentAspect aspect = itAll.next();
+ if (DeploymentAspect.LAST_DEPLOYMENT_ASPECT.equals(aspect.getRequires()))
+ {
+ sortedAspects.add(aspect);
+ itAll.remove();
+ }
+ }
+
+ if (allAspects.size() != 0)
+ throwSortException(sortedAspects, allAspects);
+
+ // Log the sorted aspects
+ for (DeploymentAspect aspect : sortedAspects)
+ log.debug(manager.getName() + ": " + aspect);
}
+ manager.setDeploymentAspects(sortedAspects);
}
+
+ private void throwSortException(List<DeploymentAspect> sortedAspects, List<DeploymentAspect> allAspects)
+ {
+ Set<String> providedConditions = new HashSet<String>();
+ for (int i = 0; i < sortedAspects.size(); i++)
+ {
+ DeploymentAspect sortedAspect = sortedAspects.get(i);
+ providedConditions.addAll(sortedAspect.getProvidesAsSet());
+ }
+
+ String exmsg = "Cannot add deployment aspect(s)";
+ StringBuilder str = new StringBuilder(exmsg + "\nProvided Conditions are: " + providedConditions);
+ for (DeploymentAspect da : allAspects)
+ {
+ str.append("\n " + da.getClass().getName() + ", requires: " + da.getRequires());
+ }
+
+ log.error(str);
+ throw new IllegalStateException(exmsg);
+ }
+
+ private int getAspectIndex(List<DeploymentAspect> sortedAspects, DeploymentAspect aspect)
+ {
+ int index = -1;
+ Set<String> providedConditions = new HashSet<String>();
+ for (int i = 0; i < sortedAspects.size(); i++)
+ {
+ DeploymentAspect sortedAspect = sortedAspects.get(i);
+ providedConditions.addAll(sortedAspect.getProvidesAsSet());
+ if (providedConditions.containsAll(aspect.getRequiresAsSet()))
+ {
+ index = i + 1;
+ break;
+ }
+ }
+ return index;
+ }
}
\ No newline at end of file
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 16:15:37 UTC (rev 4042)
@@ -24,17 +24,17 @@
// $Id$
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentState;
/**
* A general service deployment manger.
@@ -48,8 +48,8 @@
private static final Logger log = Logger.getLogger(DeploymentAspectManagerImpl.class);
private String name;
- private Set<DeploymentAspect> unsortedAspects = new HashSet<DeploymentAspect>();
- private List<DeploymentAspect> sortedAspects;
+ private List<DeploymentAspect> sortedAspects = new ArrayList<DeploymentAspect>();
+ private long deploymentCount;
public String getName()
{
@@ -61,108 +61,20 @@
this.name = name;
}
- public synchronized List<DeploymentAspect> getDeploymentAspects()
+ public List<DeploymentAspect> getDeploymentAspects()
{
- // This cannot be done in 'create' because we add aspects from different MC configurations
- if (sortedAspects == null)
- {
- sortedAspects = new ArrayList<DeploymentAspect>();
- List<DeploymentAspect> allAspects = new ArrayList<DeploymentAspect>(unsortedAspects);
-
- // Add aspects with no requirements first
- Iterator<DeploymentAspect> itAll = allAspects.iterator();
- while (itAll.hasNext())
- {
- DeploymentAspect aspect = itAll.next();
- if (aspect.getRequires() == null)
- {
- sortedAspects.add(aspect);
- itAll.remove();
- }
- }
-
- // Add aspects that have requirements that already added aspects provide
- itAll = allAspects.iterator();
- while (itAll.hasNext())
- {
- DeploymentAspect aspect = itAll.next();
- int index = getAspectIndex(aspect);
- if (index != -1)
- {
- sortedAspects.add(index, aspect);
- itAll.remove();
-
- itAll = allAspects.iterator();
- }
- }
-
- // Add LAST_DEPLOYMENT_ASPECT
- itAll = allAspects.iterator();
- while (itAll.hasNext())
- {
- DeploymentAspect aspect = itAll.next();
- if (LAST_DEPLOYMENT_ASPECT.equals(aspect.getRequires()))
- {
- sortedAspects.add(aspect);
- itAll.remove();
- }
- }
-
- if (allAspects.size() != 0)
- throwSortException(allAspects);
-
- for (DeploymentAspect aspect : sortedAspects)
- log.debug(name + ": " + aspect);
- }
-
- return sortedAspects;
+ return Collections.unmodifiableList(sortedAspects);
}
- private void throwSortException(List<DeploymentAspect> allAspects)
+ public void setDeploymentAspects(List<DeploymentAspect> aspects)
{
- Set<String> providedConditions = new HashSet<String>();
- for (int i = 0; i < sortedAspects.size(); i++)
- {
- DeploymentAspect sortedAspect = sortedAspects.get(i);
- providedConditions.addAll(sortedAspect.getProvidesAsSet());
- }
-
- String exmsg = "Cannot add deployment aspect(s)";
- StringBuilder str = new StringBuilder(exmsg + "\nProvided Conditions are: " + providedConditions);
- for (DeploymentAspect da : allAspects)
- {
- str.append("\n " + da.getClass().getName() + ", requires: " + da.getRequires());
- }
+ if (deploymentCount > 0)
+ throw new IllegalStateException("Cannot add deployment aspects");
- log.error(str);
- throw new IllegalStateException(exmsg);
+ sortedAspects.clear();
+ sortedAspects.addAll(aspects);
}
- private int getAspectIndex(DeploymentAspect aspect)
- {
- int index = -1;
- Set<String> providedConditions = new HashSet<String>();
- for (int i = 0; i < sortedAspects.size(); i++)
- {
- DeploymentAspect sortedAspect = sortedAspects.get(i);
- providedConditions.addAll(sortedAspect.getProvidesAsSet());
- if (providedConditions.containsAll(aspect.getRequiresAsSet()))
- {
- index = i + 1;
- break;
- }
- }
- return index;
- }
-
- public void addDeploymentAspect(DeploymentAspect aspect)
- {
- if (sortedAspects != null)
- throw new IllegalStateException("Cannot add deployment aspects to an already sorted list: " + sortedAspects);
-
- unsortedAspects.add(aspect);
- }
-
/**
* Iterate over the registered deployers calls create on each.
* Iterate over the registered deployers again and calls start on each.
@@ -179,7 +91,7 @@
// Check that all required aspects are met
Set<String> requiredSet = aspect.getRequiresAsSet();
- requiredSet.remove(LAST_DEPLOYMENT_ASPECT);
+ requiredSet.remove(DeploymentAspect.LAST_DEPLOYMENT_ASPECT);
if (providedConditions.containsAll(requiredSet) == false)
throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect);
@@ -212,6 +124,8 @@
}
dep.setState(DeploymentState.STARTED);
+
+ deploymentCount++;
}
public void undeploy(Deployment dep)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-07-31 16:15:37 UTC (rev 4042)
@@ -47,6 +47,8 @@
// provide logging
protected final Logger log = Logger.getLogger(getClass());
+ public static final String LAST_DEPLOYMENT_ASPECT = "LAST_DEPLOYMENT_ASPECT";
+
private String provides;
private String requires;
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2007-07-31 16:15:37 UTC (rev 4042)
@@ -33,16 +33,14 @@
*/
public interface DeploymentAspectManager
{
- static final String LAST_DEPLOYMENT_ASPECT = "LAST_DEPLOYMENT_ASPECT";
-
/** Get the name for this aspect manager */
String getName();
/** Get the ordered list of registered deployment aspects */
List<DeploymentAspect> getDeploymentAspects();
- /** Add deployment aspect */
- void addDeploymentAspect(DeploymentAspect aspect);
+ /** Set the ordered list of registered deployment aspects */
+ void setDeploymentAspects(List<DeploymentAspect> aspects);
/** Deploy a web service */
void deploy(Deployment dep);
Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml
===================================================================
--- trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -90,6 +90,7 @@
<!-- Deployment aspect installers -->
<bean name="WSMetroDeploymentAspectInstallerJSE" 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="WSMetroContextPropertiesDeploymentAspect"/>
@@ -97,9 +98,11 @@
<inject bean="WSMetroDescriptorDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
</bean>
<bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroContextPropertiesDeploymentAspect"/>
@@ -107,4 +110,5 @@
<inject bean="WSMetroDescriptorDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
</bean>
Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml
===================================================================
--- trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-31 16:15:26 UTC (rev 4041)
+++ trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-31 16:15:37 UTC (rev 4042)
@@ -56,6 +56,7 @@
<!-- Deployment aspect installers -->
<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"/>
@@ -63,9 +64,11 @@
<inject bean="WSCXFDescriptorDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
</bean>
<bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSCXFContextPropertiesDeploymentAspect"/>
@@ -73,5 +76,6 @@
<inject bean="WSCXFDescriptorDeploymentAspect"/>
</set>
</property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
</bean>
More information about the jbossws-commits
mailing list