[Jboss-cvs] JBossAS SVN: r55035 - in trunk/tomcat/src/main/org/jboss/web: jsf/integration/injection tomcat/tc5/session tomcat/tc6/session

[Sacha Labourey]

Rémy, are you sure you can compile the tomcat module on jboss-head HEAD? 
it fails for me:

    [javac] 
P:\SVN_HOME\jboss-head\tomcat\src\main\org\jboss\web\tomcat\tc6\sess
ion\ClusteredSession.java:670: cannot find symbol
    [javac] symbol  : variable ACTIVITY_CHECK
    [javac] location: class 
org.jboss.web.tomcat.tc6.session.ClusteredSession
    [javac]       if (ACTIVITY_CHECK && accessCount.get() > 0)
    [javac]           ^
    [javac] 
P:\SVN_HOME\jboss-head\tomcat\src\main\org\jboss\web\tomcat\tc6\sess
ion\ClusteredSession.java:670: int cannot be dereferenced
    [javac]       if (ACTIVITY_CHECK && accessCount.get() > 0)
    [javac]                                        ^
    [javac] 
P:\SVN_HOME\jboss-head\tomcat\src\main\org\jboss\web\tomcat\tc6\sess
ion\ClusteredSession.java:793: incompatible types
    [javac] found   : <nulltype>
    [javac] required: int
    [javac]          accessCount = null;
    [javac]                        ^
    [javac] Note: Some input files use or override a deprecated API.
    [javac] Note: Recompile with -Xlint:deprecation for details.
    [javac] Note: Some input files use unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 7 errors
    [javac] 4 warnings

BUILD FAILED
P:\SVN_HOME\jboss-head\tomcat\build.xml:163: Compile failed; see the 
compiler er
ror output for details.

jboss-cvs-commits at lists.jboss.org wrote:
> Author: remy.maucherat at jboss.com
> Date: 2006-08-02 11:32:54 -0400 (Wed, 02 Aug 2006)
> New Revision: 55035
>
> Removed:
>    trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java~
>    trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java~
> Modified:
>    trunk/tomcat/src/main/org/jboss/web/jsf/integration/injection/JBossInjectionProvider.java
>    trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSession.java
>    trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/ClusteredSession.java
> Log:
> - API changes in TC 6.
>
> Modified: trunk/tomcat/src/main/org/jboss/web/jsf/integration/injection/JBossInjectionProvider.java
> ===================================================================
> --- trunk/tomcat/src/main/org/jboss/web/jsf/integration/injection/JBossInjectionProvider.java	2006-08-02 14:53:34 UTC (rev 55034)
> +++ trunk/tomcat/src/main/org/jboss/web/jsf/integration/injection/JBossInjectionProvider.java	2006-08-02 15:32:54 UTC (rev 55035)
> @@ -26,7 +26,7 @@
>  import com.sun.faces.spi.InjectionProviderException;
>  import javax.naming.Context;
>  import javax.naming.InitialContext;
> -import org.apache.catalina.util.AnnotationProcessor;
> +import org.apache.catalina.util.DefaultAnnotationProcessor;
>  import org.apache.log4j.Logger;
>  
>  /**
> @@ -40,6 +40,7 @@
>      private static final String NAMING_DISABLED = "Injection of naming resources into JSF managed beans disabled.";
>  
>      private Context namingContext;
> +    private DefaultAnnotationProcessor annotationProcessor = null; 
>      
>      /**
>       * Uses the default naming context for injection of resources into managed beans.
> @@ -47,6 +48,7 @@
>      public JBossInjectionProvider() {
>          try {
>              this.namingContext = new InitialContext();
> +            this.annotationProcessor = new DefaultAnnotationProcessor(this.namingContext);
>          } catch (Exception e) {
>              LOG.warn(NAMING_DISABLED, e);
>          }
> @@ -67,6 +69,7 @@
>          }
>          
>          this.namingContext = namingContext;
> +        this.annotationProcessor = new DefaultAnnotationProcessor(this.namingContext);
>      }
>      
>      /**
> @@ -74,7 +77,7 @@
>       */
>      public void invokePreDestroy(Object managedBean) throws InjectionProviderException {
>          try {
> -            AnnotationProcessor.preDestroy(managedBean);
> +            annotationProcessor.preDestroy(managedBean);
>          } catch (Exception e) {
>              LOG.error("PreDestroy failed on managed bean.", e);
>          }
> @@ -87,14 +90,14 @@
>      public void inject(Object managedBean) throws InjectionProviderException {
>          if (this.namingContext != null) {
>              try {
> -                AnnotationProcessor.injectNamingResources(this.namingContext, managedBean);
> +                annotationProcessor.processAnnotations(managedBean);
>              } catch (Exception e) {
>                  LOG.error("Injection failed on managed bean.", e);
>              }
>          }
>          
>          try {
> -            AnnotationProcessor.postConstruct(managedBean);
> +            annotationProcessor.postConstruct(managedBean);
>          } catch (Exception e) {
>              LOG.error("PostConstruct failed on managed bean.", e);
>          }
>
> Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSession.java
> ===================================================================
> --- trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSession.java	2006-08-02 14:53:34 UTC (rev 55034)
> +++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/session/ClusteredSession.java	2006-08-02 15:32:54 UTC (rev 55035)
> @@ -659,11 +659,6 @@
>           return false;
>        }
>  
> -      if (accessCount > 0)
> -      {
> -         return true;
> -      }
> -
>        if (maxInactiveInterval >= 0)
>        {
>           long timeNow = System.currentTimeMillis();
> @@ -782,7 +777,6 @@
>                 }
>              }
>           }
> -         accessCount = 0;
>  
>           // Notify interested session event listeners. 
>           if (notify)
>
> Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/ClusteredSession.java
> ===================================================================
> --- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/ClusteredSession.java	2006-08-02 14:53:34 UTC (rev 55034)
> +++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/ClusteredSession.java	2006-08-02 15:32:54 UTC (rev 55035)
> @@ -667,9 +667,9 @@
>           return false;
>        }
>  
> -      if (accessCount > 0)
> +      if (ACTIVITY_CHECK && accessCount.get() > 0)
>        {
> -         return true;
> +          return true;
>        }
>  
>        if (maxInactiveInterval >= 0)
> @@ -790,7 +790,7 @@
>                 }
>              }
>           }
> -         accessCount = 0;
> +         accessCount = null;
>  
>           // Notify interested session event listeners. 
>           if (notify)
>
> Deleted: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheCluster.java~
> ===================================================================
> (Binary files differ)
>
> Deleted: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/session/JBossCacheManager.java~
> ===================================================================
> (Binary files differ)
>
> _______________________________________________
> jboss-cvs-commits mailing list
> jboss-cvs-commits at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jboss-cvs-commits
>
>