JBossWS SVN: r19066 - in stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2014-11-04 02:42:06 -0500 (Tue, 04 Nov 2014)
New Revision: 19066
Added:
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestEjbTestCase.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/jaxws-endpoint-config.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService_schema1.xsd
Modified:
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml
Log:
[BZ1157539][JBWS-3843] EJB3 Web Service returns Invalid User on parallel invocations
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -42,6 +42,7 @@
import java.lang.reflect.Method;
import java.util.List;
+import javax.security.auth.callback.CallbackHandler;
import javax.xml.ws.WebServiceContext;
import org.apache.cxf.Bus;
@@ -56,6 +57,7 @@
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.invoker.MethodDispatcher;
import org.apache.cxf.service.model.BindingOperationInfo;
+import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
import org.jboss.ws.api.util.ServiceLoader;
import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -126,7 +128,31 @@
} else if (o != null) {
params = new MessageContentsList(o);
}
- return invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop), exchange, params), params);
+ if (factory != null)
+ {
+ targetBean = this.getServiceObject(exchange);
+ }
+
+ //[JBWS-3843] workaround: set the CallbackHandler threadlocal again; as a matter of fact, if that's in the Exchange,
+ //DIGEST auth is being used and that will cause the EJB layer to re-do authentication because of the bug
+ CallbackHandler cbHandler = exchange.getInMessage().get(CallbackHandler.class);
+ Object obj = null;
+ try
+ {
+ if (cbHandler != null)
+ {
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(cbHandler);
+ }
+ obj = invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop), exchange, params), params);
+ }
+ finally
+ {
+ if (cbHandler != null)
+ {
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
+ }
+ }
+ return obj;
}
/**
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AutenticationMgrSubjectCreatingInterceptor.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -72,7 +72,7 @@
throw Messages.MESSAGES.unsupportedTokenType(token.getTokenType());
}
UsernameToken ut = (UsernameToken) token;
- subject = helper.createSubject(authenticationManger, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
+ subject = helper.createSubject(authenticationManger, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime(), message);
}
else
@@ -83,7 +83,7 @@
throw Messages.MESSAGES.couldNotGetSubjectInfo();
}
WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p;
- subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
+ subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime(), message);
}
Principal principal = getPrincipal(context.getUserPrincipal(), subject);
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -104,7 +104,7 @@
UsernameToken ut = (UsernameToken)token;
Subject subject = createSubject(ut.getName(), ut.getPassword(), ut.isHashed(),
- ut.getNonce(), ut.getCreatedTime());
+ ut.getNonce(), ut.getCreatedTime(), msg);
SecurityContext sc = doCreateSecurityContext(context.getUserPrincipal(), subject);
msg.put(SecurityContext.class, sc);
@@ -152,7 +152,7 @@
Subject subject = null;
try
{
- subject = createSubject(name, password, isDigest, nonce, created);
+ subject = createSubject(name, password, isDigest, nonce, created, msg);
}
catch (Exception ex)
{
@@ -240,9 +240,9 @@
}
- public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
+ public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created, Message msg)
{
- return helper.createSubject(sdc.get(), name, password, isDigest, nonce, created);
+ return helper.createSubject(sdc.get(), name, password, isDigest, nonce, created, msg);
}
public void setPropagateContext(boolean propagateContext)
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -81,7 +81,7 @@
throw Messages.MESSAGES.unsupportedTokenType(token.getTokenType());
}
UsernameToken ut = (UsernameToken) token;
- subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime());
+ subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime(), message);
}
else
@@ -92,19 +92,19 @@
throw Messages.MESSAGES.couldNotGetSubjectInfo();
}
WSUsernameTokenPrincipal up = (WSUsernameTokenPrincipal) p;
- subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime());
+ subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime(), message);
}
Principal principal = getPrincipal(context.getUserPrincipal(), subject);
message.put(SecurityContext.class, createSecurityContext(principal, subject));
}
- protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime)
+ protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime, Message msg)
{
Subject subject = null;
try
{
- subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime);
+ subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime, msg);
}
catch (Exception ex)
{
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -34,6 +34,7 @@
import javax.security.auth.callback.CallbackHandler;
import org.apache.cxf.common.security.SimplePrincipal;
+import org.apache.cxf.message.Message;
import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler;
import org.jboss.security.plugins.JBossAuthenticationManager;
import org.jboss.ws.common.utils.DelegateClassLoader;
@@ -62,7 +63,7 @@
private boolean decodeNonce = true;
- public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, String nonce, String created)
+ public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, String nonce, String created, Message msg)
{
if (isDigest)
{
@@ -75,6 +76,7 @@
CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce);
CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
+ msg.put(CallbackHandler.class, handler);
}
// authenticate and populate Subject
@@ -126,7 +128,7 @@
return subject;
}
//TODO:refactor this
- public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, String nonce, String created)
+ public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, String nonce, String created, Message msg)
{
if (isDigest)
{
@@ -139,6 +141,7 @@
CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce);
CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
+ msg.put(CallbackHandler.class, handler);
}
// authenticate and populate Subject
Added: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestEjbTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestEjbTestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestEjbTestCase.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -0,0 +1,175 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, 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.
+ *
+ * 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.samples.wsse.policy.jaas;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.ws.security.SecurityConstants;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback;
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
+
+/**
+ * WS-Security Policy username ejb endpoint test case leveraging JAAS container integration and using digest passwords.
+ * WS-SecurityPolicy 1.2 used for policies in the included wsdl contract.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @author <a href="mailto:ema@redhat.com"/>Jim Ma<a>
+ * @since 26-May-2011
+ */
+public final class UsernameAuthorizationDigestEjbTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-username-jaas-ejb-digest/SecurityService/EJBServiceImpl";
+ private QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
+
+ public static BaseDeployment<?>[] createDeployments()
+ {
+ List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
+ list.add(new JBossWSTestHelper.JarDeployment("jaxws-samples-wsse-policy-username-jaas-ejb-digest.jar") {
+ { //[JBWS-3843] workaround: add org.jboss.as.webservices.server.integration dependency to load UsernameTokenCallback for UsernamePasswordLoginModule
+ // This dependency should actually never be set for a user deployment, being it an internal server thing. To be properly replaced after changes in PicketBox.
+ archive
+ .setManifest(new StringAsset("Manifest-Version: 1.0\n" + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.jboss.as.webservices.server.integration\n"))
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.EJBServiceImpl.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.ServiceIface.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMe.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.GreetMeResponse.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHello.class)
+ .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.jaxws.SayHelloResponse.class)
+ .addAsManifestResource(
+ new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/jaxws-endpoint-config.xml"),
+ "jaxws-endpoint-config.xml")
+ .addAsManifestResource(
+ new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl"),
+ "wsdl/SecurityService.wsdl")
+ .addAsManifestResource(
+ new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService_schema1.xsd"),
+ "wsdl/SecurityService_schema1.xsd");
+ }
+ });
+ return list.toArray(new BaseDeployment<?>[list.size()]);
+ }
+
+ public static Test suite()
+ {
+ JBossWSCXFTestSetup testSetup;
+ testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestEjbTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
+ Map<String, String> authenticationOptions = new HashMap<String, String>();
+ authenticationOptions.put("usersProperties", getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath());
+ authenticationOptions.put("rolesProperties", getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath());
+ authenticationOptions.put("hashAlgorithm", "SHA");
+ authenticationOptions.put("hashEncoding", "BASE64");
+ authenticationOptions.put("hashCharset", "UTF-8");
+ authenticationOptions.put("hashUserPassword", "false");
+ authenticationOptions.put("hashStorePassword", "true");
+ authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName());
+ authenticationOptions.put("unauthenticatedIdentity", "anonymous");
+ testSetup.addSecurityDomainRequirement("JBossWS", authenticationOptions);
+ return testSetup;
+ }
+
+ public void test() throws Exception
+ {
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "kermit");
+ assertEquals("Secure Hello World!", proxy.sayHello());
+ }
+
+ //JBWS-3843
+ public void testConcurrent() throws Exception
+ {
+ ExecutorService executor = Executors.newFixedThreadPool(20);
+
+ List<Callable<String>> taskList = new ArrayList<Callable<String>>();
+ for (int i = 0; i < 20; i++)
+ {
+ taskList.add(new TestRunner());
+ }
+ List<Future<String>> resultList = executor.invokeAll(taskList);
+ boolean passed = true;
+ for (Future<String> future : resultList)
+ {
+ passed = passed && future.get().equals("Secure Hello World!");
+ }
+ assertTrue("Unexpected response from concurrent invocation", passed);
+
+ }
+
+ public class TestRunner implements Callable<String>
+ {
+ public String call() throws Exception
+ {
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "kermit");
+ return proxy.sayHello();
+
+ }
+
+ }
+
+ public void testUnauthenticated() throws Exception
+ {
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy, "kermit");
+ try
+ {
+ proxy.greetMe();
+ fail("User kermit shouldn't be authenticated.");
+ }
+ catch (Exception e)
+ {
+ //OK
+ }
+ }
+
+ private void setupWsse(ServiceIface proxy, String username)
+ {
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.USERNAME, username);
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER,
+ "org.jboss.test.ws.jaxws.samples.wsse.policy.jaas.UsernameDigestPasswordCallback");
+ }
+}
Added: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/jaxws-endpoint-config.xml
===================================================================
(Binary files differ)
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/jaxws-endpoint-config.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl
===================================================================
(Binary files differ)
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService_schema1.xsd
===================================================================
(Binary files differ)
Property changes on: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService_schema1.xsd
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-11-04 07:42:06 UTC (rev 19066)
@@ -450,6 +450,21 @@
}
}
+ public static String writeToFile(BaseDeployment<?>... deps)
+ {
+ if (deps == null)
+ {
+ return "";
+ }
+ StringBuilder sb = new StringBuilder();
+ for (BaseDeployment<?> dep : deps)
+ {
+ sb.append(dep.writeToFile().getName());
+ sb.append(" ");
+ }
+ return sb.toString().trim();
+ }
+
public static abstract class WarDeployment extends BaseDeployment<WebArchive>
{
public WarDeployment(String name)
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml 2014-11-03 09:17:20 UTC (rev 19065)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml 2014-11-04 07:42:06 UTC (rev 19066)
@@ -69,7 +69,7 @@
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly801.version>8.0.1.Final-SNAPSHOT</wildfly801.version>
<ejb.api.version>1.0.2.Final</ejb.api.version>
- <cxf.version>2.7.10</cxf.version>
+ <cxf.version>2.7.11.redhat-3</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -175,6 +175,21 @@
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>2.7.11-redhat-3-bz-1157539</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf.version}</version>
<exclusions>
10 years, 1 month
- 1
- 0
JBossWS SVN: r19065 - in common/trunk/src: main/java/org/jboss/ws/common/deployment and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-11-03 04:17:20 -0500 (Mon, 03 Nov 2014)
New Revision: 19065
Modified:
common/trunk/src/main/java/org/jboss/ws/common/Loggers.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java
Log:
[JBWS-3797]:Compute host and port with virtualHost value from @WebContext in EndpointAddressDeploymentAspect
Modified: common/trunk/src/main/java/org/jboss/ws/common/Loggers.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-11-03 09:15:42 UTC (rev 19064)
+++ common/trunk/src/main/java/org/jboss/ws/common/Loggers.java 2014-11-03 09:17:20 UTC (rev 19065)
@@ -222,4 +222,12 @@
@LogMessage(level = TRACE)
@Message(id = 22116, value = "Could not find %s in the additional metadatafiles")
void cannotFindInAdditionalMetaData(String resourcePath);
+
+ @LogMessage(level = WARN)
+ @Message(id = 22118, value = "Cannot obtain host for vituralHost %s, use default host")
+ void cannotObtainHost(String host);
+
+ @LogMessage(level = WARN)
+ @Message(id = 22119, value = "Cannot obtain port for vituralHost %s, use default port")
+ void cannotObtainPort(String host);
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-11-03 09:15:42 UTC (rev 19064)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAddressDeploymentAspect.java 2014-11-03 09:17:20 UTC (rev 19065)
@@ -31,6 +31,7 @@
import java.util.Map;
import org.jboss.ws.api.annotation.WebContext;
+import org.jboss.ws.common.Loggers;
import org.jboss.ws.common.Messages;
import org.jboss.ws.common.integration.AbstractDeploymentAspect;
import org.jboss.ws.common.management.AbstractServerConfig;
@@ -82,7 +83,20 @@
boolean confidential = isConfidentialTransportGuarantee(dep, ep);
int currentPort = port.getValue(confidential);
String hostAndPort = host + (currentPort > 0 ? ":" + currentPort : "");
-
+ if (ep.getService().getVirtualHost() != null)
+ {
+ String hostName = getServerConfig().getHostAlias(ep.getService().getVirtualHost());
+ if (hostName == null) {
+ Loggers.DEPLOYMENT_LOGGER.cannotObtainHost(ep.getService().getVirtualHost());
+ hostName = host;
+ }
+ Integer hostPort = getServerConfig().getVirtualHostPort(ep.getService().getVirtualHost(), confidential);
+ if (hostPort == null) {
+ Loggers.DEPLOYMENT_LOGGER.cannotObtainPort(ep.getService().getVirtualHost());
+ hostPort = currentPort;
+ }
+ hostAndPort = hostName + ":" + hostPort;
+ }
HttpEndpoint httpEp = (HttpEndpoint)ep;
String urlPattern = httpEp.getURLPattern();
if (urlPattern == null)
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-11-03 09:15:42 UTC (rev 19064)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2014-11-03 09:17:20 UTC (rev 19065)
@@ -428,6 +428,15 @@
return endpointConfigStore.getConfig(name);
}
+ public Integer getVirtualHostPort(String hostname, boolean secure)
+ {
+ return null;
+ }
+
+ public String getHostAlias(String virtualHost)
+ {
+ return virtualHost;
+ }
private static void checkPermission(final Permission permission)
{
SecurityManager securityManager = System.getSecurityManager();
Modified: common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java
===================================================================
--- common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-11-03 09:15:42 UTC (rev 19064)
+++ common/trunk/src/test/java/org/jboss/test/ws/common/management/AbstractServerConfigTestCase.java 2014-11-03 09:17:20 UTC (rev 19065)
@@ -57,6 +57,15 @@
{
return null;
}
+ public Integer getVirtualHostPort(String virtualHost, boolean secure)
+ {
+ return null;
+ }
+
+ public String getHostAlias(String host)
+ {
+ return host;
+ }
};
//test default value
10 years, 1 month
- 1
- 0
JBossWS SVN: r19064 - spi/trunk/src/main/java/org/jboss/wsf/spi/management.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2014-11-03 04:15:42 -0500 (Mon, 03 Nov 2014)
New Revision: 19064
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
Log:
[JBWS-3797]:Add ServerConfig api to support @WebContext(virtualHost=...)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-11-03 05:21:46 UTC (rev 19063)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2014-11-03 09:15:42 UTC (rev 19064)
@@ -130,4 +130,18 @@
* @return
*/
EndpointConfig getEndpointConfig(String name);
+ /**
+ * Get port for virtual host, if there are many ports found only return the first found
+ * @param virtualHost virtual host name
+ * @param secure if get the secure port
+ * @return port value for virtual host
+ */
+ Integer getVirtualHostPort(String virtualHost, boolean secure);
+
+ /**
+ * Get host alias which DNS can resolve
+ * @param virtualHost virtual host name
+ * @return host alias name
+ */
+ String getHostAlias(String virtualHost);
}
10 years, 1 month
- 1
- 0
JBossWS SVN: r19063 - in stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539: modules/addons and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: klape
Date: 2014-11-03 00:21:46 -0500 (Mon, 03 Nov 2014)
New Revision: 19063
Modified:
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/undertow/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/udp/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/jaspi/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/pom.xml
stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml
Log:
productization pom updates
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Add-ons</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -21,4 +21,5 @@
<module>transports/udp</module>
</modules>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/httpserver/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/httpserver/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF httpserver transport</name>
@@ -8,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -100,4 +101,5 @@
</dependency>
</dependencies>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/undertow/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/undertow/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/http/undertow/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Undertow http transport</name>
@@ -8,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -89,4 +90,5 @@
</dependency>
</dependencies>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/udp/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/addons/transports/udp/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF UDP transport</name>
@@ -8,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,4 +34,5 @@
</dependency>
</dependencies>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/client/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/client/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Runtime Client</name>
@@ -8,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -345,4 +346,5 @@
</profile>
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/dist/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/dist/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Distribution</name>
@@ -8,13 +9,10 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
@@ -197,15 +195,15 @@
<phase>validate</phase>
<configuration>
<target>
- <mkdir dir="${basedir}/target/exclude-file" />
+ <mkdir dir="${basedir}/target/exclude-file"></mkdir>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt">
- <param name="targetName" expression="jboss720" />
+ <param name="targetName" expression="jboss720"></param>
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly800.txt">
- <param name="targetName" expression="wildfly800" />
+ <param name="targetName" expression="wildfly800"></param>
</xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly801.txt">
- <param name="targetName" expression="wildfly801" />
+ <param name="targetName" expression="wildfly801"></param>
</xslt>
</target>
</configuration>
@@ -352,4 +350,5 @@
</build>
</profile>
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/endorsed/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/endorsed/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Endorsed factories</name>
@@ -9,8 +10,9 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/jaspi/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/jaspi/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/jaspi/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF JASPI</name>
@@ -9,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -110,4 +111,5 @@
</profile>
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/resources/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/resources/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Resources</name>
@@ -9,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,7 +36,7 @@
<configuration>
<target>
<ant antfile="src/main/scripts/zip-other-configs.xml">
- <property name="project.build.finalName" value="${project.build.finalName}" />
+ <property name="project.build.finalName" value="${project.build.finalName}"></property>
</ant>
</target>
</configuration>
@@ -81,4 +82,5 @@
</plugin>
</plugins>
</build>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/server/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Server</name>
@@ -9,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -281,7 +282,7 @@
</goals>
<configuration>
<target>
- <ant antfile="src/main/scripts/antrun-beans-config.xml" />
+ <ant antfile="src/main/scripts/antrun-beans-config.xml"></ant>
</target>
</configuration>
</execution>
@@ -335,4 +336,5 @@
</profile>
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-spring-tests/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-spring-tests/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Spring Tests</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -87,10 +87,10 @@
</goals>
<configuration>
<target>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
- <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/>
+ <property name="tests.output.dir" value="${project.build.directory}"></property>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"></property>
+ <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"></ant>
+ <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"></ant>
</target>
</configuration>
</execution>
@@ -125,4 +125,5 @@
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/cxf-tests/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Specific Tests</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -79,10 +79,10 @@
</goals>
<configuration>
<target>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
- <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <property name="tests.output.dir" value="${project.build.directory}"></property>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"></property>
+ <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"></ant>
+ <ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws"></ant>
</target>
</configuration>
</execution>
@@ -222,4 +222,5 @@
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Testsuite</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -259,8 +259,7 @@
</goals>
<configuration>
<skip>false</skip>
- <excludes combine.children="append">
- </excludes>
+ <excludes combine.children="append"></excludes>
<includes>
<include>**/*Test.java</include>
<include>**/*TestCase.java</include>
@@ -530,7 +529,7 @@
</property>
</activation>
<properties>
- <surefire.jvm.management.args> </surefire.jvm.management.args>
+ <surefire.jvm.management.args></surefire.jvm.management.args>
</properties>
</profile>
@@ -1014,10 +1013,11 @@
</property>
</activation>
<properties>
- <surefire.default-mgmt-serurity.args> </surefire.default-mgmt-serurity.args>
+ <surefire.default-mgmt-serurity.args></surefire.default-mgmt-serurity.args>
</properties>
</profile>
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/shared-tests/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/shared-tests/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack Agnostic Tests</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -62,14 +62,14 @@
</goals>
<configuration>
<target>
- <property name="maven.test.classpath" refid="maven.test.classpath"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <property name="project.version" value="${project.version}"/>
- <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" />
- <property name="log4j.output.dir" value="${log4j.output.dir}"/>
- <property name="endorsed.dir" value="${project.build.directory}/endorsed"/>
- <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/>
+ <property name="maven.test.classpath" refid="maven.test.classpath"></property>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"></property>
+ <property name="tests.output.dir" value="${project.build.directory}"></property>
+ <property name="project.version" value="${project.version}"></property>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"></property>
+ <property name="log4j.output.dir" value="${log4j.output.dir}"></property>
+ <property name="endorsed.dir" value="${project.build.directory}/endorsed"></property>
+ <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"></ant>
</target>
</configuration>
</execution>
@@ -80,17 +80,17 @@
</goals>
<configuration>
<target>
- <property name="maven.test.classpath" refid="maven.test.classpath"/>
- <property name="tests.resources.dir" value="${basedir}/src/test/resources"/>
- <property name="tests.output.dir" value="${project.build.directory}"/>
- <property name="project.version" value="${project.version}"/>
- <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/>
- <property name="log4j.output.dir" value="${log4j.output.dir}"/>
- <property name="endorsed.dir" value="${project.build.directory}/endorsed"/>
- <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
- <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
+ <property name="maven.test.classpath" refid="maven.test.classpath"></property>
+ <property name="tests.resources.dir" value="${basedir}/src/test/resources"></property>
+ <property name="tests.output.dir" value="${project.build.directory}"></property>
+ <property name="project.version" value="${project.version}"></property>
+ <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"></property>
+ <property name="log4j.output.dir" value="${log4j.output.dir}"></property>
+ <property name="endorsed.dir" value="${project.build.directory}/endorsed"></property>
+ <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"></ant>
+ <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"></ant>
+ <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"></ant>
+ <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"></ant>
</target>
</configuration>
</execution>
@@ -102,13 +102,7 @@
</goals>
<configuration>
<target>
- <copy
- file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml"
- tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
- failonerror="false"
- verbose="true"
- overwrite="true"
- />
+ <copy file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true" overwrite="true"></copy>
</target>
</configuration>
</execution>
@@ -143,4 +137,5 @@
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/modules/testsuite/test-utils/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF Test utils</name>
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -54,4 +54,5 @@
</plugins>
</build>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
Modified: stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml 2014-10-31 15:22:27 UTC (rev 19062)
+++ stack/cxf/branches/jbossws-cxf-4.3.0.Final-BZ1157539/pom.xml 2014-11-03 05:21:46 UTC (rev 19063)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -21,8 +20,7 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>JBoss Web Services - Stack CXF</name>
@@ -32,7 +30,7 @@
<description>JBossWS CXF stack</description>
- <version>4.3.0.Final</version>
+ <version>4.3.0.Final-redhat-bz-1157539</version>
<!-- Parent -->
<parent>
@@ -1346,10 +1344,10 @@
</goals>
<configuration>
<target>
- <echo />
- <echo message="profile=${jbossws.integration.target}" />
- <echo message="jboss.home=${jboss.home}" />
- <echo />
+ <echo></echo>
+ <echo message="profile=${jbossws.integration.target}"></echo>
+ <echo message="jboss.home=${jboss.home}"></echo>
+ <echo></echo>
</target>
</configuration>
</execution>
@@ -1480,7 +1478,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -1494,7 +1492,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
<pluginExecution>
@@ -1507,7 +1505,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
@@ -1521,4 +1519,5 @@
</profiles>
+<!-- Modified by POM Artifact-Version Manipulator version 1.3.6-redhat-4-eap (0b19b14) -->
</project>
10 years, 1 month
- 1
- 0