Author: heiko.braun(a)jboss.com Date: 2008-06-02 10:01:12 -0400 (Mon, 02 Jun 2008) New Revision: 7266 Added: stack/native/trunk/modules/embedded/src/main/resources/org/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/embedded/ Removed: stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt Log: JBWS-2170: Fix embedded for maven build Deleted: stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml =================================================================== --- stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/embedded/src/main/java/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-06-02 14:01:12 UTC (rev 7266) @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ====================================================================== - SPI Implementations - ====================================================================== - --> - - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - - <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.embedded.StandaloneServerConfig"> - <property name="webServiceHost">localhost</property> - <property name="modifySOAPAddress">true</property> - </bean> - - <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.DefaultEndpointRegistry"/> - - <!-- - ====================================================================== - Standalone DeploymentAspectManager - ====================================================================== - --> - - <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerJSE</property> - </bean> - - <!-- - ====================================================================== - Container deployment aspects - ====================================================================== - --> - - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> - <property name="requires">LAST_DEPLOYMENT_ASPECT</property> - </bean> - - <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> - <property name="provides">RegisteredEndpoint</property> - </bean> - - <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.stack.jbws.embedded.HttpEndpointPublishAspect"> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">HttpTransport</property> - </bean> - - <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="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - </set> - </property> - </bean> - - <!-- - ============================================================================== - Stack deployment aspects - ============================================================================== - --> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <!--property name="requires">ContainerEndpointHandler, ContainerMetaData</property--> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">PublishedContract</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="provides">UnifiedMetaDataModel</property> - </bean> - - <!-- Deployment aspect installer --> - - <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="WSNativeEndpointHandlerDeploymentAspect"/> - <inject bean="WSNativeEventingDeploymentAspect"/> - <inject bean="WSNativePublishContractDeploymentAspect"/> - <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> - <inject bean="WSNativeRMDeploymentAspect"/> - <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> - <inject bean="WSHttpTransportDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectManagerJSE</depends> - </bean> - - <!-- - ============================================================================== - Stack specific beans (not SPI) - ============================================================================== - --> - - <!-- A subscription manager for WS-Eventing --> - <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> - <property name="bindAddress">localhost</property> - </bean> - -</deployment> \ No newline at end of file Added: stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml =================================================================== --- stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml (rev 0) +++ stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml 2008-06-02 14:01:12 UTC (rev 7266) @@ -0,0 +1,132 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ====================================================================== + SPI Implementations + ====================================================================== + --> + + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.embedded.StandaloneServerConfig"> + <property name="webServiceHost">localhost</property> + <property name="modifySOAPAddress">true</property> + </bean> + + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.DefaultEndpointRegistry"/> + + <!-- + ====================================================================== + Standalone DeploymentAspectManager + ====================================================================== + --> + + <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE</property> + </bean> + + <!-- + ====================================================================== + Container deployment aspects + ====================================================================== + --> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSHttpTransportDeploymentAspect" class="org.jboss.wsf.stack.jbws.embedded.HttpEndpointPublishAspect"> + <property name="requires">RegisteredEndpoint</property> + <property name="provides">HttpTransport</property> + </bean> + + <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="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + </set> + </property> + </bean> + + <!-- + ============================================================================== + Stack deployment aspects + ============================================================================== + --> + + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> + </bean> + + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <!--property name="requires">ContainerEndpointHandler, ContainerMetaData</property--> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">PublishedContract</property> + </bean> + + <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> + <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="provides">UnifiedMetaDataModel</property> + </bean> + + <!-- Deployment aspect installer --> + + <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="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeRMDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSHttpTransportDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectManagerJSE</depends> + </bean> + + <!-- + ============================================================================== + Stack specific beans (not SPI) + ============================================================================== + --> + + <!-- A subscription manager for WS-Eventing --> + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">localhost</property> + </bean> + +</deployment> \ No newline at end of file Property changes on: stack/native/trunk/modules/embedded/src/main/resources/org/jboss/wsf/stack/jbws/embedded/standalone-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-06-02 14:01:12 UTC (rev 7266) @@ -13,7 +13,13 @@ <version>3.0.2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - + + + <properties> + <version.org.jboss.microcontainer>2.0.0.Beta14</version.org.jboss.microcontainer> + </properties> + + <!-- Dependencies --> <dependencies> <dependency> @@ -29,6 +35,19 @@ <scope>test</scope> <type>sar</type> </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <version>${version.org.jboss.microcontainer}</version> + </dependency> + + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${version.org.jboss.microcontainer}</version> + </dependency> + </dependencies> <!-- Profiles --> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/embedded/EmbeddedTestCase.java 2008-06-02 14:01:12 UTC (rev 7266) @@ -26,19 +26,21 @@ import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.stack.jbws.embedded.DeploymentModelBuilder; import org.jboss.wsf.stack.jbws.embedded.EmbeddableWSFRuntime; +import org.jboss.wsf.test.JBossWSTest; import javax.xml.namespace.QName; import javax.xml.ws.Service; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.io.File; import java.net.URL; import java.net.URLConnection; /** * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; */ -public class EmbeddedTestCase extends TestCase +public class EmbeddedTestCase extends JBossWSTest { /** @@ -55,7 +57,7 @@ .addEndpoint("org.jboss.test.ws.embedded.HelloWorldEndpoint", "/endpoint") .build(); - // Publish + // Publish WSFRuntime container = EmbeddableWSFRuntime.bootstrap( EmbeddableWSFRuntime.DEFAULT_CONFIG_URL); container.create(dep); container.start(dep); Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-06-02 14:01:12 UTC (rev 7266) @@ -29,9 +29,6 @@ # [JBWS-2175] wsconsume cannot run with jaxws-api from build output org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** - # [JBWS-1911] Support the JMS transport with JAX-WS org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-02 14:01:12 UTC (rev 7266) @@ -26,6 +26,3 @@ # [JBWS-1911] Support the JMS transport with JAX-WS org/jboss/test/ws/jaxws/samples/jmstransport/** org/jboss/test/ws/jaxws/samples/dar/JMSClientTestCase.* - -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-02 14:01:12 UTC (rev 7266) @@ -10,6 +10,3 @@ # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** - Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-02 14:01:12 UTC (rev 7266) @@ -23,6 +23,3 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** - Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 13:18:14 UTC (rev 7265) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 14:01:12 UTC (rev 7266) @@ -38,9 +38,6 @@ # [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute org/jboss/test/ws/jaxrpc/jbws720/** -# [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** - # [JBWS-2171] ServiceRef injection in EJB3 clients org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*