JBossWS SVN: r14204 - shared-testsuite/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-27 04:41:02 -0400 (Wed, 27 Apr 2011)
New Revision: 14204
Added:
shared-testsuite/tags/jbossws-shared-testsuite-4.0.0.Alpha2/
Log:
Tagging jbossws-shared-testsuite-4.0.0.Alpha2
13 years
JBossWS SVN: r14203 - in stack/cxf/branches/cxf24/modules: resources/src/main/resources/modules/org/apache/cxf/main and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-27 04:27:34 -0400 (Wed, 27 Apr 2011)
New Revision: 14203
Added:
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/
Removed:
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/commons/xmlschema/
Modified:
stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml
stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Updating modules to use xmlschema-core 2.0
Modified: stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-27 08:27:34 UTC (rev 14203)
@@ -61,7 +61,6 @@
<include>org.jboss.ws:jbossws-spi:jar</include>
<include>org.apache.neethi:neethi:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
- <!-- <include>org.apache.ws.commons.schema:XmlSchema:jar</include> -->
<include>org.apache.ws.xmlschema:xmlschema-core:jar</include>
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-27 08:27:34 UTC (rev 14203)
@@ -42,7 +42,7 @@
<module name="javax.xml.ws.api" />
<module name="org.apache.neethi" />
<module name="org.apache.velocity" />
- <module name="org.apache.ws.commons.xmlschema" />
+ <module name="org.apache.ws.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
<module name="org.springframework.spring" optional="true"/>
Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/commons/xmlschema/main/module.xml 2011-04-26 12:48:58 UTC (rev 14199)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml 2011-04-27 08:27:34 UTC (rev 14203)
@@ -22,7 +22,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.commons.xmlschema">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.xmlschema">
<resources>
<!-- Insert resources here -->
Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-27 08:27:34 UTC (rev 14203)
@@ -382,7 +382,7 @@
<include name="**/neethi.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/apache/ws/commons/xmlschema/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/xmlschema-core.jar"/>
</fileset>
13 years
JBossWS SVN: r14202 - in stack/cxf/branches/cxf24/modules: testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 17:48:29 -0400 (Tue, 26 Apr 2011)
New Revision: 14202
Modified:
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java
stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
Log:
Updating UT callback handlers to WSS4J 1.6
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-04-26 14:14:15 UTC (rev 14201)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2011-04-26 21:48:29 UTC (rev 14202)
@@ -25,6 +25,7 @@
import java.security.Principal;
import java.util.Calendar;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import javax.security.auth.Subject;
@@ -69,7 +70,7 @@
public SubjectCreatingInterceptor()
{
- this(Collections.<String, Object> emptyMap());
+ this(new HashMap<String, Object>());
}
public SubjectCreatingInterceptor(Map<String, Object> properties)
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-04-26 14:14:15 UTC (rev 14201)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/CustomSubjectCreatingInterceptor.java 2011-04-26 21:48:29 UTC (rev 14202)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse;
-import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.jboss.wsf.stack.cxf.security.authentication.SubjectCreatingInterceptor;
import org.picketbox.config.PicketBoxConfiguration;
import org.picketbox.exceptions.ConfigurationStreamNullException;
@@ -39,7 +41,7 @@
public CustomSubjectCreatingInterceptor()
{
- super(Collections.<String, Object> singletonMap("action", "UsernameToken"));
+ super(getInitMap());
}
public void setSecurityConfigFile(String configFilePath)
@@ -62,5 +64,10 @@
}
}
-
+ private static Map<String, Object> getInitMap()
+ {
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("action", "UsernameToken");
+ return map;
+ }
}
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-04-26 14:14:15 UTC (rev 14201)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2011-04-26 21:48:29 UTC (rev 14202)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.
*
@@ -33,7 +33,10 @@
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback)callbacks[0];
- if (!("kermit".equals(pc.getIdentifier()) && "thefrog".equals(pc.getPassword())))
- throw new SecurityException("User '" + pc.getIdentifier() + "' with password '" + pc.getPassword() + "' not allowed.");
+ //this CallbackHandler is meant for use with WSS4J 1.6, see http://ws.apache.org/wss4j/wss4j16.html
+ if ("kermit".equals(pc.getIdentifier()))
+ {
+ pc.setPassword("thefrog");
+ }
}
}
13 years
JBossWS SVN: r14201 - in stack/cxf/branches/cxf24/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 10:14:15 -0400 (Tue, 26 Apr 2011)
New Revision: 14201
Modified:
stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
Log:
Cleanup
Modified: stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-26 14:10:04 UTC (rev 14200)
+++ stack/cxf/branches/cxf24/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2011-04-26 14:14:15 UTC (rev 14201)
@@ -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.
*
@@ -21,40 +21,13 @@
*/
package org.jboss.wsf.stack.cxf.client.configuration;
-//import java.lang.ref.WeakReference;
-//import java.util.Collection;
import java.util.HashMap;
-//import java.util.LinkedList;
import java.util.Map;
-//import javax.xml.bind.JAXBException;
-//import javax.xml.namespace.QName;
-
import org.apache.cxf.Bus;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
import org.apache.cxf.configuration.Configurer;
-//import org.apache.cxf.ws.addressing.Names;
-//import org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder;
-//import org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider;
-//import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
-//import org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl;
-//import org.apache.cxf.ws.policy.PolicyBuilder;
-//import org.apache.cxf.ws.policy.PolicyBuilderImpl;
-//import org.apache.cxf.ws.policy.PolicyEngine;
-//import org.apache.cxf.ws.policy.PolicyEngineImpl;
-//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
-//import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl;
-//import org.apache.cxf.ws.policy.PolicyProvider;
-//import org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider;
-//import org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry;
-//import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
-//import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
-//import org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder;
-//import org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider;
-//import org.apache.cxf.ws.rm.RMManager;
-//import org.apache.cxf.ws.rm.policy.RMAssertionBuilder;
-//import org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider;
import org.jboss.wsf.stack.cxf.client.ProviderImpl;
/**
@@ -77,8 +50,6 @@
extensions.put(Configurer.class, new JBossWSNonSpringConfigurer(new BeanCustomizer()));
}
-// preparePolicyEngine(extensions);
-
//Explicitly ask for the ProviderImpl.class.getClassLoader() to be used for getting
//cxf bus extensions (as that classloader is the jaxws-client module one which 'sees' all
//extensions, unless different dependencies are explicitly set)
@@ -88,75 +59,5 @@
initializeBus(bus);
bus.initialize();
return bus;
-
-// initPolicyEngine((PolicyEngineImpl)extensions.get(PolicyEngine.class), bus);
-//
-// possiblySetDefaultBus(bus);
-// initializeBus(bus);
-// return bus;
}
-
-// @SuppressWarnings("rawtypes")
-// private static void preparePolicyEngine(Map<Class, Object> extensions)
-// {
-// PolicyEngineImpl engine = new PolicyEngineImpl(true);
-// extensions.put(PolicyEngine.class, engine);
-// DomainExpressionBuilderRegistry domainExpBuilderRegistry = new DomainExpressionBuilderRegistry();
-// extensions.put(DomainExpressionBuilderRegistry.class, domainExpBuilderRegistry);
-// }
-//
-// private static void initPolicyEngine(PolicyEngineImpl engine, Bus bus)
-// {
-// engine.setBus(bus);
-// AssertionBuilderRegistry assertionBuilderRegistry = new AssertionBuilderRegistryImpl(bus);
-// PolicyInterceptorProviderRegistry policyInterceptorProviderRegistry = new PolicyInterceptorProviderRegistryImpl(bus);
-// PolicyBuilderImpl policyBuilder = new PolicyBuilderImpl();
-// policyBuilder.setBus(bus);
-// policyBuilder.setAssertionBuilderRegistry(assertionBuilderRegistry);
-// bus.setExtension(policyBuilder, PolicyBuilder.class);
-// Collection<PolicyProvider> policyProviders = engine.getPolicyProviders();
-// Wsdl11AttachmentPolicyProvider wsdl11PolicyAttachmentProvider = new Wsdl11AttachmentPolicyProvider(bus);
-// wsdl11PolicyAttachmentProvider.setBuilder(policyBuilder);
-// wsdl11PolicyAttachmentProvider.setRegistry(engine.getRegistry());
-// policyProviders.add(wsdl11PolicyAttachmentProvider);
-// ServiceModelPolicyProvider serviceModelPolicyProvider = new ServiceModelPolicyProvider(bus);
-// serviceModelPolicyProvider.setBuilder(policyBuilder);
-// serviceModelPolicyProvider.setRegistry(engine.getRegistry());
-// policyProviders.add(serviceModelPolicyProvider);
-//
-// //MTOM Policy
-// assertionBuilderRegistry.register(new MTOMAssertionBuilder());
-// policyInterceptorProviderRegistry.register(new MTOMPolicyInterceptorProvider());
-//
-// //RM
-// RMManager rmManager = new RMManager();
-// rmManager.init(bus);
-//
-// //RM Policy
-// policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus));
-// try
-// {
-// assertionBuilderRegistry.register(new RMAssertionBuilder());
-// }
-// catch (JAXBException e)
-// {
-// throw new RuntimeException(e);
-// }
-//
-// //Addressing Policy
-// policyInterceptorProviderRegistry.register(new AddressingPolicyInterceptorProvider());
-// assertionBuilderRegistry.register(new AddressingAssertionBuilder(bus));
-// Collection<QName> addressingKnownEls = new LinkedList<QName>();
-// addressingKnownEls.add(new QName("http://schemas.xmlsoap.org/ws/2004/08/addressing/policy", Names.WSAW_USING_ADDRESSING_NAME));
-// addressingKnownEls.add(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD, Names.WSAW_USING_ADDRESSING_NAME));
-// addressingKnownEls.add(Names.WSAW_USING_ADDRESSING_QNAME);
-// PrimitiveAssertionBuilder primitiveAssertionBuilder = new PrimitiveAssertionBuilder(addressingKnownEls);
-// primitiveAssertionBuilder.setBus(bus);
-// assertionBuilderRegistry.register(primitiveAssertionBuilder);
-// }
-//
-// @Override
-// protected void initializeBus(Bus bus) {
-// super.initializeBus(bus);
-// }
}
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-26 14:10:04 UTC (rev 14200)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-26 14:14:15 UTC (rev 14201)
@@ -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.
*
@@ -33,10 +33,7 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.transport.servlet.AbstractHTTPServlet;
-//import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-//import org.apache.cxf.transport.servlet.ServletController;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
@@ -54,12 +51,6 @@
protected Endpoint endpoint;
protected Bus bus;
-// private ServletController createServletController(ServletConfig servletConfig)
-// {
-// ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
-// return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
-// }
-
@Override
public void init(ServletConfig sc) throws ServletException {
super.init(sc);
@@ -87,11 +78,6 @@
//update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
- //TODO!!! replaceDestinationFactory();
-// //set up the ServletController as the CXF servlet would have done
-// controller = createServletController(servletConfig);
-// //set the controller in the servlet context now that the bus has been configured in the servlet
-// servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
}
@Override
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-26 14:10:04 UTC (rev 14200)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-26 14:14:15 UTC (rev 14201)
@@ -21,24 +21,7 @@
*/
package org.jboss.wsf.stack.cxf;
-//import java.io.IOException;
-//
-//import javax.servlet.ServletConfig;
-//import javax.servlet.ServletContext;
-//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//
-//import org.apache.cxf.BusFactory;
-//import org.apache.cxf.resource.ResourceManager;
-//import org.apache.cxf.transport.servlet.CXFServlet;
-//import org.apache.cxf.transport.servlet.ServletContextResourceResolver;
-//import org.apache.cxf.transport.servlet.ServletController;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
-//import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.ServletDelegate;
-//import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-//import org.jboss.wsf.stack.cxf.transport.ServletHelper;
/**
* An extension to the CXF servlet
@@ -48,97 +31,7 @@
*
* @since 21-Apr-2007
*/
-//public class CXFServletExt extends CXFServlet implements ServletDelegate
public class CXFServletExt extends CXFNonSpringServletExt implements ServletDelegate
{
-// protected Endpoint endpoint;
-//
-// private ServletController createServletController(ServletConfig servletConfig)
-// {
-// ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
-// return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
-// }
-//
-// @Override
-// public void loadBus(ServletConfig servletConfig) throws ServletException
-// {
-// //Init the Endpoint
-// endpoint = ServletHelper.initEndpoint(servletConfig, getServletName());
-//
-// //keep the bus created during deployment and update it with the information coming from the servlet config
-// updateAvailableBusWithServletInfo(servletConfig);
-//
-// //register the InstrumentManagementImpl
-// ServletHelper.registerInstrumentManger(bus, getServletContext());
-// }
-//
-// private void updateAvailableBusWithServletInfo(ServletConfig servletConfig)
-// {
-// BusHolder holder = endpoint.getService().getDeployment().getAttachment(BusHolder.class);
-// //set the bus from deployment into the CXF servlet and assign it to the current thread (do not touch the default bus!)
-// bus = holder.getBus();
-// BusFactory.setThreadDefaultBus(bus);
-// //update the resource manager adding the ServletContextResourceResolver that was to be added by CXF servlet
-// ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
-// resourceManager.addResourceResolver(new ServletContextResourceResolver(servletConfig.getServletContext()));
-// replaceDestinationFactory();
-// //set up the ServletController as the CXF servlet would have done
-// controller = createServletController(servletConfig);
-// //set the controller in the servlet context now that the bus has been configured in the servlet
-// servletConfig.getServletContext().setAttribute(ServletController.class.getName(), getController());
-// }
-//
-// @Override
-// protected void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException
-// {
-// ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
-// }
-//
-// @Override
-// public void destroy()
-// {
-// ServletHelper.callPreDestroy(endpoint);
-// }
-//
-// @Override
-// public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doHead(request, response);
-// }
-//
-// @Override
-// public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doGet(request, response);
-// }
-//
-// @Override
-// public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doPost(request, response);
-// }
-//
-// @Override
-// public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doPut(request, response);
-// }
-//
-// @Override
-// public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.doDelete(request, response);
-// }
-//
-// @Override
-// public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-// throws ServletException, IOException
-// {
-// this.service(request, response);
-// }
+
}
Modified: stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-26 14:10:04 UTC (rev 14200)
+++ stack/cxf/branches/cxf24/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2011-04-26 14:14:15 UTC (rev 14201)
@@ -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.
*
@@ -32,11 +32,8 @@
import org.apache.cxf.bus.spring.BusApplicationContext;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceResolver;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.HTTPTransportFactory;
import org.apache.cxf.transport.http.HttpDestinationFactory;
import org.apache.cxf.transport.servlet.ServletDestinationFactory;
-//import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.apache.ws.security.WSSConfig;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.binding.BindingCustomization;
13 years
JBossWS SVN: r14200 - stack/cxf/branches/cxf24.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 10:10:04 -0400 (Tue, 26 Apr 2011)
New Revision: 14200
Modified:
stack/cxf/branches/cxf24/pom.xml
Log:
Moving to cxf 2.4.1-SNAPSHOT
Modified: stack/cxf/branches/cxf24/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
+++ stack/cxf/branches/cxf24/pom.xml 2011-04-26 14:10:04 UTC (rev 14200)
@@ -57,7 +57,7 @@
-->
<!-- END -->
<jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version>
- <cxf.version>2.4.0</cxf.version>
+ <cxf.version>2.4.1-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
13 years
JBossWS SVN: r14199 - in stack/cxf/branches/cxf24: modules/addons and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 08:48:58 -0400 (Tue, 26 Apr 2011)
New Revision: 14199
Modified:
stack/cxf/branches/cxf24/modules/addons/pom.xml
stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/cxf24/modules/client/pom.xml
stack/cxf/branches/cxf24/modules/dist/management/pom.xml
stack/cxf/branches/cxf24/modules/dist/pom.xml
stack/cxf/branches/cxf24/modules/endorsed/pom.xml
stack/cxf/branches/cxf24/modules/resources/pom.xml
stack/cxf/branches/cxf24/modules/server/pom.xml
stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/cxf24/modules/testsuite/pom.xml
stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/cxf24/pom.xml
Log:
Updating poms
Modified: stack/cxf/branches/cxf24/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/addons/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/addons/transports/http/httpserver/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/dist/management/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/dist/management/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<!-- Build -->
Modified: stack/cxf/branches/cxf24/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/dist/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/dist/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -4,12 +4,12 @@
<name>JBoss Web Services - Stack CXF Distrubiton</name>
<artifactId>jbossws-cxf-dist</artifactId>
<packaging>pom</packaging>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/endorsed/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/endorsed/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/resources/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/server/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/server/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-spring-tests/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/testsuite/cxf-tests/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/modules/testsuite/shared-tests/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/cxf24/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
+++ stack/cxf/branches/cxf24/pom.xml 2011-04-26 12:48:58 UTC (rev 14199)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS CXF stack</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years
JBossWS SVN: r14198 - hudson/branches/jbossws-cxf-4.0.0.Alpha5.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 08:20:47 -0400 (Tue, 26 Apr 2011)
New Revision: 14198
Modified:
hudson/branches/jbossws-cxf-4.0.0.Alpha5/pom.xml
Log:
Updating pom
Modified: hudson/branches/jbossws-cxf-4.0.0.Alpha5/pom.xml
===================================================================
--- hudson/branches/jbossws-cxf-4.0.0.Alpha5/pom.xml 2011-04-26 12:17:25 UTC (rev 14197)
+++ hudson/branches/jbossws-cxf-4.0.0.Alpha5/pom.xml 2011-04-26 12:20:47 UTC (rev 14198)
@@ -20,7 +20,7 @@
<artifactId>jbossws-hudson</artifactId>
<packaging>pom</packaging>
<description>JBossWS Hudson Integration</description>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.Alpha5-SNAPSHOT</version>
<!-- Parent -->
<parent>
13 years
JBossWS SVN: r14197 - hudson/branches/jbossws-cxf-4.0.0.Alpha5.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 08:17:25 -0400 (Tue, 26 Apr 2011)
New Revision: 14197
Modified:
hudson/branches/jbossws-cxf-4.0.0.Alpha5/ant.properties.example
Log:
Updating config
Modified: hudson/branches/jbossws-cxf-4.0.0.Alpha5/ant.properties.example
===================================================================
--- hudson/branches/jbossws-cxf-4.0.0.Alpha5/ant.properties.example 2011-04-26 12:15:34 UTC (rev 14196)
+++ hudson/branches/jbossws-cxf-4.0.0.Alpha5/ant.properties.example 2011-04-26 12:17:25 UTC (rev 14197)
@@ -19,15 +19,15 @@
hudson.http.port=8180
hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk
-hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
+hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/cxf24
hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.Final
hudson.jboss600.build=jboss-6.0.0.Final
hudson.jboss600.rev=HEAD
-hudson.jboss700.url=https://github.com/jbossas/jboss-as
+hudson.jboss700.url=https://github.com/asoldano/jboss-as
hudson.jboss700.build=jboss-7.0.0.Beta4-SNAPSHOT
-hudson.jboss700.rev=master
+hudson.jboss700.rev=wsintegration
hudson.mail.recipients=
hudson.smtp.host=localhost
13 years
JBossWS SVN: r14196 - hudson/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-26 08:15:34 -0400 (Tue, 26 Apr 2011)
New Revision: 14196
Added:
hudson/branches/jbossws-cxf-4.0.0.Alpha5/
Log:
Branching for testing before jbossws-cxf-4.0.0.Alpha5
13 years