JBossWS SVN: r6254 - framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-07 10:13:02 -0400 (Mon, 07 Apr 2008)
New Revision: 6254
Modified:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
Log:
Be more releaxed when creating HttpListenerRef
Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java 2008-04-07 14:12:17 UTC (rev 6253)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/transport/HttpListenerRef.java 2008-04-07 14:13:02 UTC (rev 6254)
@@ -37,8 +37,11 @@
public HttpListenerRef(String webContext, String urlPattern, URI address)
{
- if(!webContext.startsWith("/") || !urlPattern.startsWith("/"))
- throw new IllegalArgumentException("Both webContext and urlPattern need to start with '/'");
+ if(!webContext.startsWith("/"))
+ webContext = "/"+webContext;
+
+ if(!urlPattern.startsWith("/"))
+ urlPattern = "/"+urlPattern;
this.webContext = webContext;
this.urlPattern = urlPattern;
@@ -59,4 +62,10 @@
{
return this.webContext+this.urlPattern;
}
+
+
+ public String toString()
+ {
+ return getAddress().toString();
+ }
}
16 years, 9 months
JBossWS SVN: r6253 - spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-07 10:12:17 -0400 (Mon, 07 Apr 2008)
New Revision: 6253
Modified:
spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/HttpSpec.java
Log:
Added servlet spec properties to HttpSpec
Modified: spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/HttpSpec.java
===================================================================
--- spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/HttpSpec.java 2008-04-07 14:11:16 UTC (rev 6252)
+++ spi/branches/hbraun/src/main/java/org/jboss/wsf/spi/transport/HttpSpec.java 2008-04-07 14:12:17 UTC (rev 6253)
@@ -21,14 +21,26 @@
*/
package org.jboss.wsf.spi.transport;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class HttpSpec implements TransportSpec
{
+ public static final String PROPERTY_GENERATED_WEBAPP = "org.jboss.ws.generated.webapp";
+ public static final String PROPERTY_WEBAPP_CONTEXT_PARAMETERS = "org.jboss.ws.webapp.ContextParameterMap";
+ public static final String PROPERTY_WEBAPP_SERVLET_CLASS = "org.jboss.ws.webapp.ServletClass";
+ public static final String PROPERTY_WEBAPP_SERVLET_CONTEXT_LISTENER = "org.jboss.ws.webapp.ServletContextListener";
+ public static final String PROPERTY_WEBAPP_URL = "org.jboss.ws.webapp.url";
+
private String webContext;
private String urlPattern;
+ private String servletClass;
+ private Map<String,String> contextParameter = new HashMap<String,String>();
+
public HttpSpec(String webContext, String urlPattern)
{
if(!webContext.startsWith("/"))
@@ -52,4 +64,19 @@
{
return urlPattern;
}
+
+ public void setServletClass(String servletClass)
+ {
+ this.servletClass = servletClass;
+ }
+
+ public String getServletClass()
+ {
+ return servletClass;
+ }
+
+ public Map<String, String> getContextParameter()
+ {
+ return contextParameter;
+ }
}
16 years, 9 months
JBossWS SVN: r6252 - in stack/native/branches/hbraun/src/main/java/org/jboss: wsf/stack/jbws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-07 10:11:16 -0400 (Mon, 07 Apr 2008)
New Revision: 6252
Modified:
stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java
Log:
Update DA's to new signature 'create(Deployment dep, WSFRuntime runtime)'
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -28,6 +28,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* Registers RMInvocationHandler if WS-RM is detected
@@ -40,7 +41,7 @@
{
@Override
- public final void start(Deployment dep)
+ public final void start(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -60,7 +61,7 @@
}
@Override
- public final void destroy(Deployment dep)
+ public final void destroy(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -26,6 +26,7 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that initializes the UMDM
@@ -36,7 +37,7 @@
public class EagerInitializeDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -32,6 +32,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that creates event sources and register them with the
@@ -43,7 +44,7 @@
public class EventingDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -72,7 +73,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void destroy(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -29,6 +29,7 @@
import org.jboss.ws.core.jaxws.JAXBBindingCustomization;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.WSFRuntime;
import java.io.IOException;
import java.io.InputStream;
@@ -43,7 +44,7 @@
private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml";
private static final String WEB_INF_JAXB_INTROS_XML = "WEB-INF/jaxb-intros.xml";
- public void start(Deployment deployment)
+ public void start(Deployment deployment, WSFRuntime runtime)
{
// assert ArchiveDeployment
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -30,6 +30,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that publishes the wsdl
@@ -40,7 +41,7 @@
public class PublishContractDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -29,6 +29,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that associates the ServiceEndpointInvoker with the endpoint
@@ -39,7 +40,7 @@
public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -35,6 +35,7 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that builds the UnifiedDeploymentInfo
@@ -45,7 +46,7 @@
public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
@@ -72,7 +73,7 @@
}
else
{
- throw new IllegalStateException("Invalid type: " + dep.getType());
+ throw new IllegalStateException("Invalid deployment type: " + dep.getType());
}
dep.addAttachment(UnifiedMetaData.class, umd);
Modified: stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java
===================================================================
--- stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-04-07 14:10:58 UTC (rev 6251)
+++ stack/native/branches/hbraun/src/main/java/org/jboss/wsf/stack/jbws/embedded/HttpEndpointPublishAspect.java 2008-04-07 14:11:16 UTC (rev 6252)
@@ -23,6 +23,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -45,7 +46,7 @@
http = tmf.createTransportManager(Protocol.HTTP);
}
- public void start(Deployment dep)
+ public void start(Deployment dep, WSFRuntime runtime)
{
String webcontext = dep.getService().getContextRoot();
assert webcontext!=null;
@@ -64,7 +65,7 @@
}
}
- public void stop(Deployment dep)
+ public void stop(Deployment dep, WSFRuntime runtime)
{
assert dep.getService().getEndpoints().size()>0;
16 years, 9 months
JBossWS SVN: r6251 - in stack/cxf/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 10:10:58 -0400 (Mon, 07 Apr 2008)
New Revision: 6251
Modified:
stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/etc/default.mf
Log:
[JBWS-2095] Setup the TCK5 for CXF and Metro
Modified: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-07 14:10:06 UTC (rev 6250)
+++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-07 14:10:58 UTC (rev 6251)
@@ -26,18 +26,29 @@
</patternset>
<patternset id="jbossws.client.patternset">
+ <include name="**/cxf-${cxf.version}.jar"/>
+ <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
+ <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-cxf-client.jar"/>
<include name="**/jbossws-framework.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxb-xjc.jar"/>
- <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
+ <include name="**/jdom-${cxf.jdom}.jar"/>
+ <include name="**/neethi-${cxf.neethi}.jar"/>
<include name="**/saaj-api-${cxf.saaj}.jar"/>
+ <include name="**/saaj-impl-${cxf.saaj}.jar"/>
+ <include name="**/spring-beans-${cxf.spring}.jar"/>
+ <include name="**/spring-context-${cxf.spring}.jar"/>
+ <include name="**/spring-core-${cxf.spring}.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/wstx.jar"/>
+ <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/>
+ <include name="**/XmlSchema-${cxf.xmlschema}.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
@@ -65,6 +76,9 @@
<include name="**/cxf-${cxf.version}.jar"/>
<include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
<include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="**/jbossws-cxf.jar"/>
<include name="**/jdom-${cxf.jdom}.jar"/>
@@ -74,15 +88,12 @@
<include name="**/spring-beans-${cxf.spring}.jar"/>
<include name="**/spring-context-${cxf.spring}.jar"/>
<include name="**/spring-core-${cxf.spring}.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
<include name="**/xbean-${cxf.xbean}.jar"/>
<include name="**/xml-resolver-${cxf.xml.resolver}.jar"/>
<include name="**/XmlSchema-${cxf.xmlschema}.jar"/>
- <include name="**/jaxb-api.jar"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/jaxrpc-api.jar"/>
- <include name="**/stax-api.jar"/>
- <include name="**/wsdl4j.jar"/>
- <include name="**/wstx.jar"/>
</patternset>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/etc/default.mf
===================================================================
--- stack/cxf/trunk/src/main/etc/default.mf 2008-04-07 14:10:06 UTC (rev 6250)
+++ stack/cxf/trunk/src/main/etc/default.mf 2008-04-07 14:10:58 UTC (rev 6251)
@@ -8,3 +8,8 @@
Implementation-Version: @implementation.version@ (build=(a)build.id@)
Implementation-Vendor: @implementation.vendor@
Implementation-Vendor-Id: @implementation.vendor.id@
+Class-Path: cxf-@cxf.version@.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar
+ jaxb-api.jar jaxb-impl.jar jaxws-api-@cxf.jaxws.api@.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar
+ jdom-@cxf.jdom@.jar neethi-@cxf.neethi@.jar saaj-api-@cxf.saaj@.jar saaj-impl-@cxf.saaj@.jar
+ spring-beans-@cxf.spring@.jar spring-context-@cxf.spring@.jar spring-core-@cxf.spring@.jar
+ stax-api.jar wsdl4j.jar wstx.jar xml-resolver-@cxf.xml.resolver@.jar XmlSchema-@cxf.xmlschema@.jar
\ No newline at end of file
16 years, 9 months
JBossWS SVN: r6250 - stack/native/branches/hbraun/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-04-07 10:10:06 -0400 (Mon, 07 Apr 2008)
New Revision: 6250
Modified:
stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml
Log:
Predefined named request handler factory
Modified: stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml 2008-04-07 13:51:00 UTC (rev 6249)
+++ stack/native/branches/hbraun/src/main/resources/jbossws-native-config.xml 2008-04-07 14:10:06 UTC (rev 6250)
@@ -33,11 +33,15 @@
<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
<property name="recording">false</property>
</bean>
+
<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
<property name="recording">false</property>
</bean>
- <!--
+ <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
+
+ <!--
+ *********************************************************************************************************************
The stack specific deployment aspects
-->
<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
@@ -97,7 +101,11 @@
<property name="provides">JAXBIntros</property>
</bean>
- <!-- Deployment aspect installers -->
+ <!--
+ *********************************************************************************************************************
+ Deployment aspect installers
+ -->
+
<bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
<property name="sortAspectsOnCreate">true</property>
16 years, 9 months
JBossWS SVN: r6249 - stack/cxf/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:51:00 -0400 (Mon, 07 Apr 2008)
New Revision: 6249
Modified:
stack/cxf/trunk/ant-import/build-bin-dist.xml
Log:
Exclude common tests that are not samples from bin dist
Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:50:55 UTC (rev 6248)
+++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:51:00 UTC (rev 6249)
@@ -80,7 +80,14 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${cxf.dir}/src/test-framework"/>
+ <fileset dir="${cxf.dir}/src/test-framework">
+ <include name="ant-import/**"/>
+ <include name="etc/**"/>
+ <include name="java/**/jaxws/samples/**"/>
+ <include name="java/**/jaxws/smoke/**"/>
+ <include name="resources/jaxws/samples/**"/>
+ <include name="resources/jaxws/smoke/**"/>
+ </fileset>
<fileset dir="${cxf.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
<include name="etc/log4j.xml"/>
16 years, 9 months
JBossWS SVN: r6248 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:50:55 -0400 (Mon, 07 Apr 2008)
New Revision: 6248
Modified:
stack/metro/trunk/ant-import/build-bin-dist.xml
Log:
Exclude common tests that are not samples from bin dist
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:50:48 UTC (rev 6247)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:50:55 UTC (rev 6248)
@@ -80,7 +80,14 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${metro.dir}/src/test-framework"/>
+ <fileset dir="${metro.dir}/src/test-framework">
+ <include name="ant-import/**"/>
+ <include name="etc/**"/>
+ <include name="java/**/jaxws/samples/**"/>
+ <include name="java/**/jaxws/smoke/**"/>
+ <include name="resources/jaxws/samples/**"/>
+ <include name="resources/jaxws/smoke/**"/>
+ </fileset>
<fileset dir="${metro.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
<include name="etc/log4j.xml"/>
16 years, 9 months
JBossWS SVN: r6247 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:50:48 -0400 (Mon, 07 Apr 2008)
New Revision: 6247
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
Log:
Exclude common tests that are not samples from bin dist
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:29:25 UTC (rev 6246)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-04-07 13:50:48 UTC (rev 6247)
@@ -85,7 +85,14 @@
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${core.dir}/src/test-framework"/>
+ <fileset dir="${core.dir}/src/test-framework">
+ <include name="ant-import/**"/>
+ <include name="etc/**"/>
+ <include name="java/**/jaxws/samples/**"/>
+ <include name="java/**/jaxws/smoke/**"/>
+ <include name="resources/jaxws/samples/**"/>
+ <include name="resources/jaxws/smoke/**"/>
+ </fileset>
<fileset dir="${core.dir}/src/test">
<include name="resources/test-excludes-*.txt"/>
<include name="etc/log4j.xml"/>
16 years, 9 months
JBossWS SVN: r6246 - stack/cxf/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:29:25 -0400 (Mon, 07 Apr 2008)
New Revision: 6246
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:29:05 UTC (rev 6245)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:29:25 UTC (rev 6246)
@@ -2,6 +2,13 @@
# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $
#
+# Won't Fix: [CXF-1261] Handler does not see XOP message properly
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
+# [JBAS-5055] Failed to load users/passwords/role files
+org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.*
+org/jboss/test/ws/jaxws/jbws1840/**
+
# [JBWS-1774] Provide tools implementation for CXF
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
@@ -42,7 +49,7 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
-# Won't Fix: [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
-
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:29:05 UTC (rev 6245)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:29:25 UTC (rev 6246)
@@ -2,6 +2,9 @@
# $Id$
#
+# Won't Fix: [CXF-1261] Handler does not see XOP message properly
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
+
# [JBWS-1774] Provide tools implementation for CXF
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
@@ -46,10 +49,11 @@
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
-# Won't Fix: [CXF-1261] Handler does not see XOP message properly
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*
-
# TODO: Fix classpath to ClientLauncher
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
+
16 years, 9 months
JBossWS SVN: r6245 - stack/metro/trunk/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-07 09:29:05 -0400 (Mon, 07 Apr 2008)
New Revision: 6245
Modified:
stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[JBWS-2107] Resolve dependency on @SecurityDomain
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:23:23 UTC (rev 6244)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-07 13:29:05 UTC (rev 6245)
@@ -23,3 +23,8 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
+
Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:23:23 UTC (rev 6244)
+++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-07 13:29:05 UTC (rev 6245)
@@ -31,3 +31,7 @@
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+# [JBWS-2107] Resolve dependency on @SecurityDomain
+org/jboss/test/ws/jaxws/webserviceref/Secure**
+org/jboss/test/ws/jaxws/jbws1840/**
+
16 years, 9 months