JBossWS SVN: r12333 - framework/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 05:44:47 -0400 (Wed, 26 May 2010)
New Revision: 12333
Added:
framework/tags/jbossws-framework-3.1.2.SP7/
Log:
Tagging jbossws-framework-3.1.2.SP7
Copied: framework/tags/jbossws-framework-3.1.2.SP7 (from rev 12332, framework/branches/jbossws-framework-3.1.2)
13 years, 12 months
JBossWS SVN: r12330 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 05:35:20 -0400 (Wed, 26 May 2010)
New Revision: 12330
Added:
common/tags/jbossws-common-1.1.0.SP6/
Log:
Tagging jbossws-common-1.1.0.SP6
Copied: common/tags/jbossws-common-1.1.0.SP6 (from rev 12329, common/branches/jbossws-common-1.1.0)
13 years, 12 months
JBossWS SVN: r12329 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-05-26 05:32:02 -0400 (Wed, 26 May 2010)
New Revision: 12329
Added:
spi/tags/jbossws-spi-1.1.2.SP4/
Log:
Tagging jbossws-spi-1.1.2.SP4
Copied: spi/tags/jbossws-spi-1.1.2.SP4 (from rev 12328, spi/branches/jbossws-spi-1.1.2)
13 years, 12 months
JBossWS SVN: r12328 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 05:24:11 -0400 (Wed, 26 May 2010)
New Revision: 12328
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
Log:
[JBPAPP-4384] fixing EJB integration - to be lazy
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 09:15:57 UTC (rev 12327)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2010-05-26 09:24:11 UTC (rev 12328)
@@ -28,6 +28,7 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.Context;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
@@ -46,6 +47,8 @@
import org.jboss.wsf.common.handler.GenericHandler;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
import org.jboss.wsf.common.injection.InjectionHelper;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
@@ -168,7 +171,12 @@
if (handler instanceof GenericSOAPHandler)
((GenericSOAPHandler)handler).setHeaders(soapHeaders);
- InjectionHelper.injectResources(handler, injections);
+ if (injections != null)
+ {
+ Endpoint ep = EndpointAssociation.getEndpoint();
+ Context ctx = ep == null ? null : ep.getJNDIContext();
+ InjectionHelper.injectResources(handler, injections, ctx);
+ }
InjectionHelper.callPostConstructMethod(handler);
addHandler(jaxwsMetaData, handler, type);
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-05-26 09:15:57 UTC (rev 12327)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-05-26 09:24:11 UTC (rev 12328)
@@ -17,7 +17,7 @@
<properties>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.security.args>
<surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args>
- <surefire.gc.args>-XX:MaxPermSize=128m</surefire.gc.args>
+ <surefire.gc.args>-Xmx256m -XX:MaxPermSize=256m</surefire.gc.args>
<test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
<test.classes.directory>${project.build.directory}/test-classes</test.classes.directory>
<test.resources.directory>${project.build.directory}/test-resources</test.resources.directory>
13 years, 12 months
JBossWS SVN: r12327 - framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 05:15:57 -0400 (Wed, 26 May 2010)
New Revision: 12327
Modified:
framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
Log:
[JBPAPP-4384] fixing EJB integration - to be lazy
Modified: framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java
===================================================================
--- framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2010-05-26 09:12:13 UTC (rev 12326)
+++ framework/branches/jbossws-framework-3.1.2/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2010-05-26 09:15:57 UTC (rev 12327)
@@ -27,7 +27,10 @@
import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import org.jboss.wsf.common.injection.InjectionException;
import org.jboss.wsf.common.injection.PreDestroyHolder;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -65,9 +68,6 @@
DefaultEndpoint(String targetBean)
{
- //if(null==targetBean)
- // throw new IllegalArgumentException("targetBean name cannot be null");
-
this.targetBean = targetBean;
this.state = EndpointState.UNDEFINED;
}
@@ -130,6 +130,7 @@
{
throw new WSFDeploymentException(ex);
}
+
return targetBeanClass;
}
@@ -315,4 +316,23 @@
}
}
}
+
+ @Override
+ public Context getJNDIContext()
+ {
+ Context retVal = null;
+
+ try
+ {
+ retVal = this.getInvocationHandler().getJNDIContext(this);
+ }
+ catch (NamingException e)
+ {
+ final String message = "Cannot get JNDI context";
+ InjectionException.rethrow(message, e);
+ }
+
+ return retVal;
+ }
+
}
13 years, 12 months
JBossWS SVN: r12326 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 05:12:13 -0400 (Wed, 26 May 2010)
New Revision: 12326
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
Log:
[JBPAPP-4384] fixing EJB integration - to be lazy
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-05-26 09:08:23 UTC (rev 12325)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2010-05-26 09:12:13 UTC (rev 12326)
@@ -54,7 +54,6 @@
{
private static final Logger LOG = Logger.getLogger(InjectionHelper.class);
- private static final String POJO_JNDI_PREFIX = "java:comp/env/";
private static final ClassProcessor<Method> POST_CONSTRUCT_METHOD_FINDER = new PostConstructMethodFinder();
private static final ClassProcessor<Method> PRE_DESTROY_METHOD_FINDER = new PreDestroyMethodFinder();
@@ -93,19 +92,22 @@
* @see javax.annotation.Resource
* @see javax.ejb.EJB
*/
- public static void injectResources(final Object instance, final InjectionsMetaData injections)
+ public static void injectResources(final Object instance, final InjectionsMetaData injections, final Context ctx)
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
if (injections == null)
return;
-
+
+ if (ctx == null)
+ return;
+
// inject descriptor driven annotations
- injectDescriptorAnnotatedAccessibleObjects(instance, injections);
+ injectDescriptorAnnotatedAccessibleObjects(instance, injections, ctx);
// inject @Resource annotated methods and fields
- injectResourceAnnotatedAccessibleObjects(instance, injections);
+ injectResourceAnnotatedAccessibleObjects(instance, injections, ctx);
// inject @EJB annotated methods and fields
injectEJBAnnotatedAccessibleObjects(instance, injections);
@@ -213,39 +215,15 @@
}
/**
- * Gets JNDI context.
- *
- * @param injections injection metadata to get context from.
- * @return JNDI context
- */
- private static Context getContext(final InjectionsMetaData injections)
- {
- final Context ctx = injections.getContext();
- if (ctx == null)
- {
- try
- {
- return (Context)getDefaultContext().lookup(POJO_JNDI_PREFIX);
- }
- catch (NamingException ne)
- {
- InjectionException.rethrow("Cannot lookup JNDI context: " + POJO_JNDI_PREFIX, ne);
- }
- }
-
- return ctx;
- }
-
- /**
* Performs descriptor driven injections.
*
* @param instance to operate on
* @param injections injections metadata
+ * @param ctx JNDI context
*/
- private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
+ private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections, final Context ctx)
{
final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
- final Context ctx = !injectionMDs.isEmpty() ? getContext(injections) : null;
for (InjectionMetaData injectionMD : injectionMDs)
{
@@ -293,16 +271,15 @@
*
* @param instance to operate on
* @param injections injections meta data
+ * @param ctx JNDI context
* @see org.jboss.wsf.common.injection.finders.ResourceFieldFinder
* @see org.jboss.wsf.common.injection.finders.ResourceMethodFinder
* @see javax.annotation.Resource
*/
- private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
+ private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections, final Context ctx)
{
final Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instance.getClass());
final Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instance.getClass());
- final boolean doInjection = !resourceAnnotatedFields.isEmpty() || !resourceAnnotatedMethods.isEmpty();
- final Context ctx = doInjection ? getContext(injections) : null;
// Inject @Resource annotated fields
for (Field field : resourceAnnotatedFields)
@@ -340,6 +317,7 @@
*
* @param instance to operate on
* @param injections injections meta data
+ * @param ctx JNDI context
* @see org.jboss.wsf.common.injection.finders.EJBFieldFinder
* @see org.jboss.wsf.common.injection.finders.EJBMethodFinder
* @see javax.ejb.EJB
@@ -348,8 +326,7 @@
{
final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
- final boolean doInjection = !ejbAnnotatedFields.isEmpty() || !ejbAnnotatedMethods.isEmpty();
- final Context ctx = doInjection ? getDefaultContext() : null;
+ final Context ctx = InjectionHelper.getDefaultContext();
// Inject @EJB annotated fields
for (Field field : ejbAnnotatedFields)
@@ -436,28 +413,6 @@
}
/**
- * Returns default JNDI context.
- *
- * @return default JNDI context
- */
- private static Context getDefaultContext()
- {
- Context ctx = null;
-
- try
- {
- ctx = new InitialContext();
- }
- catch (NamingException ne)
- {
- final String message = "Cannot create default JNDI context";
- InjectionException.rethrow(message, ne);
- }
-
- return ctx;
- }
-
- /**
* Invokes method on object with specified arguments.
*
* @param instance to invoke method on
@@ -539,4 +494,26 @@
return result.isEmpty() ? null : result.iterator().next();
}
+ /**
+ * Returns default JNDI context.
+ *
+ * @return default JNDI context
+ */
+ private static Context getDefaultContext()
+ {
+ Context ctx = null;
+
+ try
+ {
+ ctx = new InitialContext();
+ }
+ catch (NamingException ne)
+ {
+ final String message = "Cannot create default JNDI context";
+ InjectionException.rethrow(message, ne);
+ }
+
+ return ctx;
+ }
+
}
13 years, 12 months
JBossWS SVN: r12325 - in spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi: deployment/integration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-05-26 05:08:23 -0400 (Wed, 26 May 2010)
New Revision: 12325
Modified:
spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java
Log:
[JBPAPP-4384] fixing EJB integration - to be lazy
Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-26 08:40:02 UTC (rev 12324)
+++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-26 09:08:23 UTC (rev 12325)
@@ -24,6 +24,8 @@
import java.util.List;
import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NamingException;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
@@ -127,4 +129,7 @@
/** Ask configured processors for processing of the given record **/
void processRecord(Record record);
+
+ /** Returns associated JNDI context with this endpoint. */
+ Context getJNDIContext();
}
Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
===================================================================
--- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2010-05-26 08:40:02 UTC (rev 12324)
+++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2010-05-26 09:08:23 UTC (rev 12325)
@@ -51,12 +51,6 @@
String getComponentClassName();
/**
- * Returns JNDI context associated with EJB container.
- * @return
- */
- Context getContext();
-
- /**
* Get a unified meta data view represented by an annotation.
*
* @param t
Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
===================================================================
--- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2010-05-26 08:40:02 UTC (rev 12324)
+++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2010-05-26 09:08:23 UTC (rev 12325)
@@ -24,6 +24,8 @@
import java.lang.reflect.UndeclaredThrowableException;
import javax.management.MBeanException;
+import javax.naming.Context;
+import javax.naming.NamingException;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -36,14 +38,17 @@
*/
public abstract class InvocationHandler
{
- /** Create a container specific invocation **/
+ /** Create a container specific invocation */
public abstract Invocation createInvocation();
/** Invoke the the service endpoint */
public abstract void invoke(Endpoint ep, Invocation inv) throws Exception;
- /** Initilize the invocation handler **/
+ /** Initilize the invocation handler */
public abstract void init(Endpoint ep);
+
+ /** Returns JNDI context associated with endpoint */
+ public abstract Context getJNDIContext(Endpoint ep) throws NamingException;
protected void handleInvocationException(Throwable th) throws Exception
{
Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java
===================================================================
--- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2010-05-26 08:40:02 UTC (rev 12324)
+++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2010-05-26 09:08:23 UTC (rev 12325)
@@ -27,8 +27,6 @@
import java.util.LinkedList;
import java.util.Map;
-import javax.naming.Context;
-
/**
* Injections metadata container.
*
@@ -55,40 +53,25 @@
private final Map<Class<? extends Annotation>, ReferenceResolver> referenceResolvers;
/**
- * JNDI context.
- */
- private final Context ctx;
-
- /**
* Constructor.
*
* @param injections injection definitions list
- * @param ctx JNDI context
+ * @param resolvers reference resolvers
*/
- public InjectionsMetaData(Collection<InjectionMetaData> injections, Map<Class<? extends Annotation>, ReferenceResolver> referenceResolvers, Context ctx)
+ public InjectionsMetaData(Collection<InjectionMetaData> injections, Map<Class<? extends Annotation>, ReferenceResolver> resolvers)
{
super();
if (injections == null)
throw new IllegalArgumentException("injections metadata list cannot be null");
- if ((referenceResolvers == null) || (referenceResolvers.size() == 0))
+ if ((resolvers == null) || (resolvers.size() == 0))
throw new IllegalArgumentException("reference resolvers list cannot be null or empty collection");
this.injections = injections;
- this.referenceResolvers = referenceResolvers;
- this.ctx = ctx;
+ this.referenceResolvers = resolvers;
}
/**
- * Returns associated JNDI context.
- * @return associated JNDI context
- */
- public Context getContext()
- {
- return this.ctx;
- }
-
- /**
* Returns all descriptor driven injections metadata for particular class.
*
* @param clazz class to return injection definitions for
13 years, 12 months