JBossWS SVN: r14236 - common/trunk/src/main/java/org/jboss/wsf/common/invocation.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-05-04 02:55:01 -0400 (Wed, 04 May 2011)
New Revision: 14236
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java
Log:
improving performance - use double-checked locking to prevent unnecessary synchronization
Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2011-05-04 05:48:45 UTC (rev 14235)
+++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2011-05-04 06:55:01 UTC (rev 14236)
@@ -41,7 +41,7 @@
private static final String POJO_JNDI_PREFIX = "java:comp/env/";
- private boolean initialized;
+ private volatile boolean initialized;
/**
* Constructor.
@@ -51,13 +51,19 @@
super();
}
- private synchronized void init(final Endpoint endpoint, final Invocation invocation)
+ private void init(final Endpoint endpoint, final Invocation invocation)
throws Exception
{
- if (!this.initialized)
+ if (!initialized)
{
- this.onEndpointInstantiated(endpoint, invocation);
- this.initialized = true;
+ synchronized(this)
+ {
+ if (!initialized)
+ {
+ onEndpointInstantiated(endpoint, invocation);
+ initialized = true;
+ }
+ }
}
}
14 years, 6 months
JBossWS SVN: r14235 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-05-04 01:48:45 -0400 (Wed, 04 May 2011)
New Revision: 14235
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java
Log:
[JBPAPP-5597]:Updated the test case
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2011-05-04 05:45:45 UTC (rev 14234)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpoint.java 2011-05-04 05:48:45 UTC (rev 14235)
@@ -26,14 +26,9 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.Style;
-import javax.xml.ws.BindingType;
-import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING;
-
@WebService(name = "SOAPEndpoint", targetNamespace = "http://org.jboss.ws/jaxws/binding")
@SOAPBinding(style = Style.RPC)
-
-@BindingType(SOAP12HTTP_BINDING)
public interface SOAPEndpoint
{
public String namespace();
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2011-05-04 05:45:45 UTC (rev 14234)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.java 2011-05-04 05:48:45 UTC (rev 14235)
@@ -23,11 +23,14 @@
// $Id: $
+import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING;
+
import javax.annotation.Resource;
import javax.jws.WebService;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingType;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.handler.soap.SOAPMessageContext;
@@ -36,6 +39,7 @@
@WebService(name="SOAPEndpoint", targetNamespace="http://org.jboss.ws/jaxws/binding",
endpointInterface = "org.jboss.test.ws.jaxws.binding.SOAPEndpoint")
+@BindingType(SOAP12HTTP_BINDING)
public class SOAPEndpointBean implements SOAPEndpoint
{
private static Logger log = Logger.getLogger(SOAPEndpointBean.class);
14 years, 6 months
JBossWS SVN: r14234 - framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-05-04 01:45:45 -0400 (Wed, 04 May 2011)
New Revision: 14234
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java
framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java
Log:
[JBPAPP-5597]:Updated the test case
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java 2011-05-03 16:56:10 UTC (rev 14233)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java 2011-05-04 05:45:45 UTC (rev 14234)
@@ -23,11 +23,9 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.BindingType;
@WebService(targetNamespace = "http://org.jboss.ws/xop/doclit")
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
public interface MTOMEndpoint
{
public DHResponse echoDataHandler(DHRequest request);
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2011-05-03 16:56:10 UTC (rev 14233)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2011-05-04 05:45:45 UTC (rev 14234)
@@ -25,11 +25,13 @@
import javax.activation.DataHandler;
import javax.jws.WebService;
+import javax.xml.ws.BindingType;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Logger;
@WebService(name = "MTOMEndpoint", serviceName = "MTOMService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint")
+@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true")
public class MTOMEndpointBean implements MTOMEndpoint
{
private Logger log = Logger.getLogger(MTOMEndpointBean.class);
14 years, 6 months
JBossWS SVN: r14233 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 12:56:10 -0400 (Tue, 03 May 2011)
New Revision: 14233
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java
Log:
Using constants
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2011-05-03 16:55:15 UTC (rev 14232)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2011-05-03 16:56:10 UTC (rev 14233)
@@ -26,6 +26,7 @@
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.metadata.config.CommonConfig;
/**
* Native servlet configuration helper
@@ -47,8 +48,8 @@
public static void initEndpointConfig(ServletConfig servletConfig, Endpoint endpoint)
{
final ServletContext servletContext = servletConfig.getServletContext();
- final String configName = servletContext.getInitParameter("jbossws-config-name");
- final String configFile = servletContext.getInitParameter("jbossws-config-file");
+ final String configName = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_NAME);
+ final String configFile = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_FILE);
if (configName != null || configFile != null)
{
14 years, 6 months
JBossWS SVN: r14232 - spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 12:55:15 -0400 (Tue, 03 May 2011)
New Revision: 14232
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java
Log:
Adding constants
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java 2011-05-03 15:59:46 UTC (rev 14231)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/config/CommonConfig.java 2011-05-03 16:55:15 UTC (rev 14232)
@@ -35,6 +35,9 @@
*/
public interface CommonConfig
{
+ public static final String JBOSSWS_CONFIG_FILE = "jbossws-config-file";
+ public static final String JBOSSWS_CONFIG_NAME = "jbossws-config-name";
+
public List<UnifiedHandlerChainMetaData> getPostHandlerChains();
public void setPostHandlerChains(List<UnifiedHandlerChainMetaData> postHandlerChain);
14 years, 6 months
JBossWS SVN: r14231 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 11:59:46 -0400 (Tue, 03 May 2011)
New Revision: 14231
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
Updating comment
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-05-03 15:40:38 UTC (rev 14230)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-05-03 15:59:46 UTC (rev 14231)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -22,7 +22,6 @@
package org.jboss.wsf.stack.cxf.metadata;
import java.io.IOException;
-import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
@@ -315,7 +314,7 @@
{
throw new RuntimeException("Could not find " + configFile);
}
- //TODO!! use default endpoint configuration as a fallback
+ //TODO [JBWS-3286] use default endpoint configuration as a fallback
}
/**
14 years, 6 months
JBossWS SVN: r14229 - in thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src: main/java/org/apache/cxf/ws/policy/mtom and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-05-03 11:14:05 -0400 (Tue, 03 May 2011)
New Revision: 14229
Modified:
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
Log:
[JBPAPP-6440] fix cxf policy ref issues
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -131,7 +131,7 @@
if (null != bmi) {
policy = policy.merge(engine.getAggregatedMessagePolicy(bmi));
}
- policy = (Policy)policy.normalize(true);
+ policy = (Policy)policy.normalize(engine.getRegistry(), true);
return assertor;
}
@@ -140,7 +140,7 @@
policy = engine.getServerEndpointPolicy(ei, (Destination)null).getPolicy();
policy = policy.merge(engine.getAggregatedOperationPolicy(boi));
policy = policy.merge(engine.getAggregatedFaultPolicy(bfi));
- policy = (Policy)policy.normalize(true);
+ policy = (Policy)policy.normalize(engine.getRegistry(), true);
}
void chooseAlternative(PolicyEngineImpl engine, Assertor assertor) {
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicyImpl.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -88,8 +88,17 @@
public EndpointPolicy updatePolicy(Policy p) {
EndpointPolicyImpl epi = createEndpointPolicy();
- Policy np = (Policy)p.normalize(true);
- epi.setPolicy(getPolicy().merge(np));
+
+ if (!PolicyUtils.isEmptyPolicy(p)) {
+ Policy normalizedPolicy
+ = (Policy)p.normalize(engine == null ? null : engine.getRegistry(), true);
+ epi.setPolicy(getPolicy().merge(normalizedPolicy));
+ } else {
+ Policy clonedPolicy = new Policy();
+ clonedPolicy.addPolicyComponents(getPolicy().getPolicyComponents());
+ epi.setPolicy(clonedPolicy);
+ }
+
epi.checkExactlyOnes();
epi.finalizeConfig();
return epi;
@@ -141,7 +150,8 @@
policy = engine.getAggregatedServicePolicy(ei.getService());
policy = policy.merge(engine.getAggregatedEndpointPolicy(ei));
if (!policy.isEmpty()) {
- policy = (Policy)policy.normalize(true);
+ policy = (Policy)policy.normalize(engine == null ? null : engine.getRegistry(),
+ true);
}
}
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -28,6 +28,7 @@
import org.apache.cxf.ws.policy.builder.primitive.NestedPrimitiveAssertion;
import org.apache.neethi.Assertion;
import org.apache.neethi.Constants;
+import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyOperator;
@@ -42,6 +43,45 @@
}
/**
+ * Checks if a given policy contains no policy components
+ * or if it has only empty ExactlyOne or All components
+ * containing no assertions
+ *
+ * @param p the policy
+ * @return true if the policy is empty
+ */
+ public static boolean isEmptyPolicy(Policy p) {
+
+ return isEmptyPolicyOperator(p);
+ }
+
+ /**
+ * Checks if a given policy operator has no policy components
+ * or if it has only empty ExactlyOne or All components
+ * containing no assertions
+ *
+ * @param p the policy operator
+ * @return true if this policy operator is empty
+ */
+ public static boolean isEmptyPolicyOperator(PolicyOperator p) {
+
+ if (p.isEmpty()) {
+ return true;
+ }
+
+ List components = p.getPolicyComponents();
+
+ for (Object component : components) {
+ if (!(component instanceof PolicyOperator)
+ || !isEmptyPolicyOperator((PolicyOperator)component)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
* Determine if a collection of assertions contains a given assertion, using
* the equal method from the Assertion interface.
*
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/mtom/MTOMPolicyInterceptor.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -23,6 +23,7 @@
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.ws.policy.AssertionInfo;
@@ -40,13 +41,18 @@
if (aim != null) {
Collection<AssertionInfo> ais = aim.get(MetadataConstants.MTOM_ASSERTION_QNAME);
for (AssertionInfo ai : ais) {
-
- // set mtom enabled and assert the policy if we find an mtom request
- String contentType = (String)message.getExchange().getInMessage()
- .get(Message.CONTENT_TYPE);
- if (contentType != null && contentType.contains("type=\"application/xop+xml\"")) {
+ if (MessageUtils.isRequestor(message)) {
+ //just turn on MTOM
+ message.put(Message.MTOM_ENABLED, Boolean.TRUE);
ai.setAsserted(true);
- message.put(Message.MTOM_ENABLED, Boolean.TRUE);
+ } else {
+ // set mtom enabled and assert the policy if we find an mtom request
+ String contentType = (String)message.getExchange().getInMessage()
+ .get(Message.CONTENT_TYPE);
+ if (contentType != null && contentType.contains("type=\"application/xop+xml\"")) {
+ ai.setAsserted(true);
+ message.put(Message.MTOM_ENABLED, Boolean.TRUE);
+ }
}
}
}
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EffectivePolicyImplTest.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -191,7 +191,7 @@
Policy mp = control.createMock(Policy.class);
EasyMock.expect(engine.getAggregatedMessagePolicy(bmi)).andReturn(mp);
EasyMock.expect(merged.merge(mp)).andReturn(merged);
- EasyMock.expect(merged.normalize(true)).andReturn(merged);
+ EasyMock.expect(merged.normalize(null, true)).andReturn(merged);
control.replay();
EffectivePolicyImpl epi = new EffectivePolicyImpl();
@@ -219,7 +219,7 @@
Policy fp = control.createMock(Policy.class);
EasyMock.expect(engine.getAggregatedFaultPolicy(bfi)).andReturn(fp);
EasyMock.expect(merged.merge(fp)).andReturn(merged);
- EasyMock.expect(merged.normalize(true)).andReturn(merged);
+ EasyMock.expect(merged.normalize(null, true)).andReturn(merged);
control.replay();
EffectivePolicyImpl epi = new EffectivePolicyImpl();
Modified: thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java 2011-05-03 14:13:08 UTC (rev 14228)
+++ thirdparty/cxf/branches/cxf-2.2.6-patch-01_JBPAPP-6440/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyImplTest.java 2011-05-03 15:14:05 UTC (rev 14229)
@@ -131,7 +131,7 @@
EasyMock.expect(engine.getAggregatedEndpointPolicy(ei)).andReturn(ep);
Policy merged = control.createMock(Policy.class);
EasyMock.expect(sp.merge(ep)).andReturn(merged);
- EasyMock.expect(merged.normalize(true)).andReturn(merged);
+ EasyMock.expect(merged.normalize(null, true)).andReturn(merged);
control.replay();
EndpointPolicyImpl epi = new EndpointPolicyImpl(ei, engine, true, null);
@@ -189,7 +189,7 @@
p2.addAssertion(mockAssertion(aqn2, 5, true));
control.replay();
- epi.setPolicy((Policy)p1.normalize(true));
+ epi.setPolicy((Policy)p1.normalize(null, true));
Policy ep = epi.updatePolicy(p2).getPolicy();
14 years, 6 months
JBossWS SVN: r14228 - spi/trunk/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 10:13:08 -0400 (Tue, 03 May 2011)
New Revision: 14228
Modified:
spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd
Log:
[JBWS-3282] Reference javaee 6 schema instead of 5 one
Modified: spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd
===================================================================
--- spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd 2011-05-03 14:01:23 UTC (rev 14227)
+++ spi/trunk/src/main/resources/schema/jbossws-jaxws-config_4_0.xsd 2011-05-03 14:13:08 UTC (rev 14228)
@@ -13,12 +13,12 @@
<xsd:documentation>
<![CDATA[
This is the schema definition for JBossWS JAXWS configurations.
- It relies on the handler definitions that are part of the standard J2EE-1.5 deployment descriptors.
+ It relies on the handler definitions that are part of the standard JavaEE 6 deployment descriptors.
]]>
</xsd:documentation>
</xsd:annotation>
- <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_web_services_1_2.xsd"/>
+ <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/javaee_6.xsd"/>
<xsd:element name="jaxws-config" type="tns:jaxwsConfigType"/>
<xsd:complexType name="jaxwsConfigType">
14 years, 6 months
JBossWS SVN: r14227 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-05-03 10:01:23 -0400 (Tue, 03 May 2011)
New Revision: 14227
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
[JBWS-3285] Removing ws-rm impl remainings
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2011-05-03 10:51:38 UTC (rev 14226)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2011-05-03 14:01:23 UTC (rev 14227)
@@ -834,7 +834,7 @@
if (config == null)
{
// No base configuration.
- initEndpointConfigMetaData(ecmd, null);
+ initEndpointConfigMetaData(ecmd);
config = ecmd.getConfig();
}
@@ -884,7 +884,7 @@
ecmd.setConfigName(configName);
ecmd.setConfigFile(configFile);
- initEndpointConfigMetaData(ecmd, configMetaData);
+ initEndpointConfigMetaData(ecmd);
return ecmd;
}
@@ -892,19 +892,15 @@
public void initEndpointConfig()
{
EndpointConfigMetaData ecmd = getEndpointConfigMetaData();
- // At the time this method is called initialisation may have already happened
- // always take the current ECMD as a base in case there is anything to backup.
- initEndpointConfigMetaData(ecmd, ecmd);
+ initEndpointConfigMetaData(ecmd);
}
/**
- * Initialise the toInitialise EndpointConfigMeta but first backup the RM Meta Data from
- * the base EndpointConfigMetaData.
+ * Initialise the EndpointConfigMeta.
*
* @param toInitialise - The EndpointConfigMetaData to initialise.
- * @param base - The base EndpointConfigMetaData to take the RMMD from.
*/
- private void initEndpointConfigMetaData(EndpointConfigMetaData toInitialise, EndpointConfigMetaData base)
+ private void initEndpointConfigMetaData(EndpointConfigMetaData toInitialise)
{
String configName = toInitialise.getConfigName();
String configFile = toInitialise.getConfigFile();
14 years, 6 months