JBossWS SVN: r8809 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/core/jaxws/handler and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-28 01:16:19 -0500 (Fri, 28 Nov 2008)
New Revision: 8809
Modified:
stack/native/trunk/.classpath
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
Log:
[JBWS-2268] use new helper
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-11-27 15:37:58 UTC (rev 8808)
+++ stack/native/trunk/.classpath 2008-11-28 06:16:19 UTC (rev 8809)
@@ -12,7 +12,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-common"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-framework"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.0.GA"/>
- <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/junit"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JBOSS500GA"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JUNIT"/>
<classpathentry kind="output" path="target/eclipse-classes"/>
</classpath>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-11-27 15:37:58 UTC (rev 8808)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2008-11-28 06:16:19 UTC (rev 8809)
@@ -21,8 +21,6 @@
*/
package org.jboss.ws.core.jaxws.handler;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,8 +28,6 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
@@ -41,7 +37,6 @@
import javax.xml.ws.soap.SOAPBinding;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
@@ -49,6 +44,7 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.wsf.common.handler.GenericHandler;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -169,11 +165,11 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler)handler).setHeaders(soapHeaders);
- // Inject resources
- injectResources(handler);
+ // Inject resources
+ JavaxAnnotationHelper.injectResources(handler);
// Call @PostConstruct
- callPostConstruct(handler);
+ JavaxAnnotationHelper.callPostConstructMethod(handler);
addHandler(jaxwsMetaData, handler, type);
}
@@ -187,55 +183,6 @@
}
}
- private void injectResources(Handler handler)
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- ctxLoader.loadClass("javax.annotation.Resource");
- }
- catch (Throwable th)
- {
- log.debug("Cannot inject resources: " + th.toString());
- return;
- }
-
- Class<? extends Handler> handlerClass = handler.getClass();
- for (Field field : handlerClass.getFields())
- {
- if (field.isAnnotationPresent(Resource.class))
- throw new NotImplementedException("@Resource not implemented for handler: " + handlerClass.getName());
- }
- for (Method method : handlerClass.getMethods())
- {
- if (method.isAnnotationPresent(Resource.class))
- throw new NotImplementedException("@Resource not implemented for handler: " + handlerClass.getName());
- }
- }
-
- private void callPostConstruct(Handler handler) throws Exception
- {
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- ctxLoader.loadClass("javax.annotation.PostConstruct");
- }
- catch (Throwable th)
- {
- log.debug("Cannot call post construct: " + th.toString());
- return;
- }
-
- Class<? extends Handler> handlerClass = handler.getClass();
- for (Method method : handlerClass.getMethods())
- {
- if (method.isAnnotationPresent(PostConstruct.class))
- {
- method.invoke(handler, new Object[] {});
- }
- }
- }
-
private boolean addHandler(HandlerMetaDataJAXWS hmd, Handler handler, HandlerType type)
{
log.debug("addHandler: " + hmd);
15 years, 5 months
JBossWS SVN: r8808 - in container/jboss42: branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-27 10:37:58 -0500 (Thu, 27 Nov 2008)
New Revision: 8808
Modified:
container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
Log:
[JBWS-2268] fix package
Modified: container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
===================================================================
--- container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2008-11-27 15:34:43 UTC (rev 8807)
+++ container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2008-11-27 15:37:58 UTC (rev 8808)
@@ -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.container.jboss50;
+package org.jboss.wsf.container.jboss42;
import java.lang.reflect.Method;
Modified: container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
===================================================================
--- container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:34:43 UTC (rev 8807)
+++ container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:37:58 UTC (rev 8808)
@@ -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.container.jboss50;
+package org.jboss.wsf.container.jboss42;
import java.lang.reflect.Method;
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:34:43 UTC (rev 8807)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:37:58 UTC (rev 8808)
@@ -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.container.jboss50;
+package org.jboss.wsf.container.jboss42;
import java.lang.reflect.Method;
15 years, 5 months
JBossWS SVN: r8807 - in container/jboss42: branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-27 10:34:43 -0500 (Thu, 27 Nov 2008)
New Revision: 8807
Modified:
container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
Log:
[JBWS-2268] call post construct for JSE endpoints
Modified: container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
===================================================================
--- container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2008-11-27 15:25:51 UTC (rev 8806)
+++ container/jboss42/branches/jboss422/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2008-11-27 15:34:43 UTC (rev 8807)
@@ -1,8 +1,8 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * 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
@@ -19,15 +19,15 @@
* 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.container.jboss42;
+package org.jboss.wsf.container.jboss50;
-// $Id$
-
import java.lang.reflect.Method;
import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -41,6 +41,7 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author richard.opalka(a)jboss.com
* @since 25-Apr-2007
*/
public class DefaultInvocationHandler extends InvocationHandler
@@ -63,7 +64,7 @@
{
}
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ protected Object getTargetBean(Endpoint ep, Invocation epInv) throws Exception
{
InvocationContext invCtx = epInv.getInvocationContext();
Object targetBean = invCtx.getTargetBean();
@@ -71,18 +72,22 @@
{
try
{
- Class epImpl = ep.getTargetBeanClass();
+ Class<?> epImpl = ep.getTargetBeanClass();
targetBean = epImpl.newInstance();
invCtx.setTargetBean(targetBean);
}
catch (Exception ex)
{
- throw new IllegalStateException("Canot get target bean instance", ex);
+ throw new IllegalStateException("Cannot get target bean instance", ex);
}
+
+ JavaxAnnotationHelper.callPostConstructMethod(targetBean, targetBean.getClass().getClassLoader());
+ ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
+
return targetBean;
}
-
+
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
@@ -93,7 +98,6 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
-
ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
@@ -108,13 +112,13 @@
}
}
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ protected Method getImplMethod(Class<?> implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
{
String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
+ Class<?>[] paramTypes = seiMethod.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++)
{
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
Modified: container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
===================================================================
--- container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:25:51 UTC (rev 8806)
+++ container/jboss42/branches/jboss423/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:34:43 UTC (rev 8807)
@@ -19,13 +19,15 @@
* 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.container.jboss42;
+package org.jboss.wsf.container.jboss50;
import java.lang.reflect.Method;
import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -39,6 +41,7 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author richard.opalka(a)jboss.com
* @since 25-Apr-2007
*/
public class InvocationHandlerJSE extends InvocationHandler
@@ -61,7 +64,7 @@
{
}
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ protected Object getTargetBean(Endpoint ep, Invocation epInv) throws Exception
{
InvocationContext invCtx = epInv.getInvocationContext();
Object targetBean = invCtx.getTargetBean();
@@ -69,7 +72,7 @@
{
try
{
- Class epImpl = ep.getTargetBeanClass();
+ Class<?> epImpl = ep.getTargetBeanClass();
targetBean = epImpl.newInstance();
invCtx.setTargetBean(targetBean);
}
@@ -77,10 +80,14 @@
{
throw new IllegalStateException("Cannot get target bean instance", ex);
}
+
+ JavaxAnnotationHelper.callPostConstructMethod(targetBean, targetBean.getClass().getClassLoader());
+ ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
+
return targetBean;
}
-
+
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
@@ -91,7 +98,6 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
-
ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
@@ -106,13 +112,13 @@
}
}
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ protected Method getImplMethod(Class<?> implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
{
String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
+ Class<?>[] paramTypes = seiMethod.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++)
{
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:25:51 UTC (rev 8806)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerJSE.java 2008-11-27 15:34:43 UTC (rev 8807)
@@ -19,13 +19,15 @@
* 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.container.jboss42;
+package org.jboss.wsf.container.jboss50;
import java.lang.reflect.Method;
import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -39,6 +41,7 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author richard.opalka(a)jboss.com
* @since 25-Apr-2007
*/
public class InvocationHandlerJSE extends InvocationHandler
@@ -61,7 +64,7 @@
{
}
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ protected Object getTargetBean(Endpoint ep, Invocation epInv) throws Exception
{
InvocationContext invCtx = epInv.getInvocationContext();
Object targetBean = invCtx.getTargetBean();
@@ -69,7 +72,7 @@
{
try
{
- Class epImpl = ep.getTargetBeanClass();
+ Class<?> epImpl = ep.getTargetBeanClass();
targetBean = epImpl.newInstance();
invCtx.setTargetBean(targetBean);
}
@@ -77,10 +80,14 @@
{
throw new IllegalStateException("Cannot get target bean instance", ex);
}
+
+ JavaxAnnotationHelper.callPostConstructMethod(targetBean, targetBean.getClass().getClassLoader());
+ ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
+
return targetBean;
}
-
+
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
@@ -91,7 +98,6 @@
WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
if (wsContext != null)
{
-
ResourceInjector injector = resourceInjectorFactory.newResourceInjector();
injector.inject(targetBean, wsContext);
}
@@ -106,13 +112,13 @@
}
}
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ protected Method getImplMethod(Class<?> implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
{
String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
+ Class<?>[] paramTypes = seiMethod.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++)
{
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
15 years, 5 months
JBossWS SVN: r8806 - in container/jboss50: trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-27 10:25:51 -0500 (Thu, 27 Nov 2008)
New Revision: 8806
Modified:
container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
Log:
[JBWS-2268] call post construct for JSE endpoints
Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-11-27 15:15:48 UTC (rev 8805)
+++ container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-11-27 15:25:51 UTC (rev 8806)
@@ -26,6 +26,8 @@
import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -39,6 +41,7 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author richard.opalka(a)jboss.com
* @since 25-Apr-2007
*/
public class InvocationHandlerJSE extends InvocationHandler
@@ -61,7 +64,7 @@
{
}
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ protected Object getTargetBean(Endpoint ep, Invocation epInv) throws Exception
{
InvocationContext invCtx = epInv.getInvocationContext();
Object targetBean = invCtx.getTargetBean();
@@ -69,7 +72,7 @@
{
try
{
- Class epImpl = ep.getTargetBeanClass();
+ Class<?> epImpl = ep.getTargetBeanClass();
targetBean = epImpl.newInstance();
invCtx.setTargetBean(targetBean);
}
@@ -77,10 +80,14 @@
{
throw new IllegalStateException("Cannot get target bean instance", ex);
}
+
+ JavaxAnnotationHelper.callPostConstructMethod(targetBean, targetBean.getClass().getClassLoader());
+ ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
+
return targetBean;
}
-
+
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
@@ -105,13 +112,13 @@
}
}
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ protected Method getImplMethod(Class<?> implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
{
String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
+ Class<?>[] paramTypes = seiMethod.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++)
{
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-11-27 15:15:48 UTC (rev 8805)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/invocation/InvocationHandlerJSE.java 2008-11-27 15:25:51 UTC (rev 8806)
@@ -26,6 +26,8 @@
import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -39,6 +41,7 @@
* Handles invocations on JSE endpoints.
*
* @author Thomas.Diesler(a)jboss.org
+ * @author richard.opalka(a)jboss.com
* @since 25-Apr-2007
*/
public class InvocationHandlerJSE extends InvocationHandler
@@ -61,7 +64,7 @@
{
}
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ protected Object getTargetBean(Endpoint ep, Invocation epInv) throws Exception
{
InvocationContext invCtx = epInv.getInvocationContext();
Object targetBean = invCtx.getTargetBean();
@@ -69,7 +72,7 @@
{
try
{
- Class epImpl = ep.getTargetBeanClass();
+ Class<?> epImpl = ep.getTargetBeanClass();
targetBean = epImpl.newInstance();
invCtx.setTargetBean(targetBean);
}
@@ -77,10 +80,14 @@
{
throw new IllegalStateException("Cannot get target bean instance", ex);
}
+
+ JavaxAnnotationHelper.callPostConstructMethod(targetBean, targetBean.getClass().getClassLoader());
+ ep.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
}
+
return targetBean;
}
-
+
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
@@ -105,13 +112,13 @@
}
}
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ protected Method getImplMethod(Class<?> implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
{
String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
+ Class<?>[] paramTypes = seiMethod.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++)
{
- Class paramType = paramTypes[i];
+ Class<?> paramType = paramTypes[i];
if (JavaUtils.isPrimitive(paramType) == false)
{
String paramTypeName = paramType.getName();
15 years, 5 months
JBossWS SVN: r8805 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-27 10:15:48 -0500 (Thu, 27 Nov 2008)
New Revision: 8805
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
[JBWS-2268] ugly hack
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-11-27 15:13:54 UTC (rev 8804)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2008-11-27 15:15:48 UTC (rev 8805)
@@ -28,6 +28,7 @@
import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.LifecycleHandler;
@@ -238,14 +239,20 @@
@Override
public <T> T addAttachment(Class<T> clazz, Object obj)
{
- assertEndpointSetterAccess();
+ if (!clazz.equals(PreDestroyHolder.class)) // JBWS-2268 hack
+ {
+ assertEndpointSetterAccess();
+ }
return super.addAttachment(clazz, obj);
}
@Override
public <T> T removeAttachment(Class<T> key)
{
- assertEndpointSetterAccess();
+ if (!key.equals(PreDestroyHolder.class)) // JBWS-2268 hack
+ {
+ assertEndpointSetterAccess();
+ }
return super.removeAttachment(key);
}
15 years, 5 months
JBossWS SVN: r8804 - in common/trunk/src/main/java/org/jboss/wsf/common: javax and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-27 10:13:54 -0500 (Thu, 27 Nov 2008)
New Revision: 8804
Added:
common/trunk/src/main/java/org/jboss/wsf/common/javax/
common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
common/trunk/src/main/java/org/jboss/wsf/common/javax/PreDestroyHolder.java
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
Log:
[JBWS-2268] introduce javax.annotation helper + touch endpoint servlet to deal with pre destroy phase
Added: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2008-11-27 15:13:54 UTC (rev 8804)
@@ -0,0 +1,329 @@
+/*
+ * 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.wsf.common.javax;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
+
+/**
+ * A helper class for <b>javax.annotation</b> annotations.
+ * @author richard.opalka(a)jboss.com
+ */
+public final class JavaxAnnotationHelper
+{
+
+ private static Logger log = Logger.getLogger(JavaxAnnotationHelper.class);
+ private static final Object[] noArgs = new Object[] {};
+
+ /**
+ * Constructor
+ */
+ private JavaxAnnotationHelper()
+ {
+ // forbidden inheritance
+ }
+
+ /**
+ * @see JavaxAnnotationHelper#callPreDestroyMethod(Object, ClassLoader)
+ * @param instance to inject resource on
+ * @throws Exception if some error occurs
+ */
+ public static void injectResources(Object instance) throws Exception
+ {
+ injectResources(instance, Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * The Resource annotation marks a resource that is needed by the application. This annotation may be applied
+ * to an application component class, or to fields or methods of the component class. When the annotation is
+ * applied to a field or method, the container will inject an instance of the requested resource into the
+ * application component when the component is initialized. If the annotation is applied to the component class,
+ * the annotation declares a resource that the application will look up at runtime.
+ * @param instance to inject resource on
+ * @param classLoader to check whether javax.annotation annotations are available
+ * @throws Exception if some error occurs
+ */
+ public static void injectResources(Object instance, ClassLoader classLoader) throws Exception
+ {
+ if (instance == null)
+ throw new IllegalArgumentException("Object instance cannot be null");
+ if (classLoader == null)
+ throw new IllegalArgumentException("ClassLoader cannot be null");
+
+ try
+ {
+ classLoader.loadClass("javax.annotation.Resource");
+ }
+ catch (Throwable th)
+ {
+ log.debug("Cannot inject resources: " + th.toString());
+ return;
+ }
+
+ Class<?> instanceClass = instance.getClass();
+
+ // handle Resource injection on types
+ if (instanceClass.isAnnotationPresent(Resource.class))
+ throw new NotImplementedException("@Resource not implemented for: " + instanceClass.getName());
+
+ // handle Resource injection on fields
+ for (Field field : getAllDeclaredFields(instanceClass))
+ {
+ if (field.isAnnotationPresent(Resource.class))
+ throw new NotImplementedException("@Resource not implemented for: " + instanceClass.getName());
+ }
+
+ // handle Resource injection on methods
+ for (Method method : getAllDeclaredMethods(instanceClass))
+ {
+ if (method.isAnnotationPresent(Resource.class))
+ throw new NotImplementedException("@Resource not implemented for: " + instanceClass.getName());
+ }
+ }
+
+ /**
+ * @see JavaxAnnotationHelper#callPreDestroyMethod(Object, ClassLoader)
+ * @param instance to invoke pre destroy method on
+ * @throws Exception if some error occurs
+ */
+ public static void callPreDestroyMethod(Object instance) throws Exception
+ {
+ callPreDestroyMethod(instance, Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * The PreDestroy annotation is used on methods as a callback notification to signal that the instance
+ * is in the process of being removed by the container. The method annotated with PreDestroy is typically
+ * used to release resources that it has been holding. This annotation MUST be supported by all container
+ * managed objects that support PostConstruct except the application client container in Java EE 5.
+ * The method on which the PreDestroy annotation is applied MUST fulfill all of the following criteria:
+ * <ul>
+ * <li>The method MUST NOT have any parameters.
+ * <li>The return type of the method MUST be void.
+ * <li>The method MUST NOT throw a checked exception.
+ * <li>The method on which PreDestroy is applied MAY be public, protected, package private or private.
+ * <li>The method MUST NOT be static.
+ * <li>The method MAY be final.
+ * <li>If the method throws an unchecked exception it is ignored.
+ * </ul>
+ * @param instance to invoke pre destroy method on
+ * @param classLoader to check whether javax.annotation annotations are available
+ * @throws Exception if some error occurs
+ */
+ public static void callPreDestroyMethod(Object instance, ClassLoader classLoader) throws Exception
+ {
+ if (instance == null)
+ throw new IllegalArgumentException("Object instance cannot be null");
+ if (classLoader == null)
+ throw new IllegalArgumentException("ClassLoader cannot be null");
+
+ try
+ {
+ classLoader.loadClass("javax.annotation.PreDestroy");
+ }
+ catch (Throwable th)
+ {
+ log.debug("Cannot call pre destroy: " + th.toString());
+ return;
+ }
+
+ Method targetMethod = null;
+ for (Method method : getAllDeclaredMethods(instance.getClass()))
+ {
+ if (method.isAnnotationPresent(PreDestroy.class))
+ {
+ if (targetMethod == null)
+ {
+ targetMethod = method;
+ }
+ else
+ {
+ throw new RuntimeException("Only one method can be annotated with javax.annotation.PreDestroy annotation");
+ }
+ }
+ }
+
+ if (targetMethod != null)
+ {
+ // Ensure all method preconditions
+ assertNoParameters(targetMethod);
+ assertVoidReturnType(targetMethod);
+ assertNoCheckedExceptionsAreThrown(targetMethod);
+ assertNotStatic(targetMethod);
+
+ // Finally call annotated method
+ invokeMethod(targetMethod, instance);
+ }
+ }
+
+ /**
+ * @see JavaxAnnotationHelper#callPostConstructMethod(Object, ClassLoader)
+ * @param instance to invoke post construct method on
+ * @throws Exception if some error occurs
+ */
+ public static void callPostConstructMethod(Object instance) throws Exception
+ {
+ callPostConstructMethod(instance, Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * The PostConstruct annotation is used on a method that needs to be executed after dependency injection is done
+ * to perform any initialization. This method MUST be invoked before the class is put into service. This annotation
+ * MUST be supported on all classes that support dependency injection. The method annotated with PostConstruct MUST
+ * be invoked even if the class does not request any resources to be injected. Only one method can be annotated with
+ * this annotation. The method on which the PostConstruct annotation is applied MUST fulfill all of the following criteria:
+ * <ul>
+ * <li>The method MUST NOT have any parameters.
+ * <li>The return type of the method MUST be void.
+ * <li>The method MUST NOT throw a checked exception.
+ * <li>The method on which PostConstruct is applied MAY be public, protected, package private or private.
+ * <li>The method MUST NOT be static.
+ * <li>The method MAY be final.
+ * <li>If the method throws an unchecked exception the class MUST NOT be put into service.
+ * </ul>
+ * @param instance to invoke post construct method on
+ * @param classLoader to check whether javax.annotation annotations are available
+ * @throws Exception if some error occurs
+ */
+ public static void callPostConstructMethod(Object instance, ClassLoader classLoader) throws Exception
+ {
+ if (instance == null)
+ throw new IllegalArgumentException("Object instance cannot be null");
+ if (classLoader == null)
+ throw new IllegalArgumentException("ClassLoader cannot be null");
+
+ try
+ {
+ classLoader.loadClass("javax.annotation.PostConstruct");
+ }
+ catch (Throwable th)
+ {
+ log.debug("Cannot call post construct: " + th.toString());
+ return;
+ }
+
+ Method targetMethod = null;
+ for (Method method : getAllDeclaredMethods(instance.getClass()))
+ {
+ if (method.isAnnotationPresent(PostConstruct.class))
+ {
+ if (targetMethod == null)
+ {
+ targetMethod = method;
+ }
+ else
+ {
+ throw new RuntimeException("Only one method can be annotated with javax.annotation.PostConstruct annotation");
+ }
+ }
+ }
+
+ if (targetMethod != null)
+ {
+ // Ensure all method preconditions
+ assertNoParameters(targetMethod);
+ assertVoidReturnType(targetMethod);
+ assertNoCheckedExceptionsAreThrown(targetMethod);
+ assertNotStatic(targetMethod);
+
+ // Finally call annotated method
+ invokeMethod(targetMethod, instance);
+ }
+ }
+
+ private static List<Method> getAllDeclaredMethods(Class<?> clazz)
+ {
+ List<Method> retVal = new LinkedList<Method>();
+ while (clazz != null)
+ {
+ for (Method m : clazz.getDeclaredMethods())
+ {
+ retVal.add(m);
+ }
+ clazz = clazz.getSuperclass();
+ }
+ return retVal;
+ }
+
+ private static List<Field> getAllDeclaredFields(Class<?> clazz)
+ {
+ List<Field> retVal = new LinkedList<Field>();
+ while (clazz != null)
+ {
+ for (Field f : clazz.getDeclaredFields())
+ {
+ retVal.add(f);
+ }
+ clazz = clazz.getSuperclass();
+ }
+ return retVal;
+ }
+
+ private static void invokeMethod(Method m, Object instance) throws Exception
+ {
+ if (!m.isAccessible())
+ {
+ m.setAccessible(true);
+ }
+ m.invoke(instance, noArgs);
+ }
+
+ private static void assertNoParameters(Method m)
+ {
+ if (m.getParameterTypes().length != 0)
+ throw new RuntimeException("Method annotated with javax.annotation annotations have to be parameterless");
+ }
+
+ private static void assertVoidReturnType(Method m)
+ {
+ if ((!m.getReturnType().equals(Void.class)) && (!m.getReturnType().equals(Void.TYPE)))
+ throw new RuntimeException("Method annotated with javax.annotation annotations have to return void");
+ }
+
+ private static void assertNoCheckedExceptionsAreThrown(Method m)
+ {
+ Class<?>[] declaredExceptions = m.getExceptionTypes();
+ for (int i = 0; i < declaredExceptions.length; i++)
+ {
+ Class<?> exception = declaredExceptions[i];
+ if (!exception.isAssignableFrom(RuntimeException.class))
+ throw new RuntimeException("Method annotated with javax.annotation annotations cannot throw checked exceptions");
+ }
+ }
+
+ private static void assertNotStatic(Method m)
+ {
+ if (Modifier.isStatic(m.getModifiers()))
+ throw new RuntimeException("Method annotated with javax.annotation annotations cannot be static");
+ }
+
+}
Added: common/trunk/src/main/java/org/jboss/wsf/common/javax/PreDestroyHolder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/PreDestroyHolder.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/PreDestroyHolder.java 2008-11-27 15:13:54 UTC (rev 8804)
@@ -0,0 +1,59 @@
+/*
+ * 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.wsf.common.javax;
+
+/**
+ * Utility class for pre destroy registration
+ * @author richard.opalka(a)jboss.com
+ */
+public final class PreDestroyHolder
+{
+ private final Object object;
+ private final int hashCode;
+
+ public PreDestroyHolder(Object object)
+ {
+ super();
+ this.hashCode = System.identityHashCode(object);
+ this.object = object;
+ }
+
+ public final Object getObject()
+ {
+ return this.object;
+ }
+
+ public final boolean equals(Object o)
+ {
+ if (o instanceof PreDestroyHolder)
+ {
+ return ((PreDestroyHolder)o).hashCode == this.hashCode;
+ }
+
+ return false;
+ }
+
+ public final int hashCode()
+ {
+ return this.hashCode;
+ }
+}
\ No newline at end of file
Modified: common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-27 13:55:29 UTC (rev 8803)
+++ common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-27 15:13:54 UTC (rev 8804)
@@ -22,6 +22,8 @@
package org.jboss.wsf.common.servlet;
import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
import javax.management.ObjectName;
import javax.servlet.ServletConfig;
@@ -30,7 +32,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jboss.logging.Logger;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
+import org.jboss.wsf.common.javax.PreDestroyHolder;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -52,9 +57,13 @@
public abstract class AbstractEndpointServlet extends HttpServlet
{
+ // provide logging
+ private static final Logger log = Logger.getLogger(AbstractEndpointServlet.class);
+
private final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
protected Endpoint endpoint;
private EndpointRegistry epRegistry;
+ private List<PreDestroyHolder> preDestroyRegistry = new LinkedList<PreDestroyHolder>();
/**
* Constructor
@@ -72,6 +81,28 @@
this.initServiceEndpoint(servletConfig);
}
+ @Override
+ public void destroy()
+ {
+ synchronized(this.preDestroyRegistry)
+ {
+ for (PreDestroyHolder holder : this.preDestroyRegistry)
+ {
+ try
+ {
+ JavaxAnnotationHelper.callPreDestroyMethod(holder.getObject());
+ }
+ catch (Exception exception)
+ {
+ log.error(exception.getMessage(), exception);
+ }
+ }
+ this.preDestroyRegistry.clear();
+ this.preDestroyRegistry = null;
+ }
+ super.destroy();
+ }
+
/**
* Serves the requests
*/
@@ -83,12 +114,29 @@
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
+ registerForPreDestroy(endpoint);
}
finally
{
EndpointAssociation.removeEndpoint();
}
}
+
+ private void registerForPreDestroy(Endpoint ep)
+ {
+ PreDestroyHolder holder = (PreDestroyHolder)ep.getAttachment(PreDestroyHolder.class);
+ if (holder != null)
+ {
+ synchronized(this.preDestroyRegistry)
+ {
+ if (!this.preDestroyRegistry.contains(holder))
+ {
+ this.preDestroyRegistry.add(holder);
+ }
+ }
+ ep.removeAttachment(PreDestroyHolder.class);
+ }
+ }
/**
* Template method
@@ -160,4 +208,5 @@
dep.setRuntimeClassLoader(classLoader);
}
}
+
}
15 years, 5 months
JBossWS SVN: r8803 - stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-27 08:55:29 -0500 (Thu, 27 Nov 2008)
New Revision: 8803
Modified:
stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2409] Excluding test (intermittent failure)
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/test-excludes-jboss501.txt 2008-11-27 12:13:32 UTC (rev 8802)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/test-excludes-jboss501.txt 2008-11-27 13:55:29 UTC (rev 8803)
@@ -21,3 +21,6 @@
# [JBWS-2217] Fix BPEL samples before AS50 goes final
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
+
+# [JBWS-2409] Fix jbws771 testcase binding customization file
+org/jboss/test/ws/jaxws/jbws771/**
15 years, 5 months
JBossWS SVN: r8802 - in stack/native/tags/jbossws-native-3.0.4.SP1: modules/client and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-27 07:13:32 -0500 (Thu, 27 Nov 2008)
New Revision: 8802
Modified:
stack/native/tags/jbossws-native-3.0.4.SP1/modules/client/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxrpc/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws-ext/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/management/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/resources/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/saaj/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/framework-tests/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/native-tests/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml
Log:
Updating poms
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/client/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/client/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/client/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxrpc/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxrpc/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxrpc/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws-ext/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws-ext/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/jaxws-ext/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/management/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/management/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/management/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/resources/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/resources/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/resources/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/saaj/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/saaj/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/saaj/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/framework-tests/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/framework-tests/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/native-tests/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/native-tests/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/testsuite/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml 2008-11-27 12:13:32 UTC (rev 8802)
@@ -18,7 +18,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.0.4.GA</version>
+ <version>3.0.4.SP1</version>
<!-- Parent -->
<parent>
15 years, 5 months
JBossWS SVN: r8801 - in stack/native/tags: jbossws-native-3.0.4.SP1 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-27 07:01:13 -0500 (Thu, 27 Nov 2008)
New Revision: 8801
Added:
stack/native/tags/jbossws-native-3.0.4.SP1/
Modified:
stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml
stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml
Log:
Tagging jbossws-native-3.0.4.SP1 because of new AS5 trunk dependencies (no local source changes at all, this is just to have the right maven test classpath on client side)
Copied: stack/native/tags/jbossws-native-3.0.4.SP1 (from rev 8532, stack/native/tags/jbossws-native-3.0.4.GA)
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.GA/modules/core/pom.xml 2008-10-20 07:30:26 UTC (rev 8532)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/modules/core/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
@@ -15,8 +15,8 @@
</parent>
<properties>
- <jboss.jbosssx.version>2.0.2.CR6</jboss.jbosssx.version>
- <jboss.microcontainer.version>2.0.0.CR2</jboss.microcontainer.version>
+ <jboss.jbosssx.version>2.0.2.SP2</jboss.jbosssx.version>
+ <jboss.microcontainer.version>2.0.1.GA</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
Modified: stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml
===================================================================
--- stack/native/tags/jbossws-native-3.0.4.GA/pom.xml 2008-10-20 07:30:26 UTC (rev 8532)
+++ stack/native/tags/jbossws-native-3.0.4.SP1/pom.xml 2008-11-27 12:01:13 UTC (rev 8801)
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
@@ -57,7 +57,7 @@
<!-- [JBWS-2263] -->
<!-- START -->
<jbossws.jboss500.version>3.0.4.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.4.GA</jbossws.jboss501.version>
+ <jbossws.jboss501.version>3.0.4.SP1</jbossws.jboss501.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -67,7 +67,7 @@
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <jboss.remoting.version>2.5.0.GA</jboss.remoting.version>
+ <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version>
<jboss.jaxr.version>1.2.0.SP2</jboss.jaxr.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
15 years, 5 months