JBossWS SVN: r7269 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-02 11:39:24 -0400 (Mon, 02 Jun 2008)
New Revision: 7269
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
Log:
[JBWS-2161][CXF-1253] CXF does not respect @HandlerChain on client SEI
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-06-02 15:21:21 UTC (rev 7268)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.java 2008-06-02 15:39:24 UTC (rev 7269)
@@ -95,6 +95,10 @@
{
System.out.println("FIXME: [JBWS-1672] Metro does not respect @HandlerChain on client SEI");
}
+ else if (isIntegrationCXF())
+ {
+ System.out.println("FIXME: [CXF-1253] CXF does not respect @HandlerChain on client SEI");
+ }
else
{
String resStr = port.echo("Kermit");
15 years, 11 months
JBossWS SVN: r7268 - in stack/native/trunk/modules/testsuite: native-tests/src/test/resources/jaxrpc/jbws720/WEB-INF/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-02 11:21:21 -0400 (Mon, 02 Jun 2008)
New Revision: 7268
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/WEB-INF/wsdl/TestService.wsdl
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/WEB-INF/wsdl/TestService.wsdl 2008-06-02 14:21:26 UTC (rev 7267)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws720/WEB-INF/wsdl/TestService.wsdl 2008-06-02 15:21:21 UTC (rev 7268)
@@ -13,7 +13,7 @@
<element name="strElement" type="string" minOccurs="0"/>
<any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
</sequence>
- <attribute name="strAttr" type="string" use="required"/>
+ <attribute name="strAttr" type="string"/>
<attribute ref="xml:lang"/>
</complexType>
<complexType name="getPropertyResponse">
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 14:21:26 UTC (rev 7267)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 15:21:21 UTC (rev 7268)
@@ -35,9 +35,6 @@
# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment
org/jboss/test/ws/jaxws/endpoint/**
-# [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute
-org/jboss/test/ws/jaxrpc/jbws720/**
-
# [JBWS-2171] ServiceRef injection in EJB3 clients
org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*
15 years, 11 months
JBossWS SVN: r7267 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws/enventry and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-06-02 10:21:26 -0400 (Mon, 02 Jun 2008)
New Revision: 7267
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
Removed:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
Log:
[JBWS-2074] Resource injection in jaxws endpoints and handlers
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-06-02 14:01:12 UTC (rev 7266)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-06-02 14:21:26 UTC (rev 7267)
@@ -61,14 +61,19 @@
</fileset>
</jar>
- <!-- jaxws-enventry.war -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-enventry.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/web.xml">
+ <!-- jaxws-enventry -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-jse.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/jse-web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/enventry/EnvEntryBeanJSE.class"/>
<include name="org/jboss/test/ws/jaxws/enventry/ServerSideHandler.class"/>
<include name="org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.class"/>
</classes>
</war>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-enventry-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/enventry/WEB-INF/servlet-web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.class"/>
+ </classes>
+ </war>
<!-- jaxws-epr -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar">
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2008-06-02 14:01:12 UTC (rev 7266)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2008-06-02 14:21:26 UTC (rev 7267)
@@ -42,12 +42,12 @@
public static Test suite()
{
- return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry.war");
+ return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry-jse.war");
}
public void testEndpoint() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-enventry?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-jse?wsdl");
QName serviceName = new QName("http://org.jboss.ws/enventry", "EnvEntryService");
Service service = Service.create(wsdlURL, serviceName);
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java 2008-06-02 14:21:26 UTC (rev 7267)
@@ -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.test.ws.jaxws.enventry;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class EnvEntryServlet extends HttpServlet
+{
+ @Resource(name = "jaxws/entry1")
+ String strValue;
+
+ @Resource(name = "jaxws/entry2")
+ Integer intValue;
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+ {
+ PrintWriter pw = new PrintWriter(res.getWriter());
+ pw.print(strValue + ":" + intValue);
+ pw.close();
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServlet.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2008-06-02 14:21:26 UTC (rev 7267)
@@ -0,0 +1,55 @@
+/*
+ * 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.enventry;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test env entry access
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-May-2008
+ */
+public class EnvEntryServletTestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(EnvEntryServletTestCase.class, "jaxws-enventry-servlet.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet");
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ String line = br.readLine();
+
+ assertEquals("web:8", line);
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml (from rev 7263, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml)
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/jse-web.xml 2008-06-02 14:21:26 UTC (rev 7267)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>web</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>strValue</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry2</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>8</env-entry-value>
+ <injection-target>
+ <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
+ <injection-target-name>intValue</injection-target-name>
+ </injection-target>
+ </env-entry>
+
+</web-app>
+
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2008-06-02 14:21:26 UTC (rev 7267)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>web</env-entry-value>
+ </env-entry>
+
+ <env-entry>
+ <env-entry-name>jaxws/entry2</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>8</env-entry-value>
+ </env-entry>
+
+</web-app>
+
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml 2008-06-02 14:01:12 UTC (rev 7266)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/web.xml 2008-06-02 14:21:26 UTC (rev 7267)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <servlet>
- <servlet-name>TestService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
- <env-entry>
- <env-entry-name>jaxws/entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>web</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
- <injection-target-name>strValue</injection-target-name>
- </injection-target>
- </env-entry>
-
- <env-entry>
- <env-entry-name>jaxws/entry2</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>8</env-entry-value>
- <injection-target>
- <injection-target-class>org.jboss.test.ws.jaxws.enventry.EnvEntryBeanJSE</injection-target-class>
- <injection-target-name>intValue</injection-target-name>
- </injection-target>
- </env-entry>
-
-</web-app>
-
15 years, 11 months
JBossWS SVN: r7266 - in stack/native/trunk/modules: embedded/src/main/resources and 10 other directories.
by jbossws-commits＠lists.jboss.org
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>
*/
-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.*
15 years, 11 months
JBossWS SVN: r7265 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-06-02 09:18:14 -0400 (Mon, 02 Jun 2008)
New Revision: 7265
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
Enable eventing test cases
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 10:04:43 UTC (rev 7264)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-02 13:18:14 UTC (rev 7265)
@@ -41,9 +41,6 @@
# [JBWS-2170] Fix embedded for maven build
org/jboss/test/ws/embedded/**
-# [JBWS-2173] Fix eventing for maven build
-org/jboss/test/ws/jaxws/samples/wseventing/**
-
# [JBWS-2171] ServiceRef injection in EJB3 clients
org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.*
15 years, 11 months
JBossWS SVN: r7264 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-02 06:04:43 -0400 (Mon, 02 Jun 2008)
New Revision: 7264
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
[JBWS-2174] update AS 5 Beta 4 tests excludes file
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-02 07:44:17 UTC (rev 7263)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-02 10:04:43 UTC (rev 7264)
@@ -103,13 +103,6 @@
# [JBWS-2120] @WebWservice does not work with class isolation
org/jboss/test/ws/jaxws/jbws1556/**
-# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory
-org/jboss/test/ws/jaxws/samples/advanced/retail/**
-org/jboss/test/ws/jaxws/samples/context/**
-org/jboss/test/ws/jaxws/samples/eardeployment/**
-org/jboss/test/ws/jaxws/samples/swaref/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -124,8 +117,11 @@
org/jboss/test/ws/jaxws/jbws944/**
org/jboss/test/ws/jaxws/jbws1422/**
org/jboss/test/ws/jaxws/jbws1446/**
-org/jboss/test/ws/jaxws/jbws1556/**
org/jboss/test/ws/jaxws/jbws1799/**
org/jboss/test/ws/jaxws/jbws1872/**
org/jboss/test/ws/jaxws/jbws1969/**
-org/jboss/test/ws/projectGenerator/**
+org/jboss/test/ws/jaxws/samples/swaref/**
+org/jboss/test/ws/jaxws/samples/eardeployment/**
+org/jboss/test/ws/jaxws/samples/advanced/retail/**
+org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*
15 years, 11 months
JBossWS SVN: r7263 - container/jboss42/branches/jbossws-jboss422/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-06-02 03:44:17 -0400 (Mon, 02 Jun 2008)
New Revision: 7263
Modified:
container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
Log:
[JBWS-2174] fix hudson regression for AS 422
Modified: container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-05-31 18:47:49 UTC (rev 7262)
+++ container/jboss42/branches/jbossws-jboss422/src/main/resources/jbossws-jboss42-config.xml 2008-06-02 07:44:17 UTC (rev 7263)
@@ -275,6 +275,7 @@
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
@@ -297,7 +298,6 @@
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
<inject bean="WSURLPatternDeploymentAspect"/>
<inject bean="WSWebAppDeploymentAspect"/>
<inject bean="WSWebAppGeneratorDeploymentAspect"/>
15 years, 11 months