10:43 a.m.
Author: richard.opalka(a)jboss.com
Date: 2008-05-27 04:43:52 -0400 (Tue, 27 May 2008)
New Revision: 7181
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2174] fixed issue, [EJBTHREE-1323] not valid anymore, [JBWS-2194] excluding test
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
---
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-26
16:04:42 UTC (rev 7180)
+++
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-27
08:43:52 UTC (rev 7181)
@@ -25,10 +25,14 @@
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -208,6 +212,41 @@
}
// put cxf config URL to the property map
contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
+
+ if (dep.getType() == DeploymentType.JAXWS_EJB3)
+ {
+ // put cxf config URL to generated web app context params
+ JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
+ if (jbwmd != null)
+ {
+ boolean alreadySet = false;
+ List<ParamValueMetaData> ctxParams = jbwmd.getContextParams();
+ if (ctxParams == null)
+ {
+ ctxParams = new ArrayList<ParamValueMetaData>();
+ jbwmd.setContextParams(ctxParams);
+ }
+
+ if (ctxParams.size() > 0)
+ {
+ for (ParamValueMetaData pvmd : ctxParams)
+ {
+ if (pvmd.getParamName().equals(CXFServletExt.PARAM_CXF_BEANS_URL))
+ {
+ alreadySet = true;
+ }
+ }
+ }
+
+ if (false == alreadySet)
+ {
+ ParamValueMetaData pvmd = new ParamValueMetaData();
+ pvmd.setParamName(CXFServletExt.PARAM_CXF_BEANS_URL);
+ pvmd.setParamValue(cxfURL.toExternalForm());
+ ctxParams.add(pvmd);
+ }
+ }
+ }
}
}
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-26 16:04:42 UTC
(rev 7180)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-27 08:43:52 UTC
(rev 7181)
@@ -110,14 +110,6 @@
org/jboss/test/ws/console/**
org/jboss/test/ws/jaxws/jbws1611/**
-# [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/webserviceref/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-
# [JBWS-2165] Fix xop tests with maven build
org/jboss/test/ws/jaxws/samples/xop/**
@@ -128,12 +120,5 @@
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
-# [JBWS-2174] Cannot Obtain Destination for Request
-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/**
+# [JBWS-2194] request requires HTTP authentication: Unauthorized
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.*