[jboss-cvs] JBossAS SVN: r107485 - in branches: weld-ejb3-int/main/src/bin and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-08-06 11:38:21 -0400 (Fri, 06 Aug 2010)
New Revision: 107485

Added:
   branches/weld-ejb3-int/
Modified:
   branches/weld-ejb3-int/main/src/bin/run.conf
   branches/weld-ejb3-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
   branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/DelegatingInterceptorInvocationContext.java
   branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
Log:
created weld-ejb3 integration branch

Copied: branches/weld-ejb3-int (from rev 107484, trunk)

Modified: branches/weld-ejb3-int/main/src/bin/run.conf
===================================================================
--- trunk/main/src/bin/run.conf	2010-08-06 15:33:30 UTC (rev 107484)
+++ branches/weld-ejb3-int/main/src/bin/run.conf	2010-08-06 15:38:21 UTC (rev 107485)
@@ -44,7 +44,7 @@
 fi
 
 # Sample JPDA settings for remote socket debuging
-#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+JAVA_OPTS="$JAVA_OPTS -ea -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n"
 
 # Sample JPDA settings for shared memory debugging 
 #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss"

Modified: branches/weld-ejb3-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java	2010-08-06 15:33:30 UTC (rev 107484)
+++ branches/weld-ejb3-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java	2010-08-06 15:38:21 UTC (rev 107485)
@@ -83,6 +83,8 @@
       aroundInvokeMetaData.setMethodName("aroundInvoke");
       contextIMD.getAroundInvokes().add(aroundInvokeMetaData);
 
+      if (contextIMD.)
+
       // create interceptor metadata instance for JSR-299 specific bindings
       bindingsIMD = new InterceptorMetaData();
       bindingsIMD.setInterceptorClass(BINDINGS_INTERCEPTOR_CLASS_NAME);
@@ -146,7 +148,7 @@
          {
             if (!INJECTION_INTERCEPTOR_CLASS_NAME.equals(interceptorBinding.getInterceptorOrder().iterator().next()))
             {
-               log.warn("The Web Beans SessionnBeanInterceptor is not the inner most EJB interceptor in this deployment. JSR299 injection may not work correctly. Specify " + INJECTION_INTERCEPTOR_CLASS_NAME + " as the first interceptor in the interceptor ordering for " + interceptorBinding.getEjbName());
+               log.warn("The Web Beans SessionBeanInterceptor is not the inner most EJB interceptor in this deployment. JSR299 injection may not work correctly. Specify " + INJECTION_INTERCEPTOR_CLASS_NAME + " as the first interceptor in the interceptor ordering for " + interceptorBinding.getEjbName());
             }
             // TODO automagically make ours the first?
             Object lastInterceptorClassName;

Modified: branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/DelegatingInterceptorInvocationContext.java
===================================================================
--- trunk/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/DelegatingInterceptorInvocationContext.java	2010-08-06 15:33:30 UTC (rev 107484)
+++ branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/DelegatingInterceptorInvocationContext.java	2010-08-06 15:38:21 UTC (rev 107485)
@@ -84,6 +84,6 @@
 
    public Object getTimer()
    {
-      throw new UnsupportedOperationException("Get timer not supported");
+      return delegateInvocationContext.getTimer();
    }
 }
\ No newline at end of file

Modified: branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
===================================================================
--- trunk/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java	2010-08-06 15:33:30 UTC (rev 107484)
+++ branches/weld-ejb3-int/weld-int/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java	2010-08-06 15:38:21 UTC (rev 107485)
@@ -71,7 +71,7 @@
 
    private  void init(InvocationContext invocationContext)
    {
-      // create contextual instances for inteDITrceptors
+      // create contextual instances for interceptors
       interceptorInstances = new ConcurrentHashMap<String, SerializableContextualInstance<Interceptor<Object>, Object>>();
       EjbDescriptor<?> ejbDescriptor = (EjbDescriptor<?>) invocationContext.getContextData().get(SessionBeanInterceptor.EJB_DESCRIPTOR);
       EjbServices ejbServices = beanManager.getServices().get(EjbServices.class);