July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4043 - in trunk/integration: jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-31 13:11:42 -0400 (Tue, 31 Jul 2007) New Revision: 4043 Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java Log: Fix KernelLocator 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-07-31 16:15:37 UTC (rev 4042) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 17:11:42 UTC (rev 4043) @@ -34,11 +34,11 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.ServiceRefHandler; import org.jboss.ws.integration.ServiceRefHandlerFactory; -import org.jboss.wsf.common.ResourceLoaderAdapter; -import org.jboss.wsf.common.URLLoaderAdapter; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** 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:37 UTC (rev 4042) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 17:11:42 UTC (rev 4043) @@ -140,6 +140,9 @@ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> <!-- The container deployment aspects @@ -158,6 +161,10 @@ <property name="provides">EndpointAddress</property> </bean> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContainerEndpointHandler</property> @@ -250,5 +257,22 @@ </set> </property> </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"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> </deployment> Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 16:15:37 UTC (rev 4042) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043) @@ -24,6 +24,7 @@ //$Id$ import org.jboss.kernel.Kernel; +import org.jboss.util.NotImplementedException; /** * @deprecated @@ -31,15 +32,15 @@ */ public class KernelLocator { - private static Kernel kernel; - + @Deprecated public static Kernel getKernel() { - return KernelLocator.kernel; + return org.jboss.wsf.common.KernelLocator.getKernel(); } + @Deprecated public void setKernel(Kernel kernel) { - KernelLocator.kernel = kernel; + throw new NotImplementedException("Deprecated, use: " + org.jboss.wsf.common.KernelLocator.class.getName()); } } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 16:15:37 UTC (rev 4042) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 17:11:42 UTC (rev 4043) @@ -26,7 +26,6 @@ import javax.naming.Context; import javax.naming.NamingException; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 16:15:37 UTC (rev 4042) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 17:11:42 UTC (rev 4043) @@ -32,9 +32,7 @@ import javax.naming.NamingException; import org.jboss.logging.Logger; -import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -60,7 +58,7 @@ /* binds jaxrpc deployments */ private ServiceRefBinder jaxrpcBinder; - /*binds jaxws deployments */ + /* binds jaxws deployments */ private ServiceRefBinder jaxwsBinder; public void setJaxrpcBinder(ServiceRefBinder binder) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 16:15:37 UTC (rev 4042) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 17:11:42 UTC (rev 4043) @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ -public class KernelLocator +public class KernelLocator { private static Kernel kernel;

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4042 - in trunk/integration: jboss42/src/main/resources and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)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 @@  <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 @@  <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 @@  <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 @@  <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(a)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 @@  <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 @@  <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>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4041 - trunk/integration/xfire/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 12:15:26 -0400 (Tue, 31 Jul 2007) New Revision: 4041 Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt Log: Exclude tools test as long as there is no implementation Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt =================================================================== --- trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-31 16:02:36 UTC (rev 4040) +++ trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-31 16:15:26 UTC (rev 4041) @@ -54,3 +54,6 @@ # [JBWS-1760] Investigate CXF samples xop org/jboss/test/ws/jaxws/samples/xop/** +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/tools + Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-31 16:02:36 UTC (rev 4040) +++ trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-31 16:15:26 UTC (rev 4041) @@ -54,3 +54,6 @@ # [JBWS-1760] Investigate CXF samples xop org/jboss/test/ws/jaxws/samples/xop/** +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/tools/** +

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4040 - in trunk/integration/sunri: src/main/resources/jbossws-sunri-client.jar/META-INF/services and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 12:02:36 -0400 (Tue, 31 Jul 2007) New Revision: 4040 Added: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl Removed: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ConsumerFactoryImpl trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl Modified: trunk/integration/sunri/ant-import/build-testsuite.xml Log: Fix WSConsumerTestCase Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-07-31 15:55:56 UTC (rev 4039) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-07-31 16:02:36 UTC (rev 4040) @@ -45,8 +45,23 @@ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/wsdl4j.jar"/> </path> + + <path id="wsconsume.classpath"> + <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> + + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + + <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + </path> <path id="tests.extra.classpath"> + <path refid="wsconsume.classpath"/> <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> </path> Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl (from rev 4036, trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ConsumerFactoryImpl) =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ConsumerFactoryImpl 2007-07-31 16:02:36 UTC (rev 4040) @@ -0,0 +1 @@ +org.jboss.wsf.stack.sunri.tools.SunRIConsumerFactoryImpl \ No newline at end of file Copied: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (from rev 4036, trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl) =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.spi.tools.ProviderFactoryImpl 2007-07-31 16:02:36 UTC (rev 4040) @@ -0,0 +1 @@ +org.jboss.wsf.stack.sunri.tools.SunRIProviderFactoryImpl \ No newline at end of file Deleted: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ConsumerFactoryImpl =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ConsumerFactoryImpl 2007-07-31 15:55:56 UTC (rev 4039) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ConsumerFactoryImpl 2007-07-31 16:02:36 UTC (rev 4040) @@ -1 +0,0 @@ -org.jboss.wsf.stack.sunri.tools.SunRIConsumerFactoryImpl \ No newline at end of file Deleted: trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-07-31 15:55:56 UTC (rev 4039) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-client.jar/META-INF/services/org.jboss.wsf.tools.ProviderFactoryImpl 2007-07-31 16:02:36 UTC (rev 4040) @@ -1 +0,0 @@ -org.jboss.wsf.stack.sunri.tools.SunRIProviderFactoryImpl \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4039 - trunk/jbossws-core/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 11:55:56 -0400 (Tue, 31 Jul 2007) New Revision: 4039 Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: More fine grained tools classpath for WSConsumeTestCase Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 15:54:37 UTC (rev 4038) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 15:55:56 UTC (rev 4039) @@ -40,15 +40,16 @@ </path> <path id="wsconsume.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxb-xjc.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxb-impl.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> - <pathelement location="${core.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${core.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> + + <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> </path>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4038 - trunk/integration/native/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 11:54:37 -0400 (Tue, 31 Jul 2007) New Revision: 4038 Modified: trunk/integration/native/ant-import/build-testsuite.xml Log: Fix tools classpath for WSConsumeTestCase Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-07-31 15:08:50 UTC (rev 4037) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-07-31 15:54:37 UTC (rev 4038) @@ -33,9 +33,25 @@ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> + + <path id="wsconsume.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + + <pathelement location="${spi.dir}/thirdparty/jaxb-xjc.jar"/> + <pathelement location="${spi.dir}/thirdparty/jaxb-impl.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${spi.dir}/thirdparty/streambuffer.jar"/> + + <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + + <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + </path> <path id="tests.extra.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <path refid="wsconsume.classpath"/> <pathelement location="${jboss.client}/policy.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> </path>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4037 - in trunk: integration/jboss40/src/main/resources and 28 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-31 11:08:50 -0400 (Tue, 31 Jul 2007) New Revision: 4037 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 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/ws/integration/CommonServiceRefBinder.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: More on Endpoint API Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -35,7 +35,7 @@ import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -25,7 +25,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Thomas.Diesler(a)jboss.org 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-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,23 +23,24 @@ // $Id$ +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Iterator; + +import javax.naming.Context; + import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.ServiceRefHandler; import org.jboss.ws.integration.ServiceRefHandlerFactory; -import org.jboss.ws.integration.URLLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import javax.naming.Context; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; - /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the * deployment descriptor. @@ -66,14 +67,14 @@ ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); String serviceRefName = serviceRef.getServiceRefName(); - UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); // Why this? + UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); // Why this? UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(vfRoot, serviceRef); URLLoaderAdapter urlLoaderAdapter = new URLLoaderAdapter(getDeploymentURL(di)); usr.setVfsRoot(urlLoaderAdapter); ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.getServiceRefHandler(); - serviceRefHandler.bindServiceRef(envCtx, serviceRefName, urlLoaderAdapter , di.ucl, usr); - + serviceRefHandler.bindServiceRef(envCtx, serviceRefName, urlLoaderAdapter, di.ucl, usr); + log.debug("Webservice binding: java:comp/env/" + serviceRefName); } } @@ -82,7 +83,7 @@ throw new DeploymentException("Cannot bind webservice to client environment", e); } } - + private URL getDeploymentURL(DeploymentInfo di) { URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -1,6 +1,6 @@  - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -85,12 +85,15 @@ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean>  <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> </bean> @@ -99,12 +102,15 @@ <property name="provides">ContextRoot</property> </bean> -  <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="provides">ContainerEndpointHandler</property> </bean> @@ -203,3 +209,19 @@ </set> </property> </bean> + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,8 +28,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,15 +23,14 @@ //$Id: JBossHttpServer.java 1786 2007-01-04 14:30:04Z thomas.diesler(a)jboss.com $ -import javax.enterprise.deploy.spi.factories.DeploymentFactory; import javax.xml.ws.Endpoint; import javax.xml.ws.WebServiceException; -import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.framework.DefaultExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Service; @@ -39,7 +38,6 @@ import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; -import org.w3c.dom.Element; /** * A HTTP Server that uses DeploymentAspects @@ -73,23 +71,22 @@ // Get the deployment model factory SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - + // Create/Setup the deployment Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader()); - + // Create/Setup the service Service service = dep.getService(); service.setContextRoot(context.getContextRoot()); - + // Create/Setup the endpoint org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName()); - ep.setURLPattern("/*"); service.addEndpoint(ep); - + // Deploy using deployment aspects DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); - depManagerFactory.getDeploymentAspectManager(DeploymentType.JAXWS_JSE); - + DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI"); + depManager.deploy(dep); } catch (RuntimeException rte) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,6 +23,10 @@ // $Id: WebAppDeployerDeployer.java 3183 2007-05-22 13:06:13Z thomas.diesler(a)jboss.com $ +import java.net.URL; + +import javax.management.MBeanServer; + import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.MainDeployerMBean; import org.jboss.logging.Logger; @@ -33,9 +37,6 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import javax.management.MBeanServer; -import java.net.URL; - /** * Publish the HTTP service endpoint to Tomcat * @@ -56,29 +57,28 @@ public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + if (warURL == null) + throw new IllegalStateException("Cannot obtain webapp URL"); + + log.debug("publishServiceEndpoint: " + warURL); + try { - URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + webXMLRewriter.rewriteWebXml(dep); + + DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - log.debug("publishServiceEndpoint: " + warURL); - try - { - DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); - if (di == null) - throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); + // Preserve the repository config + DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); + if (di != null) + auxdi.repositoryConfig = di.getTopRepositoryConfig(); - webXMLRewriter.rewriteWebXml(dep); - - // Preserve the repository config - DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - auxdi.repositoryConfig = di.getTopRepositoryConfig(); - getMainDeployer().deploy(auxdi); - } - catch (Exception ex) - { - WSFDeploymentException.rethrow(ex); - } + getMainDeployer().deploy(auxdi); } + catch (Exception ex) + { + WSFDeploymentException.rethrow(ex); + } } public void destroy(Deployment dep) Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -1,6 +1,6 @@  - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -8,8 +8,10 @@ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>  - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.WebAppDeployingHttpServer"> +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"> </bean>  <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> </bean> @@ -102,6 +104,10 @@ <property name="provides">ContextRoot</property> </bean> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + </bean> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> @@ -208,13 +214,13 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -27,7 +27,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import java.io.IOException; import java.net.URL; 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 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -145,7 +145,7 @@ The container deployment aspects --> <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> </bean> <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -84,7 +84,7 @@ </bean> <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern</property> + <property name="requires">ContainerMetaData, URLPattern, VFSRoot</property> <property name="provides">UnifiedMetaDataModel, StackDescriptor</property> </bean> @@ -116,4 +116,18 @@ </set> </property> </bean> + <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + </bean> \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,30 +21,30 @@ */ package org.jboss.ws.integration; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.WSFException; -import org.jboss.ws.integration.ServiceRefBinder; -import org.jboss.util.naming.Util; -import org.jboss.logging.Logger; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import javax.jws.HandlerChain; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.Referenceable; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; +import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.WebServiceClient; -import javax.xml.namespace.QName; -import javax.jws.HandlerChain; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.annotation.Annotation; -import java.util.List; -import java.util.ArrayList; -import java.net.URL; -import java.net.MalformedURLException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + /** * A generic ServiceRefBinder that knows how to deal with JAX-WS services. * Subclasses need to provide a stack specific {@link Referenceable} that can be bound into JNDI. @@ -62,19 +62,17 @@ // logging support private static Logger log = Logger.getLogger(CommonServiceRefBinder.class); - private ClassLoader loader = null; - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException { WebServiceRef wsref = null; - if(null == loader) + if (null == loader) throw new IllegalArgumentException("There needs to be a classloader available"); // Build the list of @WebServiceRef relevant annotations List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - if(anElement!=null) + if (anElement != null) { for (Annotation an : anElement.getAnnotations()) { @@ -118,7 +116,7 @@ } else { - if( wsref!=null && (wsref.type() != Object.class) ) + if (wsref != null && (wsref.type() != Object.class)) targetClass = wsref.type(); } @@ -148,7 +146,6 @@ if (wsref != null && wsref.type() != Object.class) targetClassName = wsref.type().getName(); - // #2 Use the target ref type if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) targetClassName = targetClass.getName(); @@ -190,15 +187,15 @@ } // Extract service QName for target service - if(null == serviceRef.getServiceQName()) + if (null == serviceRef.getServiceQName()) { try { Class serviceClass = loader.loadClass(serviceImplClass); - if(serviceClass.getAnnotation(WebServiceClient.class) !=null) + if (serviceClass.getAnnotation(WebServiceClient.class) != null) { WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); - serviceRef.setServiceQName( new QName(clientDecl.targetNamespace(), clientDecl.name())); + serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); } } catch (ClassNotFoundException e) @@ -223,7 +220,5 @@ * @return a Referenceable that can be used by a stack specific {@link javax.naming.spi.ObjectFactory} on the client side * to create a web service stub * */ - protected abstract Referenceable buildServiceReferenceable( - String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef - ); + protected abstract Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef); } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,10 +26,8 @@ import org.jboss.kernel.Kernel; /** - * Locate the single instance of the kernel - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 + * @deprecated + * @see org.jboss.wsf.common.KernelLocator */ public class KernelLocator { Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,96 +23,20 @@ // $Id$ -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.ws.integration.UnifiedVirtualFile; - - /** - * The default file adapter loads resources through an associated classloader. - * If no classload is set, the the thread context classloader will be used. - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 + * @deprecated + * @see org.jboss.wsf.common.ResourceLoaderAdapter */ -public class ResourceLoaderAdapter implements UnifiedVirtualFile +public class ResourceLoaderAdapter extends org.jboss.wsf.common.ResourceLoaderAdapter implements UnifiedVirtualFile { - private URL resourceURL; - private ClassLoader loader; - + @Deprecated public ResourceLoaderAdapter() { - this(Thread.currentThread().getContextClassLoader()); } - + + @Deprecated public ResourceLoaderAdapter(ClassLoader loader) { - this.loader = loader; + super(loader); } - - private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) - { - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = loader.getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new ResourceLoaderAdapter(loader, resourceURL); - } - - public URL toURL() - { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; - } } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,6 +26,7 @@ import javax.naming.Context; import javax.naming.NamingException; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,13 +21,13 @@ */ package org.jboss.ws.integration; +//$Id$ + import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.wsf.common.ServiceLoader; -// $Id$ - /** * A factory for the ServiceRefHandler * Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,20 +23,22 @@ // $Id$ +import java.io.File; +import java.lang.reflect.AnnotatedElement; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.Context; +import javax.naming.NamingException; + import org.jboss.logging.Logger; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.WSFException; -import org.jboss.ws.integration.ServiceRefBinder; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; -import javax.naming.Context; -import javax.naming.NamingException; -import java.io.File; -import java.lang.reflect.AnnotatedElement; -import java.net.MalformedURLException; -import java.net.URL; - /** * Bind service refs in the client's ENC * for every service-ref element in the deployment descriptor. Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,102 +23,17 @@ // $Id$ -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; /** - * Load resources through a URLClassLoader.<br> - * NOTE: The associated classloader doesn't do parent delegation. - * - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 + * @deprecated + * @see org.jboss.wsf.common.URLLoaderAdapter */ -public class URLLoaderAdapter implements UnifiedVirtualFile +public class URLLoaderAdapter extends org.jboss.wsf.common.URLLoaderAdapter implements UnifiedVirtualFile { - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; - + @Deprecated public URLLoaderAdapter(URL rootURL) { - this.rootURL = rootURL; + super(rootURL); } - - private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) - { - this.rootURL = rootURL; - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = getResourceLoader().getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new URLLoaderAdapter(rootURL, loader, resourceURL); - } - - public URL toURL() - { - if (resourceURL != null) - return resourceURL; - else - return rootURL; - } - - private URLClassLoader getResourceLoader() - { - if (loader == null) - { - loader = new URLClassLoader(new URL[]{rootURL}); - } - return loader; - } } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,20 +23,10 @@ // $Id$ -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - /** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 + * @deprecated + * @see org.jboss.wsf.spi.deployment.UnifiedVirtualFile */ -public interface UnifiedVirtualFile extends Serializable +public interface UnifiedVirtualFile extends org.jboss.wsf.spi.deployment.UnifiedVirtualFile { - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -24,7 +24,7 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Heiko.Braun(a)jboss.com Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -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.common; + +//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import org.jboss.kernel.Kernel; + +/** + * Locate the single instance of the kernel + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class KernelLocator +{ + private static Kernel kernel; + + public static Kernel getKernel() + { + return KernelLocator.kernel; + } + + public void setKernel(Kernel kernel) + { + KernelLocator.kernel = kernel; + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,117 @@ +/* + * 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.common; + +// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,126 @@ +/* + * 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.common; + +// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + +/** + * Load resources through a URLClassLoader.<br> + * NOTE: The associated classloader doesn't do parent delegation. + * + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + loader = new URLClassLoader(new URL[] { rootURL }); + } + return loader; + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -27,10 +27,9 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - /** * A general web service deployment that is based on an archive. * @@ -102,23 +101,23 @@ } /* - if (resourceURL == null) - { - String deploymentPath = getUrl().toExternalForm(); + if (resourceURL == null) + { + String deploymentPath = getUrl().toExternalForm(); - if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) - deploymentPath += "!/"; + if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; - if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) - deploymentPath += "!/"; + if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; - if (deploymentPath.endsWith("/") == false) - deploymentPath += "/"; + if (deploymentPath.endsWith("/") == false) + deploymentPath += "/"; - // assign a relative URL - resourceURL = new URL(deploymentPath + resourcePath); - } - */ + // assign a relative URL + resourceURL = new URL(deploymentPath + resourcePath); + } + */ } return resourceURL; } 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 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -109,17 +109,8 @@ } if (allAspects.size() != 0) - { - Set<String> providedConditions = new HashSet<String>(); - for (int i = 0; i < sortedAspects.size(); i++) - { - DeploymentAspect sortedAspect = sortedAspects.get(i); - providedConditions.addAll(sortedAspect.getProvidesAsSet()); - } + throwSortException(allAspects); - throw new IllegalStateException("Cannot add: " + allAspects + "\n provided: " + providedConditions); - } - for (DeploymentAspect aspect : sortedAspects) log.debug(name + ": " + aspect); } @@ -127,6 +118,26 @@ return sortedAspects; } + private void throwSortException(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(DeploymentAspect aspect) { int index = -1; Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,77 @@ +/* + * 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.framework.deployment; + +//$Id: EndpointAddressDeploymentAspect.java 4018 2007-07-27 06:31:03Z thomas.diesler(a)jboss.com $ + +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; + +/** + * A deployment aspect for JAXWS Endpoint API endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 31-Jul-2007 + */ +public class EndpointAPIDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + dep.setType(DeploymentType.JAXWS_JSE); + + if (dep instanceof ArchiveDeployment) + { + ArchiveDeployment arc = (ArchiveDeployment)dep; + UnifiedVirtualFile rootFile = arc.getRootFile(); + if (rootFile == null) + { + rootFile = new ResourceLoaderAdapter(dep.getInitialClassLoader()); + arc.setRootFile(rootFile); + } + } + + ClassLoader rtcl = dep.getRuntimeClassLoader(); + if (rtcl == null) + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + if (ep.getShortName() == null) + { + String name = ep.getTargetBeanName(); + String shortName = name.substring(name.lastIndexOf('.') + 1); + ep.setShortName(shortName); + } + + if (ep.getURLPattern() == null) + { + ep.setURLPattern("/*"); + } + } + } +} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -73,16 +73,22 @@ @Override public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21")) + String typeStr = dep.getType().toString(); + if (typeStr.endsWith("EJB21")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } - else if (dep.getType().toString().endsWith("EJB3")) + else if (typeStr.endsWith("EJB3")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } + else + { + URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, null); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); + } } private URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler) @@ -238,7 +244,7 @@ } // Optional login-config/auth-method - if (authMethod != null) + if (authMethod != null && securityHandler != null) { Element loginConfig = webApp.addElement("login-config"); loginConfig.addElement("auth-method").addText(authMethod); @@ -263,7 +269,8 @@ */ Element jbossWeb = document.addElement("jboss-web"); - securityHandler.addSecurityDomain(jbossWeb, dep); + if (securityHandler != null) + securityHandler.addSecurityDomain(jbossWeb, dep); // Get the context root for this deployment String contextRoot = dep.getService().getContextRoot(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,15 +21,11 @@ */ package org.jboss.wsf.spi.deployment; +//$Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $ + import java.io.IOException; import java.net.URL; -import org.jboss.ws.integration.UnifiedVirtualFile; - - -// $Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $ - - /** * A general web service 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 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -31,7 +31,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.logging.Logger; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * A deployment aspect that does nothing. Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,42 @@ +/* + * 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.spi.deployment; + +// $Id: UnifiedVirtualFile.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.integration.ServiceRefMetaData; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.w3c.dom.Element; /** @@ -124,7 +124,8 @@ log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]"); if (seiName != null) addPortComponentRef(pcref); - else log.warn("Ingore port component ref without SEI declaration: " + pcref); + else + log.warn("Ingore port component ref without SEI declaration: " + pcref); targetPCRef = pcref; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,20 +21,21 @@ */ package org.jboss.wsf.stack.sunri.client; -import org.jboss.ws.integration.ServiceRefBinder; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import java.lang.reflect.AnnotatedElement; import javax.naming.Context; import javax.naming.NamingException; -import java.lang.reflect.AnnotatedElement; +import org.jboss.ws.integration.ServiceRefBinder; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + /** * @author Heiko.Braun(a)jboss.com * Created: Jul 12, 2007 */ public class DummyServiceRefBinderJAXRPC implements ServiceRefBinder { - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException { throw new IllegalArgumentException("The Sun-RI stack doesnt support JAX-RPC service-ref deployments"); } Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -24,7 +24,6 @@ import java.util.Map; import java.util.logging.ErrorManager; import java.util.logging.Handler; -import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; @@ -72,7 +71,7 @@ } String level = levelMap.get(record.getLevel().getName()); - level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; + level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()) : level; level = level == null ? defaultLevel : level; if ("info".equalsIgnoreCase(level)) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -54,8 +54,7 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -65,6 +64,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -208,7 +208,7 @@ if (epMetaData == null) { ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(); + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(); UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); wsMetaData.setClassLoader(ctxLoader); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -53,7 +53,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; +import org.jboss.ws.integration.ServiceRefBinder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.ws.integration.ServiceRefBinder; import java.lang.reflect.AnnotatedElement; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.management.ServerConfig; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -56,8 +56,8 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -2,7 +2,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Heiko Braun, <heiko(a)openj.net> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; import org.jboss.ws.metadata.wsdl.WSDLBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -35,7 +35,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -38,7 +38,7 @@ import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -46,8 +46,8 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -51,8 +51,8 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -32,8 +32,8 @@ import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -57,7 +57,7 @@ import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -38,7 +38,7 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.common.JavaUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,9 +30,9 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * The top level meta data. @@ -95,6 +95,11 @@ return classLoader; } + public void setRootFile(UnifiedVirtualFile vfsRoot) + { + this.vfsRoot = vfsRoot; + } + public UnifiedVirtualFile getRootFile() { return vfsRoot; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * Create a WSSecurityConfiguration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import org.jboss.ws.WSException; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.SPIProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; /** * Builder class that builds the Tools Meta Data Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -36,8 +36,8 @@ import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; -import org.jboss.ws.integration.URLLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData;

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4036 - in trunk: integration/jboss40 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 10:47:35 -0400 (Tue, 31 Jul 2007) New Revision: 4036 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java trunk/testsuite/src/resources/jaxws/tools/ trunk/testsuite/src/resources/jaxws/tools/wsdl/ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/int-40.iml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/jbossws-core.iml trunk/testsuite/testsuite.iml Log: Added WSConsume testcase Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/JBossWS-Trunk.iws 2007-07-31 14:47:35 UTC (rev 4036) @@ -20,41 +20,22 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" afterPath="$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDesciptorModifier.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/RewriteResults.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/RewriteResults.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" afterPath="$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java" afterPath="$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" afterPath="$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/RewriteResults.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" afterPath="$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" afterPath="$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultWebAppDesciptorModifierImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" afterPath="$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -165,8 +146,8 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="51" class="org.jboss.wsf.framework.DefaultSPIProviderResolver" package="org.jboss.wsf.framework"> - <option name="ENABLED" value="false" /> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="48" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> + <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -178,7 +159,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="48" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java" line="57" class="org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -191,7 +172,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java" line="57" class="org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java" line="103" class="org.jboss.wsf.stack.sunri.WSServletContextListenerExt" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -204,7 +185,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java" line="103" class="org.jboss.wsf.stack.sunri.WSServletContextListenerExt" package="org.jboss.wsf.stack.sunri"> + <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.EndpointServlet" package="org.jboss.wsf.stack.jbws"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -217,7 +198,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java" line="95" class="org.jboss.wsf.stack.jbws.EndpointServlet" package="org.jboss.wsf.stack.jbws"> + <breakpoint url="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java" line="132" class="org.jboss.ws.core.jaxrpc.client.ServiceReferenceable" package="org.jboss.ws.core.jaxrpc.client"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -230,7 +211,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="101" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java" line="63" class="org.jboss.ws.integration.ResourceLoaderAdapter" package="org.jboss.ws.integration"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -243,7 +224,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="109" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java" line="97" class="com.sun.tools.ws.processor.modeler.annotation.WebServiceWrapperGenerator" package="com.sun.tools.ws.processor.modeler.annotation"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -256,6 +237,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -299,7 +306,16 @@ <component name="FavoritesManager"> <favorites_list name="JBossWS-Trunk" /> </component> - <component name="FavoritesProjectViewPane" /> + <component name="FavoritesProjectViewPane"> + <subPane subId="JBossWS-Trunk"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" /> + <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> <component name="FavoritesViewImpl"> <favorites_list name="JBossWS-Trunk"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> @@ -314,7 +330,55 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="238" column="42" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.59806293"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="12" column="31" selection-start="521" selection-end="521" vertical-scroll-proportion="0.27602905"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="jax-ws-catalog.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1" column="86" selection-start="164" selection-end="164" vertical-scroll-proportion="0.022592152"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TestServiceCatalog.wsdl" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"> + <provider selected="true" editor-type-id="text-editor"> + <state line="8" column="66" selection-start="413" selection-end="454" vertical-scroll-proportion="0.18073721"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="wsdl0.wsdl" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl"> + <provider selected="true" editor-type-id="text-editor"> + <state line="12" column="64" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.27602905"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -326,6 +390,9 @@ <option name="SORT_ALPHABETICALLY" value="false" /> <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> </component> + <component name="HighlightingSettingsPerFile"> + <setting file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" root0="SKIP_INSPECTION" /> + </component> <component name="InspectionManager"> <option name="AUTOSCROLL_TO_SOURCE" value="false" /> <option name="SPLITTER_PROPORTION" value="0.5" /> @@ -345,236 +412,419 @@ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> - <component name="PackagesPane"> + <component name="PackagesPane" /> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings"> + <option name="useP4CONFIG" value="true" /> + <option name="port" value="<perforce_server>:1666" /> + <option name="client" value="" /> + <option name="user" value="" /> + <option name="passwd" value="" /> + <option name="showCmds" value="false" /> + <option name="useNativeApi" value="false" /> + <option name="pathToExec" value="p4" /> + <option name="useCustomPathToExec" value="false" /> + <option name="SYNC_FORCE" value="false" /> + <option name="SYNC_RUN_RESOLVE" value="true" /> + <option name="REVERT_UNCHANGED_FILES" value="true" /> + <option name="CHARSET" value="none" /> + <option name="SHOW_BRANCHES_HISTORY" value="true" /> + <option name="ENABLED" value="true" /> + <option name="USE_LOGIN" value="false" /> + <option name="LOGIN_SILENTLY" value="false" /> + <option name="INTEGRATE_RUN_RESOLVE" value="true" /> + <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> + <option name="SERVER_TIMEOUT" value="20000" /> + </component> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/ant-import" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/cmd" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="stack" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jbws" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/ant-import-tests" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - </subPane> - </component> - <component name="PerforceChangeBrowserSettings"> - <option name="USE_CLIENT_FILTER" value="true" /> - <option name="CLIENT" value="" /> - </component> - <component name="PerforceDirect.Settings"> - <option name="useP4CONFIG" value="true" /> - <option name="port" value="<perforce_server>:1666" /> - <option name="client" value="" /> - <option name="user" value="" /> - <option name="passwd" value="" /> - <option name="showCmds" value="false" /> - <option name="useNativeApi" value="false" /> - <option name="pathToExec" value="p4" /> - <option name="useCustomPathToExec" value="false" /> - <option name="SYNC_FORCE" value="false" /> - <option name="SYNC_RUN_RESOLVE" value="true" /> - <option name="REVERT_UNCHANGED_FILES" value="true" /> - <option name="CHARSET" value="none" /> - <option name="SHOW_BRANCHES_HISTORY" value="true" /> - <option name="ENABLED" value="true" /> - <option name="USE_LOGIN" value="false" /> - <option name="LOGIN_SILENTLY" value="false" /> - <option name="INTEGRATE_RUN_RESOLVE" value="true" /> - <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> - <option name="SERVER_TIMEOUT" value="20000" /> - </component> - <component name="ProjectLevelVcsManager"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkin" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <OptionsSetting value="true" id="Undo Check Out" /> - <OptionsSetting value="true" id="Compare with SourceSafe Version" /> - <OptionsSetting value="true" id="Get Latest Version" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectPane"> - <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -582,13 +832,13 @@ </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5"> - <flattenPackages PackagesPane="false" /> + <flattenPackages PackagesPane="false" ProjectPane="false" /> <showMembers /> <showModules /> <showLibraryContents /> - <hideEmptyPackages PackagesPane="false" /> + <hideEmptyPackages PackagesPane="false" ProjectPane="false" /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" /> + <showStructure Favorites="false" PackagesPane="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -596,13 +846,29 @@ </component> <component name="PropertiesComponent"> <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="cvs_file_history_treeOrder2" value="2" /> + <property name="cvs_file_history_treeOrder1" value="1" /> <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> + <property name="cvs_file_history_treeOrder3" value="3" /> <property name="MemberChooser.sorted" value="false" /> + <property name="cvs_file_history_flatOrder2" value="2" /> + <property name="cvs_file_history_flatOrder3" value="3" /> + <property name="cvs_file_history_flatOrder0" value="0" /> + <property name="cvs_file_history_flatOrder1" value="1" /> + <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="cvs_file_history_treeWidth0" value="391" /> + <property name="cvs_file_history_treeWidth1" value="391" /> + <property name="cvs_file_history_treeWidth2" value="391" /> + <property name="cvs_file_history_treeWidth3" value="391" /> + <property name="cvs_file_history_flatWidth2" value="391" /> + <property name="cvs_file_history_treeOrder0" value="0" /> + <property name="cvs_file_history_flatWidth3" value="391" /> <property name="MemberChooser.showClasses" value="true" /> + <property name="cvs_file_history_flatWidth0" value="391" /> <property name="GoToClass.includeLibraries" value="false" /> - <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="cvs_file_history_flatWidth1" value="391" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -624,16 +890,41 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.client"> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <component name="RunManager" selected="JUnit.WSConsumerTestCase.testTarget"> + <tempConfiguration default="false" name="WSConsumerTestCase.testTarget" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.ws.jaxws.tools.*" /> + <module name="testsuite" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" /> + <option name="METHOD_NAME" value="testTarget" /> + <option name="TEST_OBJECT" value="method" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/jbossws-core/output/tests" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="49408" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </tempConfiguration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> @@ -666,13 +957,47 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> + <configuration default="false" name="WSConsumerTestCase.testWsdlLocation" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.ws.jaxws.tools.*" /> + <module name="testsuite" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" /> + <option name="METHOD_NAME" value="testWsdlLocation" /> + <option name="TEST_OBJECT" value="method" /> + <option name="VM_PARAMETERS" value="" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/jbossws-core/output/tests" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="59919" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method> + <option name="Make" value="true" /> + </method> + </configuration> <configuration default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -685,6 +1010,9 @@ <option name="LOCAL" value="false" /> </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="false" name="client" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -698,6 +1026,9 @@ <option name="LOCAL" value="false" /> </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> + <method> + <option name="Make" value="true" /> + </method> </configuration> </component> <component name="ScopeViewComponent" /> @@ -768,31 +1099,31 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295325" order="8" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27469134" order="0" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2080247" order="2" /> - <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23641975" order="0" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51376146" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25617284" order="2" /> + <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5080275" order="1" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39862543" order="4" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25585696" order="1" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" order="1" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6536697" order="8" /> - <window_info id="soapUI Navigator" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.49082568" order="8" /> + <window_info id="soapUI Navigator" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="TunnelliJ 1.3" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> @@ -874,125 +1205,115 @@ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="Local Scopes" /> </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179" version="1"> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="int-42" /> + <option name="myLastEditedConfigurable" value="jbossws-core" /> </component> - <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> - <option name="myLastEditedConfigurable" /> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> + <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="22" selection-start="1291" selection-end="1291" vertical-scroll-proportion="0.25866336"> + <state line="62" column="39" selection-start="2753" selection-end="2753" vertical-scroll-proportion="-0.2235723"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentModelFactory.java"> + <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wsdl/framework/WSDLLocation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="22" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.20777643"> + <state line="30" column="13" selection-start="1098" selection-end="1098" vertical-scroll-proportion="0.23086269"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="47" selection-start="1276" selection-end="1276" vertical-scroll-proportion="0.25394896"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="22" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.25394896"> + <state line="2" column="18" selection-start="78" selection-end="78" vertical-scroll-proportion="0.045184303"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23086269"> + <state line="7" column="13" selection-start="337" selection-end="337" vertical-scroll-proportion="0.15814507"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/jaxws/samples/wsaddressing/META-INF/wsdl/TestService.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="56" selection-start="1870" selection-end="1902" vertical-scroll-proportion="0.31510106"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.54116225"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native50/jbossws-beans.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl1.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="52" selection-start="3022" selection-end="3022" vertical-scroll-proportion="0.15133172"> + <state line="0" column="581" selection-start="577" selection-end="581" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="40" selection-start="2940" selection-end="2960" vertical-scroll-proportion="-0.055690072"> + <state line="8" column="66" selection-start="413" selection-end="454" vertical-scroll-proportion="0.18073721"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/resources/interop/wsa/WEB-INF/wsdl/wsdl0.wsdl"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="40" selection-start="3657" selection-end="3657" vertical-scroll-proportion="0.3329298"> + <state line="12" column="64" selection-start="1407" selection-end="1407" vertical-scroll-proportion="0.27602905"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="40" selection-start="1858" selection-end="1858" vertical-scroll-proportion="0.3329298"> + <state line="1" column="86" selection-start="164" selection-end="164" vertical-scroll-proportion="0.022592152"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="52" selection-start="3569" selection-end="3569" vertical-scroll-proportion="0.59334123"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="118" column="58" selection-start="4478" selection-end="4478" vertical-scroll-proportion="2.214031"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/build/ant.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="23" selection-start="1854" selection-end="1854" vertical-scroll-proportion="-0.27602905"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDesciptorModifier.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/ant-import-tests/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="23" column="47" selection-start="1103" selection-end="1103" vertical-scroll-proportion="0.06777646"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="12" column="31" selection-start="521" selection-end="521" vertical-scroll-proportion="0.27602905"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebXMLRewriterImpl.java"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="0" selection-start="1141" selection-end="1263" vertical-scroll-proportion="0.11058264"> + <state line="238" column="42" selection-start="8673" selection-end="8673" vertical-scroll-proportion="0.59806293"> <folding> <element signature="imports" expanded="true" /> </folding> Modified: trunk/integration/jboss40/int-40.iml =================================================================== --- trunk/integration/jboss40/int-40.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/integration/jboss40/int-40.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -21,11 +21,52 @@ <orderEntry type="module" module-name="int-42" /> <orderEntry type="module" module-name="jbossws-core" /> <orderEntry type="module" module-name="42-server" /> - <orderEntry type="library" name="jboss-jmx" level="project" /> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> - <orderEntry type="library" name="jboss-system" level="project" /> - <orderEntry type="library" name="jboss-system-jmx" level="project" /> <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/log4j-boot.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-system.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/lib/jboss-common.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3/client/jbossall-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -10,7 +10,8 @@ <project> - <property name="tests.output.dir" value="${core.dir}/output/tests"/> + <property environment="env"/> + <property name="tests.output.dir" value="${core.dir}/output/tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> <property name="tests.dir" value="${core.dir}/src/test"/> @@ -38,12 +39,26 @@ <pathelement location="${core.dir}/thirdparty/wstx.jar"/> </path> - <path id="tests.extra.classpath"> + <path id="wsconsume.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxb-xjc.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxb-impl.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${core.dir}/thirdparty/streambuffer.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> + <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + </path> + + <path id="tests.extra.classpath"> + <path refid="wsconsume.classpath"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path> -  +  <path id="jbpm.bpel.classpath"> <path refid="ws.stack.classpath"/> <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/>  @@ -72,17 +87,8 @@  <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> - <classpath refid="ws.stack.classpath"/> - <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/> - - <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/> - <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/> - <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/> - <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/> - <classpath location="${core.dir}/thirdparty/stax-api.jar"/> - <classpath location="${core.dir}/thirdparty/stax-ex.jar"/> - <classpath location="${core.dir}/thirdparty/streambuffer.jar"/> - <classpath location="${core.dir}/thirdparty/wstx.jar"/> + <classpath refid="ws.stack.classpath"/> + <classpath refid="wsconsume.classpath"/> </taskdef> <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> Modified: trunk/jbossws-core/jbossws-core.iml =================================================================== --- trunk/jbossws-core/jbossws-core.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/jbossws-core/jbossws-core.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -76,15 +76,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/apache-tomcat.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jboss-deployers.jar!/" /> </CLASSES> <JAVADOC /> @@ -292,15 +283,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/javassist.jar!/" /> </CLASSES> <JAVADOC /> @@ -400,15 +382,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-wsconsume-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jaxen.jar!/" /> </CLASSES> <JAVADOC /> @@ -490,15 +463,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/xercesImpl.jar!/" /> </CLASSES> <JAVADOC /> @@ -526,15 +490,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/hudson.war!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/ejb3.deployer/jboss-ejb3.jar!/" /> </CLASSES> <JAVADOC /> @@ -560,7 +515,7 @@ </library> </orderEntry> <orderEntry type="module" module-name="spi" /> - <orderEntry type="library" name="junit" level="application" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntryProperties /> </component> </module> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,285 @@ +/* + * 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.test.ws.jaxws.tools; + +import junit.framework.TestCase; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.List; +import java.lang.reflect.Method; + +/** + * Test the WSContractConsumer API across different implementations. + * NOTE: All tests expect to be execurted below 'output/tests'. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WSConsumerTestCase extends TestCase +{ + + // Tools delegate. Recreated for every test. See setup(...) + WSContractConsumer consumer; + + // common output dir for all tests. Tests need to be executed below 'output/tests' + File outputDirectory; + + // default is off + boolean toogleMessageOut = false; + + /** + * Recreates a tools delegate for every test + * @throws Exception + */ + protected void setUp() throws Exception + { + super.setUp(); + + // create a new consumer for every test case + consumer = WSContractConsumer.newInstance(); + if(toogleMessageOut) consumer.setMessageStream(System.out); + + // shared output directory, relative to test execution + outputDirectory = new File("wsconsume/java"); + } + + /** + * Specifies the JAX-WS and JAXB binding files to use on import operations. + * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html + */ + public void testBindingFiles() throws Exception + { + List<File> files = new ArrayList<File>(); + files.add( new File("resources/jaxws/tools/wsdl/async-binding.xml") ); + + consumer.setBindingFiles(files); + consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testBindingFiles.EndpointInterface"; + Class sei = loader.loadClass(seiClassName); + + boolean containsAsyncOperations = false; + for(Method m : sei.getDeclaredMethods()) + { + if(m.getName().equals("echoAsync")) + { + containsAsyncOperations = true; + break; + } + } + + assertTrue("External binding file was ignored", containsAsyncOperations); + + } + + /** + * Sets the OASIS XML Catalog file to use for entity resolution. + * + */ + public void testCatalog() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog"); + consumer.setCatalog( new File("resources/jaxws/tools/wsdl/jax-ws-catalog.xml") ); + consumer.setGenerateSource(true); + consumer.setOutputDirectory(outputDirectory); + consumer.consume("resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl"); + } + + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + */ + public void testOutputDirectory() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testOutputDirectory"); + consumer.setGenerateSource(true); + consumer.setSourceDirectory( new File("work/testOutputDirectory/java/") ); + + consumeWSDL(); + + File sei = new File("work/testOutputDirectory/java/org/jboss/test/ws/tools/testOutputDirectory/EndpointInterface.java"); + assertTrue("Output directory switch ignored", sei.exists()); + } + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + */ + public void testSourceDirectory() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory"); + consumer.setGenerateSource(true); + consumer.setSourceDirectory( new File("work/wsconsumeSource/java/") ); + + consumeWSDL(); + + File sei = new File("work/wsconsumeSource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java"); + assertTrue("Source directory switch ignored", sei.exists()); + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() throws Exception + { + testTargetPackage(); + } + + /** + * Sets the target package for generated source. If not specified the default + * is based off of the XML namespace. + * + */ + public void testTargetPackage() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testTargetPackage"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + File packageDir = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage"); + assertTrue("Package not created", packageDir.exists()); + + File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java"); + assertTrue("SEI not generated", sei.exists()); + } + + /** + * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value. + * + */ + public void testWsdlLocation() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation"); + consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl"); + consumer.setGenerateSource(true); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService"; + Class sei = loader.loadClass(seiClassName); + + WebServiceClient webServiceClient = (WebServiceClient) sei.getAnnotation(WebServiceClient.class); + assertNotNull("@WebServiceClient not generated on service interface", webServiceClient); + assertEquals("@WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation()); + } + + /** + * Sets the PrintStream to use for status feedback. + * The simplest example would be to use System.out. + */ + public void testMessageStream() throws Exception + { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + PrintStream pout = new PrintStream(bout); + + consumer.setTargetPackage("org.jboss.test.ws.tools.testMessageStream"); + consumer.setMessageStream(pout); + + consumeWSDL(); + + String messageOut = new String (bout.toByteArray()); + System.out.println("-- Begin captured output -- "); + System.out.println(messageOut); + System.out.println("--- End captured output --"); + + System.out.println("FIXME [JBWS-1772]: WSConsume output is not correctly redirected"); + + /*assertTrue("Tools output not correctly redirected", + messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1 + );*/ + } + + /** + * Sets the additional classpath to use if/when invoking the Java compiler. + * Typically an implementation will use the system <code>java.class.path</code> + * property. So for most normal applications this method is not needed. However, + * if this API is being used from an isolated classloader, then it needs to + * be called in order to reference all jars that are required by the + * implementation. + * + */ + public void testAdditionalCompilerClassPath() + { + System.out.println("FIXME [JBWS-1773]: Verify isolated classloading with WSConsume"); + } + + /** + * Set the target JAX-WS specification target. Defaults to <code>2.0</code> + */ + public void testTarget() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testTarget"); + consumer.setGenerateSource(true); + consumer.setTarget("2.1"); + + consumeWSDL(); + + URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") }); + String seiClassName = "org.jboss.test.ws.tools.testTarget.TestService"; + Class sei = loader.loadClass(seiClassName); + + + boolean featureSig = false; + for(Method m : sei.getDeclaredMethods()) + { + if(m.getName().equals("getEndpointInterfacePort")) + { + for(Class c : m.getParameterTypes()) + { + if(c.isArray() && + c.getComponentType().equals(WebServiceFeature.class)) + { + featureSig = true; + break; + } + } + } + } + + assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig); + + } + + private void consumeWSDL() throws Exception + { + consumer.setOutputDirectory(outputDirectory); + consumer.consume("resources/jaxws/tools/wsdl/TestService.wsdl"); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://www.openuri.org/2004/04/HelloWorld" + xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types/> + <message name="EndpointInterface_echo"> + <part name="String_1" type="xsd:string"/> + </message> + <message name="EndpointInterface_echoResponse"> + <part name="result" type="xsd:string"/> + </message> + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="String_1"> + <input message="tns:EndpointInterface_echo"/> + <output message="tns:EndpointInterface_echoResponse"/> + </operation> + </portType> + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </input> + <output> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </output> + </operation> + </binding> + <service name="TestService"> + <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://www.openuri.org/2004/04/HelloWorld" + xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl'> + <types/> + <message name="EndpointInterface_echo"> + <part name="String_1" type="xsd:string"/> + </message> + <message name="EndpointInterface_echoResponse"> + <part name="result" type="xsd:string"/> + </message> + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="String_1"> + <input message="tns:EndpointInterface_echo" wsaw:Action='http://foo.bar.com/action/echo'/> + <output message="tns:EndpointInterface_echoResponse"/> + </operation> + </portType> + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </input> + <output> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </output> + </operation> + </binding> + <service name="TestService"> + <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: trunk/testsuite/src/resources/jaxws/tools/wsdl/TestServiceCatalog.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,9 @@ +<bindings + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + wsdlLocation="TestService.wsdl" + xmlns="http://java.sun.com/xml/ns/jaxws"> + <package name="org.jboss.test.ws.tools.testBindingFiles"/> + <enableWrapperStyle>true</enableWrapperStyle> + <enableAsyncMapping>true</enableAsyncMapping> +</bindings> + Property changes on: trunk/testsuite/src/resources/jaxws/tools/wsdl/async-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,3 @@ +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <system systemId="http://www.w3.org/2006/05/addressing/wsdl" uri="ws-addr-wsdl.xsd"/> +</catalog> \ No newline at end of file Property changes on: trunk/testsuite/src/resources/jaxws/tools/wsdl/jax-ws-catalog.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd =================================================================== --- trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd (rev 0) +++ trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd 2007-07-31 14:47:35 UTC (rev 4036) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2006/05/addressing/wsdl" targetNamespace="http://www.w3.org/2006/05/addressing/wsdl" blockDefault="#all" elementFormDefault="qualified"> + + <xs:element name="ServiceName" type="tns:ServiceNameType"/> + <xs:complexType name="ServiceNameType"> + <xs:simpleContent> + <xs:extension base="xs:QName"> + <xs:attribute name="EndpointName" type="xs:NCName" use="optional"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:element name="InterfaceName" type="tns:AttributedQNameType"/> + <xs:complexType name="AttributedQNameType"> + <xs:simpleContent> + <xs:extension base="xs:QName"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:attribute name="Action" type="xs:anyURI"/> + + <xs:element name="UsingAddressing"> + <xs:complexType> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + </xs:element> + + <xs:simpleType name="AnonymousType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="optional"/> + <xs:enumeration value="required"/> + <xs:enumeration value="prohibited"/> + </xs:restriction> + </xs:simpleType> + <xs:element name="Anonymous"> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="tns:AnonymousType"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + +</xs:schema> \ No newline at end of file Property changes on: trunk/testsuite/src/resources/jaxws/tools/wsdl/ws-addr-wsdl.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/testsuite.iml =================================================================== --- trunk/testsuite/testsuite.iml 2007-07-31 14:46:49 UTC (rev 4035) +++ trunk/testsuite/testsuite.iml 2007-07-31 14:47:35 UTC (rev 4036) @@ -2,7 +2,9 @@ <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/../integration/spi/output/classes" /> <exclude-output /> + <output-test url="file://$MODULE_DIR$/../integration/spi/output/tests/classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> </content> @@ -71,8 +73,19 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="junit" level="application" /> <orderEntry type="module" module-name="spi" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../integration/spi/thirdparty/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module" module-name="jbossws-core" /> + <orderEntry type="library" name="tools" level="application" /> + <orderEntry type="module" module-name="sunri-sources" /> <orderEntryProperties /> </component> </module>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4035 - trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-31 10:46:49 -0400 (Tue, 31 Jul 2007) New Revision: 4035 Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java Log: Fix jboss-40 service deployments 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-07-31 09:40:33 UTC (rev 4034) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 14:46:49 UTC (rev 4035) @@ -23,24 +23,23 @@ // $Id$ -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; - -import javax.naming.Context; - import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; -import org.jboss.util.naming.Util; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.ws.integration.ServiceRefHandler; +import org.jboss.ws.integration.ServiceRefHandlerFactory; import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import javax.naming.Context; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Iterator; + /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the * deployment descriptor. @@ -67,13 +66,14 @@ ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); String serviceRefName = serviceRef.getServiceRefName(); - UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); + UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); // Why this? UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(vfRoot, serviceRef); - usr.setVfsRoot(new URLLoaderAdapter(getDeploymentURL(di))); + URLLoaderAdapter urlLoaderAdapter = new URLLoaderAdapter(getDeploymentURL(di)); + usr.setVfsRoot(urlLoaderAdapter); - ServiceReferenceable ref = new ServiceReferenceable(usr); - Util.bind(envCtx, serviceRefName, ref); - + ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.getServiceRefHandler(); + serviceRefHandler.bindServiceRef(envCtx, serviceRefName, urlLoaderAdapter , di.ucl, usr); + log.debug("Webservice binding: java:comp/env/" + serviceRefName); } }

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r4034 - in trunk/integration: jboss42/src/main/resources and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-31 05:40:33 -0400 (Tue, 31 Jul 2007) New Revision: 4034 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java Log: More Endpoint API Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 09:37:40 UTC (rev 4033) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 09:40:33 UTC (rev 4034) @@ -34,6 +34,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; @@ -69,12 +70,22 @@ try { - // Create the deployment + // Get the deployment model factory SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + + // Create/Setup the deployment Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader()); - dep.getService().addEndpoint(depModelFactory.newEndpoint(implClass.getName())); + // Create/Setup the service + Service service = dep.getService(); + service.setContextRoot(context.getContextRoot()); + + // Create/Setup the endpoint + org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName()); + ep.setURLPattern("/*"); + service.addEndpoint(ep); + // Deploy using deployment aspects DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); depManagerFactory.getDeploymentAspectManager(DeploymentType.JAXWS_JSE); Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 09:37:40 UTC (rev 4033) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 09:40:33 UTC (rev 4034) @@ -208,6 +208,15 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> </property> </bean> 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 09:37:40 UTC (rev 4033) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 09:40:33 UTC (rev 4034) @@ -61,7 +61,7 @@ this.name = name; } - public List<DeploymentAspect> getDeploymentAspects() + public synchronized List<DeploymentAspect> getDeploymentAspects() { // This cannot be done in 'create' because we add aspects from different MC configurations if (sortedAspects == null)

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2007