JBossWS SVN: r12565 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: configuration and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-07-01 13:39:42 -0400 (Thu, 01 Jul 2010)
New Revision: 12565
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
[JBWS-3078] : some formatting fixes
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -46,26 +46,27 @@
public class CXFNonSpringServletExt extends CXFNonSpringServlet
{
protected Endpoint endpoint;
-
+
@Override
public ServletController createServletController(ServletConfig servletConfig)
{
- ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory();
+ ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
}
-
+
@Override
- public void loadBus(ServletConfig servletConfig) throws ServletException {
+ 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);
@@ -81,7 +82,7 @@
//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
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -49,7 +49,7 @@
@Override
public ServletController createServletController(ServletConfig servletConfig)
{
- ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory();
+ ServletTransportFactory stf = (ServletTransportFactory) createServletTransportFactory();
return new ServletControllerExt(stf, servletConfig, servletConfig.getServletContext(), bus);
}
@@ -58,14 +58,14 @@
{
//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);
@@ -87,6 +87,5 @@
{
ServletHelper.callRequestHandler(req, res, getServletContext(), getBus(), endpoint);
}
-
-
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -95,8 +95,8 @@
* @param depEndpoints The list of deployment endpoints
* @return The new jbossws cxf configurer
*/
- public abstract Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher,
- List<Endpoint> depEndpoints);
+ public abstract Configurer createServerConfigurer(BindingCustomization customization,
+ WSDLFilePublisher wsdlPublisher, List<Endpoint> depEndpoints);
protected static void setInterceptors(Bus bus)
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -53,8 +53,9 @@
public class NonSpringBusHolder extends BusHolder
{
private boolean configured = false;
+
protected DDBeans metadata;
-
+
public NonSpringBusHolder(DDBeans metadata)
{
super();
@@ -64,11 +65,12 @@
ExtensionManager em = bus.getExtension(ExtensionManager.class);
em.activateAllByType(ConduitInitiator.class); //need to activate/register all the beans implementing ConduitInitiator so that does not happen later
DestinationFactory factory = new ServletTransportFactory(bus);
- for (String s : factory.getTransportIds()) {
- registerTransport(factory, s);
+ for (String s : factory.getTransportIds())
+ {
+ registerTransport(factory, s);
}
}
-
+
/**
* Update the Bus held by the this instance using the provided parameters.
* This basically prepares the bus for being used with JBossWS.
@@ -85,11 +87,11 @@
throw new IllegalStateException("Underlying bus is already configured for JBossWS use!");
}
super.configure(soapTransportFactory, resolver, configurer);
-
+
for (DDEndpoint dde : metadata.getEndpoints())
{
EndpointImpl endpoint = new EndpointImpl(bus, newInstance(dde.getImplementor()));
- endpoint.setInvoker((Invoker)newInstance(dde.getInvoker()));
+ endpoint.setInvoker((Invoker) newInstance(dde.getInvoker()));
endpoint.setAddress(dde.getAddress());
endpoint.setEndpointName(dde.getPortName());
endpoint.setServiceName(dde.getServiceName());
@@ -104,7 +106,7 @@
}
configured = true;
}
-
+
private static Object newInstance(String className)
{
try
@@ -117,10 +119,10 @@
throw new RuntimeException(e);
}
}
-
+
@Override
public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher,
- List<Endpoint> depEndpoints)
+ List<Endpoint> depEndpoints)
{
ServerBeanCustomizer customizer = new ServerBeanCustomizer();
customizer.setBindingCustomization(customization);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -38,37 +38,38 @@
public class ServerBeanCustomizer extends BeanCustomizer
{
private WSDLFilePublisher wsdlPublisher;
+
private List<Endpoint> depEndpoints;
-
+
@Override
public void customize(Object beanInstance)
{
if (beanInstance instanceof EndpointImpl)
{
- configureEndpoint((EndpointImpl)beanInstance);
- }
+ configureEndpoint((EndpointImpl) beanInstance);
+ }
if (beanInstance instanceof ServerFactoryBean)
{
- ServerFactoryBean factory = (ServerFactoryBean)beanInstance;
-
- if (factory.getInvoker() instanceof AbstractInvoker)
- {
- ((AbstractInvoker)factory.getInvoker()).setTargetBean(factory.getServiceBean());
- }
- if (depEndpoints != null)
- {
- for (Endpoint depEndpoint : depEndpoints)
- {
- if (depEndpoint.getTargetBeanClass() == factory.getServiceBean().getClass())
- {
- depEndpoint.addAttachment(ServerFactoryBean.class, factory);
- }
- }
- }
+ ServerFactoryBean factory = (ServerFactoryBean) beanInstance;
+
+ if (factory.getInvoker() instanceof AbstractInvoker)
+ {
+ ((AbstractInvoker) factory.getInvoker()).setTargetBean(factory.getServiceBean());
+ }
+ if (depEndpoints != null)
+ {
+ for (Endpoint depEndpoint : depEndpoints)
+ {
+ if (depEndpoint.getTargetBeanClass() == factory.getServiceBean().getClass())
+ {
+ depEndpoint.addAttachment(ServerFactoryBean.class, factory);
+ }
+ }
+ }
}
super.customize(beanInstance);
}
-
+
protected void configureEndpoint(EndpointImpl endpoint)
{
//Configure wsdl file publisher
@@ -77,15 +78,15 @@
endpoint.setWsdlPublisher(wsdlPublisher);
}
}
-
+
public void setWsdlPublisher(WSDLFilePublisher wsdlPublisher)
{
this.wsdlPublisher = wsdlPublisher;
}
- public void setDeploymentEndpoints(List<Endpoint> endpoints)
+ public void setDeploymentEndpoints(List<Endpoint> endpoints)
{
- this.depEndpoints = endpoints;
+ this.depEndpoints = endpoints;
}
-
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -55,18 +55,22 @@
public class SpringBusHolder extends BusHolder
{
private static final Logger log = Logger.getLogger(BusHolder.class);
+
private boolean configured = false;
- protected BusApplicationContext ctx ;
+
+ protected BusApplicationContext ctx;
+
protected List<GenericApplicationContext> additionalCtx = new LinkedList<GenericApplicationContext>();
+
protected URL[] additionalLocations;
-
+
public SpringBusHolder(URL location, URL... additionalLocations)
{
super();
this.additionalLocations = additionalLocations;
createBus(location);
}
-
+
/**
* Creates the Bus using a SpringBusFactory with no specific Spring application context.
* Then loads additional configurations from the provided location
@@ -93,11 +97,12 @@
}
//Force servlet transport to prevent CXF from using Jetty as a transport
DestinationFactory factory = new ServletTransportFactory(bus);
- for (String s : factory.getTransportIds()) {
- registerTransport(factory, s);
+ for (String s : factory.getTransportIds())
+ {
+ registerTransport(factory, s);
}
}
-
+
/**
* Update the Bus held by the this instance using the provided parameters.
* This basically prepares the bus for being used with JBossWS.
@@ -130,10 +135,10 @@
}
configured = true;
}
-
+
@Override
public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher,
- List<Endpoint> depEndpoints)
+ List<Endpoint> depEndpoints)
{
ApplicationContext ctx = bus.getExtension(BusApplicationContext.class);
ServerBeanCustomizer customizer = new ServerBeanCustomizer();
@@ -144,10 +149,12 @@
serverConfigurer.setCustomizer(customizer);
return serverConfigurer;
}
-
- protected static GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl) throws IOException
+
+ protected static GenericApplicationContext loadAdditionalConfig(ApplicationContext ctx, URL locationUrl)
+ throws IOException
{
- if (locationUrl == null) throw new IllegalArgumentException("Cannot load additional config from null location!");
+ if (locationUrl == null)
+ throw new IllegalArgumentException("Cannot load additional config from null location!");
InputStream is = locationUrl.openStream();
GenericApplicationContext childCtx = new GenericApplicationContext(ctx);
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx);
@@ -157,7 +164,7 @@
childCtx.refresh();
return childCtx;
}
-
+
/**
* Performs close operations (currently implies destroying additional contexts)
*
@@ -171,7 +178,7 @@
}
super.close();
}
-
+
@Override
protected void setBus(Bus bus)
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationManagerLoader.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -41,12 +41,12 @@
{
Context ctx = new InitialContext();
Object obj = ctx.lookup("java:/comp/env/security/securityMgr");
- return (AuthenticationManager)obj;
+ return (AuthenticationManager) obj;
}
catch (NamingException ne)
{
throw new SecurityException("Unable to lookup AuthenticationManager using JNDI");
}
}
-
+
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -56,17 +56,23 @@
public class SubjectCreatingInterceptor extends AbstractUsernameTokenAuthenticatingInterceptor
{
private static final Logger log = Logger.getLogger(SubjectCreatingInterceptor.class);
+
private static final int TIMESTAMP_FRESHNESS_THRESHOLD = 300;
-
+
private AuthenticationManagerLoader aml;
+
private boolean propagateContext;
+
private SecurityAdaptorFactory secAdaptorFactory;
+
private int timestampThreshold = TIMESTAMP_FRESHNESS_THRESHOLD;
- private NonceStore nonceStore;
+
+ private NonceStore nonceStore;
+
private boolean decodeNonce = true;
private boolean supportDigestPasswords;
-
+
public SubjectCreatingInterceptor()
{
this(Collections.<String, Object> emptyMap());
@@ -93,50 +99,54 @@
// TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
// has a bug to do with handling digests; RequestData assumes PasswordDigest by default
@Override
- public void setSupportDigestPasswords(boolean support) {
- this.supportDigestPasswords = support;
- super.setSupportDigestPasswords(support);
+ public void setSupportDigestPasswords(boolean support)
+ {
+ this.supportDigestPasswords = support;
+ super.setSupportDigestPasswords(support);
}
-
+
// TODO : this code is a temporarily workaround; AbstractUsernameTokenAuthenticatingInterceptor
// has a bug to do with handling digests; RequestData assumes PasswordDigest by default
@Override
- protected CallbackHandler getCallback(RequestData reqData, int doAction)
- throws WSSecurityException {
-
- if (supportDigestPasswords) {
- return new CallbackHandler()
- {
- @Override
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
- {
- // dummy handler
- }
- };
- } else {
- return super.getCallback(reqData, doAction);
- }
+ protected CallbackHandler getCallback(RequestData reqData, int doAction) throws WSSecurityException
+ {
+
+ if (supportDigestPasswords)
+ {
+ return new CallbackHandler()
+ {
+ @Override
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
+ {
+ // dummy handler
+ }
+ };
+ }
+ else
+ {
+ return super.getCallback(reqData, doAction);
+ }
}
-
+
@Override
public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created)
{
- if (isDigest)
- {
- verifyUsernameToken(nonce, created);
- // It is not possible at the moment to figure out if the digest has been created
- // using the original nonce bytes or the bytes of the (Base64)-encoded nonce, some
- // legacy clients might use the (Base64)-encoded nonce bytes when creating a digest;
- // lets default to true and assume the nonce has been Base-64 encoded, given that
- // WSS4J client Base64-decodes the nonce before creating the digest
-
- CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce);
- CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
- }
-
- // authenticate and populate Subject
+ if (isDigest)
+ {
+ verifyUsernameToken(nonce, created);
+ // It is not possible at the moment to figure out if the digest has been created
+ // using the original nonce bytes or the bytes of the (Base64)-encoded nonce, some
+ // legacy clients might use the (Base64)-encoded nonce bytes when creating a digest;
+ // lets default to true and assume the nonce has been Base-64 encoded, given that
+ // WSS4J client Base64-decodes the nonce before creating the digest
+
+ CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce);
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(handler);
+ }
+
+ // authenticate and populate Subject
AuthenticationManager am = aml.getManager();
-
+
Principal principal = new SimplePrincipal(name);
Subject subject = new Subject();
@@ -144,34 +154,34 @@
if (TRACE)
log.trace("About to authenticate, using security domain '" + am.getSecurityDomain() + "'");
- try
+ try
{
- if (am.isValid(principal, password, subject) == false)
- {
- String msg = "Authentication failed, principal=" + principal.getName();
- log.error(msg);
- throw new SecurityException(msg);
- }
- }
- finally
+ if (am.isValid(principal, password, subject) == false)
+ {
+ String msg = "Authentication failed, principal=" + principal.getName();
+ log.error(msg);
+ throw new SecurityException(msg);
+ }
+ }
+ finally
{
- if (isDigest)
- {
- // does not remove the TL entry completely but limits the potential
- // growth to a number of available threads in a container
- CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
- }
+ if (isDigest)
+ {
+ // does not remove the TL entry completely but limits the potential
+ // growth to a number of available threads in a container
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
+ }
}
-
+
if (TRACE)
log.trace("Authenticated, principal=" + name);
- if (propagateContext)
+ if (propagateContext)
{
- SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
- adaptor.pushSubjectContext(subject, principal, password);
- if (TRACE)
- log.trace("Security Context has been propagated");
+ SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
+ adaptor.pushSubjectContext(subject, principal, password);
+ if (TRACE)
+ log.trace("Security Context has been propagated");
}
return subject;
}
@@ -190,25 +200,30 @@
if (nonce != null && nonceStore != null)
{
if (nonceStore.hasNonce(nonce))
- throw new SecurityException("Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
+ throw new SecurityException(
+ "Request rejected since a message with the same nonce has been recently received; nonce = " + nonce);
nonceStore.putNonce(nonce);
}
}
- public void setPropagateContext(boolean propagateContext) {
- this.propagateContext = propagateContext;
+ public void setPropagateContext(boolean propagateContext)
+ {
+ this.propagateContext = propagateContext;
}
-
- public void setTimestampThreshold(int timestampThreshold) {
- this.timestampThreshold = timestampThreshold;
+
+ public void setTimestampThreshold(int timestampThreshold)
+ {
+ this.timestampThreshold = timestampThreshold;
}
- public void setNonceStore(NonceStore nonceStore) {
- this.nonceStore = nonceStore;
+ public void setNonceStore(NonceStore nonceStore)
+ {
+ this.nonceStore = nonceStore;
}
- public void setDecodeNonce(boolean decodeNonce) {
- this.decodeNonce = decodeNonce;
+ public void setDecodeNonce(boolean decodeNonce)
+ {
+ this.decodeNonce = decodeNonce;
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallback.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -19,7 +19,7 @@
* 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.wsf.stack.cxf.security.authentication.callback;
+package org.jboss.wsf.stack.cxf.security.authentication.callback;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
@@ -41,9 +41,11 @@
public class UsernameTokenCallback implements DigestCallback
{
static final String NONCE = "nonce";
+
static final String CREATED = "created";
+
static final String DECODE_NONCE = "decodeNonce";
-
+
private MapCallback info;
@SuppressWarnings("unchecked")
@@ -51,7 +53,8 @@
{
// Ask for MapCallback to obtain the digest parameters
info = new MapCallback();
- Callback[] callbacks = { info };
+ Callback[] callbacks =
+ {info};
options.put("callbacks", callbacks);
}
@@ -59,15 +62,14 @@
{
try
{
- String nonce = (String)info.getInfo(NONCE);
+ String nonce = (String) info.getInfo(NONCE);
if (nonce != null)
{
- Boolean decodeNonce = (Boolean)info.getInfo(DECODE_NONCE);
- byte[] nonceBytes = decodeNonce ? org.jboss.util.Base64.decode(nonce)
- : nonce.getBytes("UTF-8");
+ Boolean decodeNonce = (Boolean) info.getInfo(DECODE_NONCE);
+ byte[] nonceBytes = decodeNonce ? org.jboss.util.Base64.decode(nonce) : nonce.getBytes("UTF-8");
digest.update(nonceBytes);
}
- String created = (String)info.getInfo(CREATED);
+ String created = (String) info.getInfo(CREATED);
if (created != null)
digest.update(created.getBytes("UTF-8"));
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/callback/UsernameTokenCallbackHandler.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -40,25 +40,27 @@
public class UsernameTokenCallbackHandler implements CallbackHandler
{
private String nonce;
+
private String created;
+
private boolean decodeNonce;
-
+
public UsernameTokenCallbackHandler(String nonce, String created, boolean decodeNonce)
{
this.created = created;
this.nonce = nonce;
this.decodeNonce = decodeNonce;
}
-
+
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
boolean foundCallback = false;
Callback firstUnknown = null;
int count = callbacks != null ? callbacks.length : 0;
- for(int n = 0; n < count; n ++)
+ for (int n = 0; n < count; n++)
{
Callback c = callbacks[n];
- if( c instanceof MapCallback )
+ if (c instanceof MapCallback)
{
//set parameters to the MapCallback the UsernameTokenCallback
//created and set up in the init method
@@ -68,13 +70,13 @@
mc.setInfo(UsernameTokenCallback.DECODE_NONCE, Boolean.valueOf(decodeNonce));
foundCallback = true;
}
- else if( firstUnknown == null )
+ else if (firstUnknown == null)
{
firstUnknown = c;
}
}
- if( foundCallback == false )
- throw new UnsupportedCallbackException(firstUnknown, "Unrecognized Callback");
+ if (foundCallback == false)
+ throw new UnsupportedCallbackException(firstUnknown, "Unrecognized Callback");
}
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/nonce/NonceStore.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -37,7 +37,7 @@
* @return True if the provided nonce has been recently put in the store
*/
public boolean hasNonce(String nonce);
-
+
/**
* Put the given nonce in the store.
*
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 17:14:50 UTC (rev 12564)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 17:39:42 UTC (rev 12565)
@@ -62,8 +62,8 @@
*/
public class ServletHelper
{
- public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
-
+ public static final String ENABLE_CXF_MANAGEMENT = "enable.cxf.management";
+
public static Endpoint initEndpoint(ServletConfig servletConfig, String servletName)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
@@ -73,7 +73,7 @@
String contextPath = context.getContextPath();
return initServiceEndpoint(epRegistry, contextPath, servletName);
}
-
+
/** Initialize the service endpoint
*/
private static Endpoint initServiceEndpoint(EndpointRegistry epRegistry, String contextPath, String servletName)
@@ -95,44 +95,46 @@
if (endpoint == null)
{
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + ","
- + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT
+ + "=" + contextPath + "," + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
//Inject the EJB and JNDI resources if possible
injectServiceAndHandlerResources(endpoint);
-
-
+
return endpoint;
}
-
- private static void injectServiceAndHandlerResources(Endpoint endpoint)
+
+ @SuppressWarnings("unchecked")
+ private static void injectServiceAndHandlerResources(Endpoint endpoint)
{
- ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
- if (factory != null)
- {
- InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class);
- Context jndiContext = endpoint.getJNDIContext();
- if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType()
- && factory.getServiceBean() != null)
- {
- InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext);
- InjectionHelper.callPostConstructMethod(factory.getServiceBean());
- }
- List<Handler> chain = ((JaxWsEndpointImpl)factory.getServer().getEndpoint()).getJaxwsBinding().getHandlerChain();
- if (chain != null)
- {
- for (Handler handler : chain)
- {
- InjectionHelper.injectResources(handler, metadata, jndiContext);
- InjectionHelper.callPostConstructMethod(handler);
- }
- }
- }
+ ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class);
+ if (factory != null)
+ {
+ InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class);
+ Context jndiContext = endpoint.getJNDIContext();
+ if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType()
+ && factory.getServiceBean() != null)
+ {
+ InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext);
+ InjectionHelper.callPostConstructMethod(factory.getServiceBean());
+ }
+ List<Handler> chain = ((JaxWsEndpointImpl) factory.getServer().getEndpoint()).getJaxwsBinding()
+ .getHandlerChain();
+ if (chain != null)
+ {
+ for (Handler handler : chain)
+ {
+ InjectionHelper.injectResources(handler, metadata, jndiContext);
+ InjectionHelper.callPostConstructMethod(handler);
+ }
+ }
+ }
}
-
- public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus, Endpoint endpoint) throws ServletException
+
+ public static void callRequestHandler(HttpServletRequest req, HttpServletResponse res, ServletContext ctx, Bus bus,
+ Endpoint endpoint) throws ServletException
{
try
{
@@ -143,7 +145,7 @@
//hence the interceptor, can span multiple invocation related to multiple
//endpoints)
EndpointAssociation.setEndpoint(endpoint);
- RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
+ RequestHandler requestHandler = (RequestHandler) endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, ctx);
}
catch (IOException ioe)
@@ -156,11 +158,13 @@
BusFactory.setThreadDefaultBus(null);
}
}
-
+
public static void registerInstrumentManger(Bus bus, ServletContext svCtx) throws ServletException
{
//TODO!! Jim, remove reflection use inside this by providing proper hook in CXF and move this configuration to BusHolder
- if (svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT) != null && "true".equalsIgnoreCase((String)svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT))) {
+ if (svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT) != null
+ && "true".equalsIgnoreCase((String) svCtx.getInitParameter(ENABLE_CXF_MANAGEMENT)))
+ {
InstrumentationManagerExtImpl instrumentationManagerImpl = new InstrumentationManagerExtImpl();
instrumentationManagerImpl.setBus(bus);
instrumentationManagerImpl.setEnabled(true);
@@ -174,9 +178,11 @@
try
{
- Method method = CounterRepository.class.getDeclaredMethod("registerInterceptorsToBus", new Class[] {});
+ Method method = CounterRepository.class.getDeclaredMethod("registerInterceptorsToBus", new Class[]
+ {});
method.setAccessible(true);
- method.invoke(couterRepository, new Object[] {});
+ method.invoke(couterRepository, new Object[]
+ {});
}
catch (Exception e)
{
13 years, 10 months
- 1
- 0
JBossWS SVN: r12564 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-07-01 13:14:50 -0400 (Thu, 01 Jul 2010)
New Revision: 12564
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
[JBWS-2596] Removing MetadataBuilder deployment type property
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 15:06:45 UTC (rev 12563)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 17:14:50 UTC (rev 12564)
@@ -53,7 +53,6 @@
*/
public class MetadataBuilder
{
- public static final String DEPLOYMENT_TYPE_PROPERTY = "deployment-type";
private static final Logger log = Logger.getLogger(MetadataBuilder.class);
public MetadataBuilder()
@@ -83,7 +82,6 @@
log.info("Add " + ddep);
dd.addEndpoint(ddep);
- ep.setProperty(DEPLOYMENT_TYPE_PROPERTY, depType);
}
return dd;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 15:06:45 UTC (rev 12563)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 17:14:50 UTC (rev 12564)
@@ -53,7 +53,6 @@
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
-import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
/**
*
@@ -115,7 +114,7 @@
{
InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class);
Context jndiContext = endpoint.getJNDIContext();
- if (DeploymentType.JAXWS_EJB3 != endpoint.getProperty(MetadataBuilder.DEPLOYMENT_TYPE_PROPERTY)
+ if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType()
&& factory.getServiceBean() != null)
{
InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext);
13 years, 10 months
- 1
- 0
JBossWS SVN: r12563 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: transport and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-07-01 11:06:45 -0400 (Thu, 01 Jul 2010)
New Revision: 12563
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
[JBWS-2596] Making sure only EJB handlers get the resources injected at the JBossCXF level
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 09:55:34 UTC (rev 12562)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2010-07-01 15:06:45 UTC (rev 12563)
@@ -53,6 +53,7 @@
*/
public class MetadataBuilder
{
+ public static final String DEPLOYMENT_TYPE_PROPERTY = "deployment-type";
private static final Logger log = Logger.getLogger(MetadataBuilder.class);
public MetadataBuilder()
@@ -82,6 +83,7 @@
log.info("Add " + ddep);
dd.addEndpoint(ddep);
+ ep.setProperty(DEPLOYMENT_TYPE_PROPERTY, depType);
}
return dd;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 09:55:34 UTC (rev 12562)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2010-07-01 15:06:45 UTC (rev 12563)
@@ -46,12 +46,14 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
+import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder;
/**
*
@@ -113,7 +115,8 @@
{
InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class);
Context jndiContext = endpoint.getJNDIContext();
- if (factory.getServiceBean() != null)
+ if (DeploymentType.JAXWS_EJB3 != endpoint.getProperty(MetadataBuilder.DEPLOYMENT_TYPE_PROPERTY)
+ && factory.getServiceBean() != null)
{
InjectionHelper.injectResources(factory.getServiceBean(), metadata, jndiContext);
InjectionHelper.callPostConstructMethod(factory.getServiceBean());
13 years, 10 months
- 1
- 0
JBossWS SVN: r12562 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 05:55:34 -0400 (Thu, 01 Jul 2010)
New Revision: 12562
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
Log:
Remove dependency of WSProviderPlugin on WSProviderTestCase, to simplify exclusions
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-07-01 09:35:34 UTC (rev 12561)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderPlugin.java 2010-07-01 09:55:34 UTC (rev 12562)
@@ -21,16 +21,6 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import org.jboss.ws.Constants;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.spi.tools.WSContractProvider;
-import org.jboss.wsf.test.JBossWSTest;
-import org.w3c.dom.Element;
-
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -40,6 +30,15 @@
import java.net.URL;
import java.net.URLClassLoader;
+import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -50,7 +49,7 @@
WSContractProvider provider;
// redirect tools message to System.out ?
- boolean toogleMessageOut = Boolean.getBoolean(WSProviderTestCase.class.getName()+".verbose");
+ boolean toogleMessageOut = Boolean.getBoolean(WSProviderPlugin.class.getName()+".verbose");
// relative to test execution
File outputDirectory;
13 years, 10 months
- 1
- 0
JBossWS SVN: r12561 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 05:35:34 -0400 (Thu, 01 Jul 2010)
New Revision: 12561
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[CXF-2852] Excluding tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-07-01 09:33:50 UTC (rev 12560)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-07-01 09:35:34 UTC (rev 12561)
@@ -17,6 +17,12 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2852] JavaToWs requires Spring
+org/jboss/test/ws/jaxws/jbws2528/**
+org/jboss/test/ws/jaxws/jbws2529/**
+org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.*
+org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-07-01 09:33:50 UTC (rev 12560)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-07-01 09:35:34 UTC (rev 12561)
@@ -17,6 +17,12 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2852] JavaToWs requires Spring
+org/jboss/test/ws/jaxws/jbws2528/**
+org/jboss/test/ws/jaxws/jbws2529/**
+org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.*
+org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-01 09:33:50 UTC (rev 12560)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-07-01 09:35:34 UTC (rev 12561)
@@ -17,6 +17,12 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2852] JavaToWs requires Spring
+org/jboss/test/ws/jaxws/jbws2528/**
+org/jboss/test/ws/jaxws/jbws2529/**
+org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.*
+org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-01 09:33:50 UTC (rev 12560)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-07-01 09:35:34 UTC (rev 12561)
@@ -17,6 +17,12 @@
# [CXF-2006] RespectBinding feature and not understood required extensibility elements
org/jboss/test/ws/jaxws/jbws2449/**
+# [CXF-2852] JavaToWs requires Spring
+org/jboss/test/ws/jaxws/jbws2528/**
+org/jboss/test/ws/jaxws/jbws2529/**
+org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.*
+org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.*
+
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
13 years, 10 months
- 1
- 0
JBossWS SVN: r12560 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 05:33:50 -0400 (Thu, 01 Jul 2010)
New Revision: 12560
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
Adding check on scripts availability
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 08:34:21 UTC (rev 12559)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 09:33:50 UTC (rev 12560)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
+import java.io.File;
+
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -34,7 +36,7 @@
*
* @author Heiko.Braun(a)jboss.com
*/
-public abstract class ScriptTestCase extends JBossWSTest
+public class ScriptTestCase extends JBossWSTest
{
protected static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
protected static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
@@ -47,7 +49,7 @@
protected String TEST_DIR;
protected String origJavaHome;
-
+
protected void setUp() throws Exception
{
super.setUp();
@@ -67,6 +69,16 @@
System.setProperty("java.home", JDK_HOME);
}
}
+
+ public void testScritpsAvailable()
+ {
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".sh").exists());
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists());
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists());
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".bat").exists());
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".sh").exists());
+ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".bat").exists());
+ }
protected void tearDown() throws Exception
{
13 years, 10 months
- 1
- 0
JBossWS SVN: r12559 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 04:34:21 -0400 (Thu, 01 Jul 2010)
New Revision: 12559
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
Log:
[JBWS-3073] Also add spring-aop.jar and spring-expression.jar to the scripts
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-01 07:52:57 UTC (rev 12558)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-01 08:34:21 UTC (rev 12559)
@@ -75,10 +75,12 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-aop.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-asm.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-01 07:52:57 UTC (rev 12558)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-01 08:34:21 UTC (rev 12559)
@@ -117,10 +117,12 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-aop.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-asm.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-beans.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-expression.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-impl.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-01 07:52:57 UTC (rev 12558)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-01 08:34:21 UTC (rev 12559)
@@ -96,10 +96,12 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-aop.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-asm.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-impl.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-01 07:52:57 UTC (rev 12558)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-01 08:34:21 UTC (rev 12559)
@@ -116,10 +116,12 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-aop.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-asm.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-beans.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-context.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-core.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-expression.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-impl.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
13 years, 10 months
- 1
- 0
JBossWS SVN: r12558 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 03:52:57 -0400 (Thu, 01 Jul 2010)
New Revision: 12558
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
Log:
[JBWS-3073] Fixing wsrunclient and wsprovide scripts to include spring-asm.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-01 07:42:38 UTC (rev 12557)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-07-01 07:52:57 UTC (rev 12558)
@@ -75,6 +75,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-asm.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-01 07:42:38 UTC (rev 12557)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-07-01 07:52:57 UTC (rev 12558)
@@ -117,6 +117,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-asm.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-beans.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-01 07:42:38 UTC (rev 12557)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-07-01 07:52:57 UTC (rev 12558)
@@ -96,6 +96,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-asm.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-01 07:42:38 UTC (rev 12557)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-07-01 07:52:57 UTC (rev 12558)
@@ -116,6 +116,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-asm.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-beans.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-context.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-core.jar"
13 years, 10 months
- 1
- 0
JBossWS SVN: r12557 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 03:42:38 -0400 (Thu, 01 Jul 2010)
New Revision: 12557
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
Split ScriptTestCase to be able to exclude just part of it
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 06:59:38 UTC (rev 12556)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.ws.jaxws.smoke.tools;
-import java.io.File;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -35,20 +34,19 @@
*
* @author Heiko.Braun(a)jboss.com
*/
-public class ScriptTestCase extends JBossWSTest
+public abstract class ScriptTestCase extends JBossWSTest
{
- private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
- private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
- private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
+ protected static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ protected static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ protected static final String EXT = ":".equals( PS ) ? ".sh" : ".bat";
- private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl";
- private String ENDPOINT_CLASS;
+ protected String ENDPOINT_CLASS;
- private String JBOSS_HOME;
- private String CLASSES_DIR;
- private String TEST_DIR;
+ protected String JBOSS_HOME;
+ protected String CLASSES_DIR;
+ protected String TEST_DIR;
- private String origJavaHome;
+ protected String origJavaHome;
protected void setUp() throws Exception
{
@@ -75,25 +73,4 @@
// reset surefire's JAVA_HOME
System.setProperty("java.home", origJavaHome);
}
-
- public void testWSConsumeFromCommandLine() throws Exception
- {
- // use absolute path for the output to be re-usable
- String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
- String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
- String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc;
- executeCommand(command, "wsconsume");
- File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "openuri" + FS + "_2004" + FS + "_04" + FS + "helloworld" + FS + "EndpointInterface.java");
- assertTrue("Service endpoint interface not generated", javaSource.exists());
- }
-
- public void testWSProvideFromCommandLine() throws Exception
- {
- String absOutput = new File(TEST_DIR, "wsprovide" + FS + "java").getAbsolutePath();
- String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
- executeCommand(command, "wsprovide");
- File javaSource = new File(TEST_DIR, "wsprovide" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS + "jaxws" + FS + "AddResponse.java");
- assertTrue("Response wrapper not generated", javaSource.exists());
- }
-
}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.smoke.tools;
+
+import java.io.File;
+
+/**
+ * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1793
+ *
+ * Test the wsprovide and wsconsume scripts that reside
+ * under JBOSS_HOME/bin. This basically verifies all dependencies are
+ * met to run the shell scripts.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ */
+public class WSConsumeScriptTestCase extends ScriptTestCase
+{
+ private String WSDL_LOCATION = "jaxws" + FS + "smoke" + FS + "tools" + FS + "wsdl" + FS + "TestServiceCatalog.wsdl";
+
+ public void testWSConsumeFromCommandLine() throws Exception
+ {
+ // use absolute path for the output to be re-usable
+ String absWsdlLoc = getResourceFile(WSDL_LOCATION).getAbsolutePath();
+ String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc;
+ executeCommand(command, "wsconsume");
+ File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "openuri" + FS + "_2004" + FS + "_04" + FS + "helloworld" + FS + "EndpointInterface.java");
+ assertTrue("Service endpoint interface not generated", javaSource.exists());
+ }
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumeScriptTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java 2010-07-01 07:42:38 UTC (rev 12557)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.smoke.tools;
+
+import java.io.File;
+
+/**
+ * [JBWS-1793] Provide a test case for the tools scripts that reside under JBOSS_HOME/bin
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1793
+ *
+ * Test the wsprovide and wsconsume scripts that reside
+ * under JBOSS_HOME/bin. This basically verifies all dependencies are
+ * met to run the shell scripts.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ */
+public class WSProvideScriptTestCase extends ScriptTestCase
+{
+
+ public void testWSProvideFromCommandLine() throws Exception
+ {
+ String absOutput = new File(TEST_DIR, "wsprovide" + FS + "java").getAbsolutePath();
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsprovide" + EXT + " -k -w -o " + absOutput + " --classpath " + CLASSES_DIR + " " + ENDPOINT_CLASS;
+ executeCommand(command, "wsprovide");
+ File javaSource = new File(TEST_DIR, "wsprovide" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jaxws" + FS + "smoke" + FS + "tools" + FS + "jaxws" + FS + "AddResponse.java");
+ assertTrue("Response wrapper not generated", javaSource.exists());
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideScriptTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 10 months
- 1
- 0
JBossWS SVN: r12556 - framework/trunk/hudson/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-01 02:59:38 -0400 (Thu, 01 Jul 2010)
New Revision: 12556
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
[JBWS-3073] Also update hudson views
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2010-07-01 06:41:54 UTC (rev 12555)
+++ framework/trunk/hudson/hudson-home/config.xml 2010-07-01 06:59:38 UTC (rev 12556)
@@ -137,14 +137,26 @@
<string>CXF-CORE-AS-5.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-5.1.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-6.0.1-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-5.0.1-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-5.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -175,10 +187,18 @@
<string>CXF-CORE-AS-5.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-6.0.1-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-5.0.1-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-5.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.0.1-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-5.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-6.0.1-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-5.0.1-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-5.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6</string>
<string>NATIVE-LIGHT</string>
<string>NATIVE-CORE-AS-5.0.1-SUN-JDK-6</string>
<string>NATIVE-CORE-AS-5.1.0-SUN-JDK-6</string>
13 years, 10 months
- 1
- 0