[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 07/06/20 18:11:30

  Modified:    src/main/org/jboss/seam    Seam.java core-1.3.xsd
                        web-1.3.xsd
  Log:
  move the Session API
  
  Revision  Changes    Path
  1.34      +4 -4      jboss-seam/src/main/org/jboss/seam/Seam.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Seam.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Seam.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- Seam.java	20 Jun 2007 17:45:54 -0000	1.33
  +++ Seam.java	20 Jun 2007 22:11:30 -0000	1.34
  @@ -1,4 +1,4 @@
  -//$Id: Seam.java,v 1.33 2007/06/20 17:45:54 gavin Exp $
  +//$Id: Seam.java,v 1.34 2007/06/20 22:11:30 gavin Exp $
   package org.jboss.seam;
   
   import static org.jboss.seam.ComponentType.ENTITY_BEAN;
  @@ -22,10 +22,10 @@
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.core.ServletSession;
   import org.jboss.seam.init.DeploymentDescriptorInfo;
   import org.jboss.seam.init.DeploymentDescriptorInfo.EjbInfo;
   import org.jboss.seam.util.Strings;
  +import org.jboss.seam.web.Session;
   
   /**
    * Convenience methods for accessing annotated information
  @@ -226,7 +226,7 @@
       */
      public static void invalidateSession()
      {
  -      ServletSession.instance().invalidate();
  +      Session.instance().invalidate();
      }
      
      /**
  @@ -236,7 +236,7 @@
       */
      public static boolean isSessionInvalid()
      {
  -      return ServletSession.instance().isInvalid();
  +      return Session.instance().isInvalid();
      }
      
      /**
  
  
  
  1.16      +0 -10     jboss-seam/src/main/org/jboss/seam/core-1.3.xsd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: core-1.3.xsd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core-1.3.xsd,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- core-1.3.xsd	20 Jun 2007 21:44:40 -0000	1.15
  +++ core-1.3.xsd	20 Jun 2007 22:11:30 -0000	1.16
  @@ -44,16 +44,6 @@
           <xs:attribute name="parent-conversation-id-parameter"/>
       </xs:attributeGroup>
       
  -    <xs:element name="servlet-session">
  -        <xs:complexType mixed="true">
  -            <xs:attributeGroup ref="components:attlist.component"/>
  -            <xs:attributeGroup ref="core:attlist.servlet-session"/>
  -        </xs:complexType>
  -    </xs:element>
  -    <xs:attributeGroup name="attlist.servlet-session">
  -        <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/>
  -    </xs:attributeGroup>
  -    
       <xs:element name="ejb-transaction-listener">
           <xs:complexType mixed="true">
               <xs:attributeGroup ref="components:attlist.component"/>
  
  
  
  1.4       +9 -1      jboss-seam/src/main/org/jboss/seam/web-1.3.xsd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: web-1.3.xsd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web-1.3.xsd,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- web-1.3.xsd	30 May 2007 00:52:57 -0000	1.3
  +++ web-1.3.xsd	20 Jun 2007 22:11:30 -0000	1.4
  @@ -69,6 +69,14 @@
           <xs:attribute name="max-request-size" type="xs:integer"/>
       </xs:attributeGroup>
       
  -   
  +    <xs:element name="servlet-session">
  +        <xs:complexType mixed="true">
  +            <xs:attributeGroup ref="components:attlist.component"/>
  +            <xs:attributeGroup ref="web:attlist.servlet-session"/>
  +        </xs:complexType>
  +    </xs:element>
  +    <xs:attributeGroup name="attlist.servlet-session">
  +        <xs:attribute name="invalidate-on-scheme-change" type="xs:boolean"/>
  +    </xs:attributeGroup>   
      
   </xs:schema>