Author: richard.opalka(a)jboss.com Date: 2010-11-10 08:32:53 -0500 (Wed, 10 Nov 2010) New Revision: 13248 Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandler.java common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXRPC.java common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java Log: fixing whitespaces - this is never ending story :( Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandler.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandler.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandler.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -53,7 +53,7 @@ /** * Creates invocation. - * + * * @return invocation instance */ public final Invocation createInvocation() @@ -63,22 +63,22 @@ /** * Initialization method. - * + * * @param endpoint endpoint */ public void init(final Endpoint endpoint) { // does nothing } - + public Context getJNDIContext(final Endpoint ep) throws NamingException { return null; } - + /** * Returns implementation method that will be used for invocation. - * + * * @param implClass implementation endpoint class * @param seiMethod SEI interface method used for method finding algorithm * @return implementation method Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/AbstractInvocationHandlerJSE.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -46,9 +46,9 @@ /** * Retrieves endpoint implementation bean that will be used in invocation process. - * + * * This method does the following steps: - * + * * <ul> * <li>tries to retrieve endpoint instance from invocation context,</li> * <li>if endpoint instance is not found it's created and instantiated (lazy initialization)</li> @@ -57,7 +57,7 @@ * (using {@link #onEndpointInstantiated(Endpoint, Invocation)} template method). * </li> * </ul> - * + * * @param endpoint to lookup implementation instance for * @param invocation current invocation * @return endpoint implementation @@ -91,9 +91,9 @@ /** * Invokes method on endpoint implementation. - * + * * This method does the following steps: - * + * * <ul> * <li>lookups endpoint implementation method to be invoked,</li> * <li> @@ -106,7 +106,7 @@ * (using {@link #onAfterInvocation(Invocation)} template method). * </li> * </ul> - * + * * @param endpoint which method is going to be invoked * @param invocation current invocation * @throws Exception if any error occurs @@ -146,7 +146,7 @@ /** * Template method for notifying subclasses that endpoint instance have been instantiated. - * + * * @param endpoint instantiated endpoint * @param invocation current invocation * @throws Exception subclasses have to throw exception on any failure @@ -158,7 +158,7 @@ /** * Template method for notifying subclasses that endpoint method is going to be invoked. - * + * * @param invocation current invocation * @throws Exception subclasses have to throw exception on any failure */ @@ -169,7 +169,7 @@ /** * Template method for notifying subclasses that endpoint method invocation was completed. - * + * * @param invocation current invocation * @throws Exception subclasses have to throw exception on any failure */ Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXRPC.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXRPC.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXRPC.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -48,7 +48,7 @@ * Calls {@link javax.xml.rpc.server.ServiceLifecycle#init(Object)} * method on target bean if this bean implements * {@link javax.xml.rpc.server.ServiceLifecycle} interface. - * + * * @param invocation current invocation * @throws Exception if any error occurs */ @@ -70,7 +70,7 @@ * Calls {@link javax.xml.rpc.server.ServiceLifecycle#destroy()} * method on target bean if this bean implements * {@link javax.xml.rpc.server.ServiceLifecycle} interface. - * + * * @param invocation current invocation * @throws Exception if any error occurs */ Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -64,7 +64,7 @@ /** * Injects resources on target bean and calls post construct method. * Finally it registers target bean for predestroy phase. - * + * * @param endpoint used for predestroy phase registration process * @param invocation current invocation */ @@ -91,7 +91,7 @@ /** * Injects webservice context on target bean. - * + * * @param invocation current invocation */ @Override @@ -103,7 +103,7 @@ /** * Cleanups injected webservice context on target bean. - * + * * @param invocation current invocation */ @Override @@ -116,10 +116,10 @@ { return (Context)new InitialContext().lookup(POJO_JNDI_PREFIX); } - + /** * Returns WebServiceContext associated with this invocation. - * + * * @param invocation current invocation * @return web service context or null if not available */ @@ -132,7 +132,7 @@ /** * Returns endpoint instance associated with current invocation. - * + * * @param invocation current invocation * @return target bean in invocation */ @@ -142,22 +142,22 @@ return invocationContext.getTargetBean(); } - + private static final class ThreadLocalAwareWebServiceContext implements WebServiceContext { private static final ThreadLocalAwareWebServiceContext SINGLETON = new ThreadLocalAwareWebServiceContext(); private final ThreadLocal<WebServiceContext> contexts = new InheritableThreadLocal<WebServiceContext>(); - + private static ThreadLocalAwareWebServiceContext getInstance() { return SINGLETON; } - + private void setMessageContext(final WebServiceContext ctx) { this.contexts.set(ctx); } - + public EndpointReference getEndpointReference(Element... referenceParameters) { final WebServiceContext delegee = this.contexts.get(); @@ -188,4 +188,5 @@ return delegee == null ? false : delegee.isUserInRole(role); } } + } Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextEJB.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -30,12 +30,13 @@ /** * EJB web service context which security related methods delegate to EJB container. - * + * * @author alessio.soldano(a)jboss.com * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public class WebServiceContextEJB extends WebServiceContextDelegate { + public WebServiceContextEJB(final WebServiceContext ctx) { super(ctx); @@ -52,4 +53,5 @@ final EJBContext ejbContext = getAttachment(EJBContext.class); return ejbContext.isCallerInRole(role); } + } Modified: common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java 2010-11-09 10:00:48 UTC (rev 13247) +++ common/trunk/src/main/java/org/jboss/wsf/common/invocation/WebServiceContextJSE.java 2010-11-10 13:32:53 UTC (rev 13248) @@ -31,18 +31,19 @@ /** * JSE web service context which security related methods delegate to servlet container. - * + * * @author alessio.soldano(a)jboss.com * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public final class WebServiceContextJSE extends WebServiceContextDelegate { + private final HttpServletRequest httpRequest; - + public WebServiceContextJSE(final WebServiceContext ctx) { super(ctx); - + if (ctx.getMessageContext().get(MessageContext.SERVLET_REQUEST) == null) throw new IllegalStateException("Cannot obtain HttpServletRequest from message context"); @@ -60,4 +61,5 @@ { return this.httpRequest.isUserInRole(role); } + }