JBossWS SVN: r10070 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-22 07:58:34 -0400 (Fri, 22 May 2009)
New Revision: 10070
Added:
common/tags/jbossws-common-1.1.1.Alpha1/
Log:
[JBWS-2652] Tagging a jbossws-common-1.1.1.Alpha1 for ALR
Copied: common/tags/jbossws-common-1.1.1.Alpha1 (from rev 10069, common/trunk)
15 years, 10 months
JBossWS SVN: r10069 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-22 06:22:14 -0400 (Fri, 22 May 2009)
New Revision: 10069
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
Log:
[JBWS-2652] Removing ALR fix from 1.1.0 branch: svn merge -r 10067:10066 .
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-22 10:08:09 UTC (rev 10068)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-22 10:22:14 UTC (rev 10069)
@@ -23,8 +23,6 @@
import java.io.File;
import java.net.InetAddress;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.net.UnknownHostException;
import java.util.Set;
@@ -47,12 +45,6 @@
public abstract class AbstractServerConfig implements AbstractServerConfigMBean, ServerConfig
{
private static final Logger log = Logger.getLogger(AbstractServerConfig.class);
-
- protected static final ObjectName OBJECT_NAME_SERVER_CONFIG;
- static
- {
- OBJECT_NAME_SERVER_CONFIG = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- }
// The MBeanServer
private MBeanServer mbeanServer;
@@ -118,56 +110,44 @@
public File getServerTempDir()
{
- return this.getDirFromServerConfig("ServerTempLocation");
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
}
public File getHomeDir()
{
- return this.getDirFromServerConfig("JBossHome");
- }
-
- public File getServerDataDir()
- {
- return this.getDirFromServerConfig("ServerDataLocation");
- }
-
- /**
- * Obtains the specified attribute from the server configuration,
- * represented as a {@link File}.
- *
- * @param attributeName
- * @return
- * @author ALR
- */
- protected File getDirFromServerConfig(final String attributeName)
- {
- // Define the ON to invoke upon
- final ObjectName on = OBJECT_NAME_SERVER_CONFIG;
-
- // Get the URL location
- URL location = null;
try
{
- location = (URL) getMbeanServer().getAttribute(on, attributeName);
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
+ return dir;
}
- catch (final JMException e)
+ catch (JMException e)
{
- throw new RuntimeException("Could not obtain attribute " + attributeName + " from " + on, e);
+ return null;
}
+ }
- // Represent as a File
- File dir = null;
+ public File getServerDataDir()
+ {
try
{
- dir = new File(location.toURI());
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
+ return dir;
}
- catch (final URISyntaxException urise)
+ catch (JMException e)
{
- throw new RuntimeException("Could not desired directory from URL: " + location, urise);
+ return null;
}
-
- // Return
- return dir;
}
public int getWebServicePort()
15 years, 10 months
JBossWS SVN: r10068 - common/trunk/src/main/java/org/jboss/wsf/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-05-22 06:08:09 -0400 (Fri, 22 May 2009)
New Revision: 10068
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
Log:
[JBWS-2652] Porting ALR fix to trunk: svn merge -r 10066:10067 https://svn.jboss.org/repos/jbossws/common/branches/jbossws-common-1.1.0 .
Modified: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-19 18:30:58 UTC (rev 10067)
+++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-22 10:08:09 UTC (rev 10068)
@@ -23,6 +23,8 @@
import java.io.File;
import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.net.UnknownHostException;
import java.util.Set;
@@ -45,6 +47,12 @@
public abstract class AbstractServerConfig implements AbstractServerConfigMBean, ServerConfig
{
private static final Logger log = Logger.getLogger(AbstractServerConfig.class);
+
+ protected static final ObjectName OBJECT_NAME_SERVER_CONFIG;
+ static
+ {
+ OBJECT_NAME_SERVER_CONFIG = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ }
// The MBeanServer
private MBeanServer mbeanServer;
@@ -110,44 +118,56 @@
public File getServerTempDir()
{
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
+ return this.getDirFromServerConfig("ServerTempLocation");
}
public File getHomeDir()
{
+ return this.getDirFromServerConfig("JBossHome");
+ }
+
+ public File getServerDataDir()
+ {
+ return this.getDirFromServerConfig("ServerDataLocation");
+ }
+
+ /**
+ * Obtains the specified attribute from the server configuration,
+ * represented as a {@link File}.
+ *
+ * @param attributeName
+ * @return
+ * @author ALR
+ */
+ protected File getDirFromServerConfig(final String attributeName)
+ {
+ // Define the ON to invoke upon
+ final ObjectName on = OBJECT_NAME_SERVER_CONFIG;
+
+ // Get the URL location
+ URL location = null;
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
- return dir;
+ location = (URL) getMbeanServer().getAttribute(on, attributeName);
}
- catch (JMException e)
+ catch (final JMException e)
{
- return null;
+ throw new RuntimeException("Could not obtain attribute " + attributeName + " from " + on, e);
}
- }
- public File getServerDataDir()
- {
+ // Represent as a File
+ File dir = null;
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return dir;
+ dir = new File(location.toURI());
}
- catch (JMException e)
+ catch (final URISyntaxException urise)
{
- return null;
+ throw new RuntimeException("Could not desired directory from URL: " + location, urise);
}
+
+ // Return
+ return dir;
}
public int getWebServicePort()
15 years, 10 months
JBossWS SVN: r10067 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management.
by jbossws-commits＠lists.jboss.org
Author: ALRubinger
Date: 2009-05-19 14:30:58 -0400 (Tue, 19 May 2009)
New Revision: 10067
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
Log:
[JBWS-2652] Upgrade jbossws-common AbstractServerConfig to new jboss-bootstrap SPIs
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-19 12:39:00 UTC (rev 10066)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2009-05-19 18:30:58 UTC (rev 10067)
@@ -23,6 +23,8 @@
import java.io.File;
import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.net.UnknownHostException;
import java.util.Set;
@@ -45,6 +47,12 @@
public abstract class AbstractServerConfig implements AbstractServerConfigMBean, ServerConfig
{
private static final Logger log = Logger.getLogger(AbstractServerConfig.class);
+
+ protected static final ObjectName OBJECT_NAME_SERVER_CONFIG;
+ static
+ {
+ OBJECT_NAME_SERVER_CONFIG = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ }
// The MBeanServer
private MBeanServer mbeanServer;
@@ -110,44 +118,56 @@
public File getServerTempDir()
{
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return dir;
- }
- catch (JMException e)
- {
- return null;
- }
+ return this.getDirFromServerConfig("ServerTempLocation");
}
public File getHomeDir()
{
+ return this.getDirFromServerConfig("JBossHome");
+ }
+
+ public File getServerDataDir()
+ {
+ return this.getDirFromServerConfig("ServerDataLocation");
+ }
+
+ /**
+ * Obtains the specified attribute from the server configuration,
+ * represented as a {@link File}.
+ *
+ * @param attributeName
+ * @return
+ * @author ALR
+ */
+ protected File getDirFromServerConfig(final String attributeName)
+ {
+ // Define the ON to invoke upon
+ final ObjectName on = OBJECT_NAME_SERVER_CONFIG;
+
+ // Get the URL location
+ URL location = null;
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
- return dir;
+ location = (URL) getMbeanServer().getAttribute(on, attributeName);
}
- catch (JMException e)
+ catch (final JMException e)
{
- return null;
+ throw new RuntimeException("Could not obtain attribute " + attributeName + " from " + on, e);
}
- }
- public File getServerDataDir()
- {
+ // Represent as a File
+ File dir = null;
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return dir;
+ dir = new File(location.toURI());
}
- catch (JMException e)
+ catch (final URISyntaxException urise)
{
- return null;
+ throw new RuntimeException("Could not desired directory from URL: " + location, urise);
}
+
+ // Return
+ return dir;
}
public int getWebServicePort()
15 years, 10 months
JBossWS SVN: r10065 - common/tags/jbossws-common-1.1.0.SP1/src/main/java/org/jboss/wsf/common/injection.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-19 08:38:11 -0400 (Tue, 19 May 2009)
New Revision: 10065
Modified:
common/tags/jbossws-common-1.1.0.SP1/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
Log:
[JBWS-2074] use JNDI lazily
Modified: common/tags/jbossws-common-1.1.0.SP1/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/tags/jbossws-common-1.1.0.SP1/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-05-19 12:36:59 UTC (rev 10064)
+++ common/tags/jbossws-common-1.1.0.SP1/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-05-19 12:38:11 UTC (rev 10065)
@@ -101,20 +101,14 @@
if (injections == null)
return;
- final Context ctx = getContext(injections);
-
// inject descriptor driven annotations
- final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
- for (InjectionMetaData injectionMD : injectionMDs)
- {
- injectDescriptorAnnotatedAccessibleObjects(instance, ctx, injectionMD);
- }
+ injectDescriptorAnnotatedAccessibleObjects(instance, injections);
// inject @Resource annotated methods and fields
- injectResourceAnnotatedAccessibleObjects(instance, ctx, injections);
+ injectResourceAnnotatedAccessibleObjects(instance, injections);
// inject @EJB annotated methods and fields
- injectEJBAnnotatedAccessibleObjects(instance, getDefaultContext(), injections);
+ injectEJBAnnotatedAccessibleObjects(instance, injections);
}
/**
@@ -246,44 +240,51 @@
* Performs descriptor driven injections.
*
* @param instance to operate on
- * @param ctx JNDI context
- * @param injectionMD injections metadata
+ * @param injections injections metadata
*/
- private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionMetaData injectionMD)
+ private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
- final Method method = getMethod(injectionMD, instance.getClass());
- if (method != null)
+ final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
+ final Context ctx = !injectionMDs.isEmpty() ? getContext(injections) : null;
+
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- try
+
+ final Method method = getMethod(injectionMD, instance.getClass());
+ if (method != null)
{
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
- InjectionException.rethrow(message, e);
- }
- }
- else
- {
- final Field field = getField(injectionMD, instance.getClass());
- if (field != null)
- {
try
{
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
}
catch (Exception e)
{
- final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
InjectionException.rethrow(message, e);
}
}
else
{
- final String message = "Cannot find injection target for: " + injectionMD;
- throw new InjectionException(message);
+ final Field field = getField(injectionMD, instance.getClass());
+ if (field != null)
+ {
+ try
+ {
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ InjectionException.rethrow(message, e);
+ }
+ }
+ else
+ {
+ final String message = "Cannot find injection target for: " + injectionMD;
+ throw new InjectionException(message);
+ }
}
+
}
}
@@ -291,16 +292,19 @@
* Injects @Resource annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @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 Context ctx, final InjectionsMetaData injections)
+ private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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
- final Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instance.getClass());
for (Field field : resourceAnnotatedFields)
{
try
@@ -316,7 +320,6 @@
}
// Inject @Resource annotated methods
- final Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instance.getClass());
for(Method method : resourceAnnotatedMethods)
{
try
@@ -336,16 +339,19 @@
* Injects @EJB annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @see org.jboss.wsf.common.injection.finders.EJBFieldFinder
* @see org.jboss.wsf.common.injection.finders.EJBMethodFinder
* @see javax.ejb.EJB
*/
- private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionsMetaData injections)
+ private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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;
+
// Inject @EJB annotated fields
- final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
for (Field field : ejbAnnotatedFields)
{
try
@@ -361,7 +367,6 @@
}
// Inject @EJB annotated methods
- final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
for(Method method : ejbAnnotatedMethods)
{
try
15 years, 10 months
JBossWS SVN: r10064 - common/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-19 08:36:59 -0400 (Tue, 19 May 2009)
New Revision: 10064
Added:
common/tags/jbossws-common-1.1.0.SP1/
Log:
creating SP1 release tag
Copied: common/tags/jbossws-common-1.1.0.SP1 (from rev 10063, common/tags/jbossws-common-1.1.0.GA)
15 years, 10 months
JBossWS SVN: r10063 - 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: 2009-05-19 08:34:30 -0400 (Tue, 19 May 2009)
New Revision: 10063
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
Log:
[JBWS-2074] use JNDI lazily
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 2009-05-19 12:31:34 UTC (rev 10062)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-05-19 12:34:30 UTC (rev 10063)
@@ -101,20 +101,14 @@
if (injections == null)
return;
- final Context ctx = getContext(injections);
-
// inject descriptor driven annotations
- final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
- for (InjectionMetaData injectionMD : injectionMDs)
- {
- injectDescriptorAnnotatedAccessibleObjects(instance, ctx, injectionMD);
- }
+ injectDescriptorAnnotatedAccessibleObjects(instance, injections);
// inject @Resource annotated methods and fields
- injectResourceAnnotatedAccessibleObjects(instance, ctx, injections);
+ injectResourceAnnotatedAccessibleObjects(instance, injections);
// inject @EJB annotated methods and fields
- injectEJBAnnotatedAccessibleObjects(instance, getDefaultContext(), injections);
+ injectEJBAnnotatedAccessibleObjects(instance, injections);
}
/**
@@ -246,44 +240,51 @@
* Performs descriptor driven injections.
*
* @param instance to operate on
- * @param ctx JNDI context
- * @param injectionMD injections metadata
+ * @param injections injections metadata
*/
- private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionMetaData injectionMD)
+ private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
- final Method method = getMethod(injectionMD, instance.getClass());
- if (method != null)
+ final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
+ final Context ctx = !injectionMDs.isEmpty() ? getContext(injections) : null;
+
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- try
+
+ final Method method = getMethod(injectionMD, instance.getClass());
+ if (method != null)
{
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
- InjectionException.rethrow(message, e);
- }
- }
- else
- {
- final Field field = getField(injectionMD, instance.getClass());
- if (field != null)
- {
try
{
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
}
catch (Exception e)
{
- final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
InjectionException.rethrow(message, e);
}
}
else
{
- final String message = "Cannot find injection target for: " + injectionMD;
- throw new InjectionException(message);
+ final Field field = getField(injectionMD, instance.getClass());
+ if (field != null)
+ {
+ try
+ {
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ InjectionException.rethrow(message, e);
+ }
+ }
+ else
+ {
+ final String message = "Cannot find injection target for: " + injectionMD;
+ throw new InjectionException(message);
+ }
}
+
}
}
@@ -291,16 +292,19 @@
* Injects @Resource annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @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 Context ctx, final InjectionsMetaData injections)
+ private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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
- final Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instance.getClass());
for (Field field : resourceAnnotatedFields)
{
try
@@ -316,7 +320,6 @@
}
// Inject @Resource annotated methods
- final Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instance.getClass());
for(Method method : resourceAnnotatedMethods)
{
try
@@ -336,16 +339,19 @@
* Injects @EJB annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @see org.jboss.wsf.common.injection.finders.EJBFieldFinder
* @see org.jboss.wsf.common.injection.finders.EJBMethodFinder
* @see javax.ejb.EJB
*/
- private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionsMetaData injections)
+ private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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;
+
// Inject @EJB annotated fields
- final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
for (Field field : ejbAnnotatedFields)
{
try
@@ -361,7 +367,6 @@
}
// Inject @EJB annotated methods
- final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
for(Method method : ejbAnnotatedMethods)
{
try
15 years, 10 months
JBossWS SVN: r10062 - common/trunk/src/main/java/org/jboss/wsf/common/injection.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-19 08:31:34 -0400 (Tue, 19 May 2009)
New Revision: 10062
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
Log:
[JBWS-2074] use JNDI lazily
Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-05-19 10:03:34 UTC (rev 10061)
+++ common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-05-19 12:31:34 UTC (rev 10062)
@@ -101,20 +101,14 @@
if (injections == null)
return;
- final Context ctx = getContext(injections);
-
// inject descriptor driven annotations
- final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
- for (InjectionMetaData injectionMD : injectionMDs)
- {
- injectDescriptorAnnotatedAccessibleObjects(instance, ctx, injectionMD);
- }
+ injectDescriptorAnnotatedAccessibleObjects(instance, injections);
// inject @Resource annotated methods and fields
- injectResourceAnnotatedAccessibleObjects(instance, ctx, injections);
+ injectResourceAnnotatedAccessibleObjects(instance, injections);
// inject @EJB annotated methods and fields
- injectEJBAnnotatedAccessibleObjects(instance, getDefaultContext(), injections);
+ injectEJBAnnotatedAccessibleObjects(instance, injections);
}
/**
@@ -246,44 +240,51 @@
* Performs descriptor driven injections.
*
* @param instance to operate on
- * @param ctx JNDI context
- * @param injectionMD injections metadata
+ * @param injections injections metadata
*/
- private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionMetaData injectionMD)
+ private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
- final Method method = getMethod(injectionMD, instance.getClass());
- if (method != null)
+ final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
+ final Context ctx = !injectionMDs.isEmpty() ? getContext(injections) : null;
+
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- try
+
+ final Method method = getMethod(injectionMD, instance.getClass());
+ if (method != null)
{
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
- InjectionException.rethrow(message, e);
- }
- }
- else
- {
- final Field field = getField(injectionMD, instance.getClass());
- if (field != null)
- {
try
{
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
}
catch (Exception e)
{
- final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
InjectionException.rethrow(message, e);
}
}
else
{
- final String message = "Cannot find injection target for: " + injectionMD;
- throw new InjectionException(message);
+ final Field field = getField(injectionMD, instance.getClass());
+ if (field != null)
+ {
+ try
+ {
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
+ InjectionException.rethrow(message, e);
+ }
+ }
+ else
+ {
+ final String message = "Cannot find injection target for: " + injectionMD;
+ throw new InjectionException(message);
+ }
}
+
}
}
@@ -291,16 +292,19 @@
* Injects @Resource annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @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 Context ctx, final InjectionsMetaData injections)
+ private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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
- final Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instance.getClass());
for (Field field : resourceAnnotatedFields)
{
try
@@ -316,7 +320,6 @@
}
// Inject @Resource annotated methods
- final Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instance.getClass());
for(Method method : resourceAnnotatedMethods)
{
try
@@ -336,16 +339,19 @@
* Injects @EJB annotated accessible objects.
*
* @param instance to operate on
- * @param ctx JNDI context
* @param injections injections meta data
* @see org.jboss.wsf.common.injection.finders.EJBFieldFinder
* @see org.jboss.wsf.common.injection.finders.EJBMethodFinder
* @see javax.ejb.EJB
*/
- private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final Context ctx, final InjectionsMetaData injections)
+ private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
{
+ 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;
+
// Inject @EJB annotated fields
- final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
for (Field field : ejbAnnotatedFields)
{
try
@@ -361,7 +367,6 @@
}
// Inject @EJB annotated methods
- final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
for(Method method : ejbAnnotatedMethods)
{
try
15 years, 10 months
JBossWS SVN: r10061 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules: server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-05-19 06:03:34 -0400 (Tue, 19 May 2009)
New Revision: 10061
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
sync with trunk
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-05-19 09:34:55 UTC (rev 10060)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2009-05-19 10:03:34 UTC (rev 10061)
@@ -87,6 +87,8 @@
{
try
{
+ BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
+
Reference ref = (Reference)obj;
// Get the target class name
@@ -121,8 +123,6 @@
// Get the URL to the wsdl
URL wsdlURL = serviceRef.getWsdlLocation();
- BusFactory.setThreadDefaultBus(null); // cleanup thread locals before constructing Service
-
// Generic javax.xml.ws.Service
if (serviceClass == Service.class)
{
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-05-19 09:34:55 UTC (rev 10060)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2009-05-19 10:03:34 UTC (rev 10061)
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.servlet.CXFServlet;
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
@@ -129,6 +130,7 @@
{
try
{
+ BusFactory.setThreadDefaultBus(getBus());
EndpointAssociation.setEndpoint(endpoint);
RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler();
requestHandler.handleHttpRequest(endpoint, req, res, getServletContext());
@@ -136,6 +138,7 @@
finally
{
EndpointAssociation.removeEndpoint();
+ BusFactory.setThreadDefaultBus(null);
}
}
15 years, 10 months