jlaskowski    2005/06/19 18:40:32

  Modified:    modules/core/src/java/org/openejb/core/stateful
                        SimplePassivater.java StatefulContainer.java
                        StatefulEjbObjectHandler.java
                        StatefulInstanceManager.java package.html
  Log:

  A step towards cutting the 1.0 release:
    o openejb:release goal to cut a release
    o polishing the sources so that javadoc is built without any errors or 
warnings
    o Add javadoc to release in openejb:release
  
  Revision  Changes    Path
  1.3       +4 -4      
openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java
  
  Index: SimplePassivater.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimplePassivater.java     25 Oct 2004 12:34:41 -0000      1.2
  +++ SimplePassivater.java     19 Jun 2005 22:40:32 -0000      1.3
  @@ -122,9 +122,9 @@
       /**
        *
        * @param primaryKey
  -     * @return
  +     * @return object
        * @exception org.openejb.SystemException
  -     *                   If there is an problem retreiving the instance from 
the .ser file.
  +     *                   If there is an problem retrieving the instance from 
the .ser file.
        */
       public Object activate(Object primaryKey) throws 
org.openejb.SystemException{
   
  
  
  
  1.3       +6 -10     
openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulContainer.java
  
  Index: StatefulContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StatefulContainer.java    26 Aug 2004 07:20:26 -0000      1.2
  +++ StatefulContainer.java    19 Jun 2005 22:40:32 -0000      1.3
  @@ -159,7 +159,6 @@
        *
        * @return an array of DeploymentInfo objects
        * @see org.openejb.DeploymentInfo
  -     * @see org.openejb.ContainerSystem#deployments() 
ContainerSystem.deployments()
        */
       public DeploymentInfo [] deployments() {
           return(DeploymentInfo [])deploymentRegistry.values().toArray(new 
DeploymentInfo[deploymentRegistry.size()]);
  @@ -168,10 +167,9 @@
       /**
        * Gets the <code>DeploymentInfo</code> object for the bean with the 
specified deployment id.
        *
  -     * @param id the deployment id of the deployed bean.
  +     * @param deploymentID the deployment id of the deployed bean.
        * @return the DeploymentInfo object associated with the bean.
        * @see org.openejb.DeploymentInfo
  -     * @see org.openejb.ContainerSystem#getDeploymentInfo(Object) 
ContainerSystem.getDeploymentInfo
        * @see org.openejb.DeploymentInfo#getDeploymentID()
        */
       public DeploymentInfo getDeploymentInfo(Object deploymentID) {
  @@ -189,7 +187,6 @@
        * Gets the id of this container.
        *
        * @return the id of this container.
  -     * @see org.openejb.DeploymentInfo#getContainerID() 
DeploymentInfo.getContainerID()
        */
       public Object getContainerID() {
           return containerID;
  @@ -197,7 +194,7 @@
   
       /**
        * Adds a bean to this container.
  -     * @param deploymentId the deployment id of the bean to deploy.
  +     * @param deploymentID the deployment id of the bean to deploy.
        * @param info the DeploymentInfo object associated with the bean.
        * @throws org.openejb.OpenEJBException
        *      Occurs when the container is not able to deploy the bean for some
  @@ -211,18 +208,17 @@
   
       /**
        * Invokes a method on an instance of the specified bean deployment.
  +     * (processes all business methods on an remote interface)
        *
        * @param deployID the dployment id of the bean deployment
        * @param callMethod the method to be called on the bean instance
        * @param args the arguments to use when invoking the specified method
        * @param primKey the primary key class of the bean or null if the bean 
does not need a primary key
  -     * @param prncpl
  +     * @param securityIdentity identity
        * @return the result of invoking the specified method on the bean 
instance
        * @throws org.openejb.OpenEJBException
  -     * @see org.openejb.Container#invoke Container.invoke
        * @see org.openejb.core.stateless.StatelessContainer#invoke 
StatelessContainer.invoke
        */
  -    // process all business methods on an remote interface
       public Object invoke(Object deployID, Method callMethod,Object [] 
args,Object primKey, Object securityIdentity)    throws 
org.openejb.OpenEJBException{
           try {
   
  
  
  
  1.2       +3 -3      
openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulEjbObjectHandler.java
  
  Index: StatefulEjbObjectHandler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulEjbObjectHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatefulEjbObjectHandler.java     26 Mar 2004 21:42:36 -0000      1.1
  +++ StatefulEjbObjectHandler.java     19 Jun 2005 22:40:32 -0000      1.2
  @@ -85,7 +85,7 @@
        * @param method
        * @param args
        * @param proxy
  -     * @return 
  +     * @return Object
        * @exception Throwable
        */
       protected Object getPrimaryKey(Method method, Object[] args, Object 
proxy) throws Throwable{
  @@ -124,7 +124,7 @@
        * @param method
        * @param args
        * @param proxy
  -     * @return 
  +     * @return Object 
        * @exception Throwable
        */
       protected Object isIdentical(Method method, Object[] args, Object proxy) 
throws Throwable{
  
  
  
  1.2       +7 -16     
openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulInstanceManager.java
  
  Index: StatefulInstanceManager.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/StatefulInstanceManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatefulInstanceManager.java      26 Mar 2004 21:42:37 -0000      1.1
  +++ StatefulInstanceManager.java      19 Jun 2005 22:40:32 -0000      1.2
  @@ -185,9 +185,7 @@
        * 
        * @param primaryKey the primary key of the bean instance
        * @return the ancillary state object
  -     * @exception OpenEJBException
  -     *                   if there is a problem retrieving the ancillary 
state object
  -     * @see SessionKey
  +     * @exception OpenEJBException if there is a problem retrieving the 
ancillary state object
        */
       public Object getAncillaryState(Object primaryKey)
       throws OpenEJBException{
  @@ -205,7 +203,6 @@
        *                   the new ancillary state of the bean instance in 
this instance manager
        * @exception OpenEJBException
        *                   if there is a problem setting the ancillary state 
object
  -     * @see SessionKey
        */
       public void setAncillaryState(Object primaryKey, Object ancillaryState)
       throws OpenEJBException{
  @@ -224,7 +221,6 @@
        * @return an new instance of the bean class
        * @exception OpenEJBException
        *                   if there is a problem initializing the bean class
  -     * @see SessionKey
        */
       public EnterpriseBean newInstance(Object primaryKey, Class beanClass)
       throws OpenEJBException{
  @@ -241,7 +237,6 @@
        * @return an new instance of the bean class
        * @exception OpenEJBException
        *                   if there is a problem initializing the bean class
  -     * @see SessionKey
        */
       public EnterpriseBean newInstance(Object primaryKey, Object 
ancillaryState, Class beanClass)
       throws OpenEJBException{
  @@ -293,7 +288,6 @@
        *                   if there is a problem retreiving the instance from 
the pool
        * @exception InvalidateReferenceException
        *                   if the instance has timed out
  -     * @see SessionKey
        */
       public SessionBean obtainInstance(Object primaryKey, ThreadContext 
callContext)throws OpenEJBException{
           if ( primaryKey == null ) {
  @@ -424,7 +418,6 @@
        * @param bean       an instance of the bean class
        * @exception OpenEJBException
        *                   if there is a problem adding the instance to the 
pool
  -     * @see SessionKey
        */
       public void poolInstance(Object primaryKey, EnterpriseBean bean)
       throws OpenEJBException{
  @@ -463,11 +456,9 @@
        * this instance manager's pool.  The primaryKey will be of type 
SessionKey
        * 
        * @param primaryKey the unique key that can identify the instance to be 
freed
  -     * @return 
  -     * @exception OpenEJBException
  -     *                   if there is a problem removing the bean instance 
from the pool
  +     * @return EnterpriseBean
  +     * @exception SystemException if there is a problem removing the bean 
instance from the pool
        * @exception org.openejb.SystemException
  -     * @see Sessionkey
        */
       public EnterpriseBean freeInstance(Object primaryKey)
       throws org.openejb.SystemException{
  @@ -548,7 +539,7 @@
        * 
        * @param entry
        * @param t
  -     * @return 
  +     * @return InvalidateReferenceException
        * @exception org.openejb.SystemException
        */
       protected org.openejb.InvalidateReferenceException destroy(BeanEntry 
entry, Exception t) 
  @@ -582,7 +573,7 @@
        * Used by get/setAncillaryState( ) methods
        * 
        * @param primaryKey
  -     * @return 
  +     * @return BeanEntry 
        * @exception OpenEJBException
        */
       protected BeanEntry getBeanEntry(Object primaryKey)
  
  
  
  1.3       +2 -3      
openejb1/modules/core/src/java/org/openejb/core/stateful/package.html
  
  Index: package.html
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/package.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package.html      8 Jul 2004 11:55:25 -0000       1.2
  +++ package.html      19 Jun 2005 22:40:32 -0000      1.3
  @@ -67,8 +67,7 @@
   
   <!-- Put @see and @since tags down here. -->
   @see org.openejb.core.ContainerSystem
  [EMAIL PROTECTED] org.openejb.core.ContainerManager
  [EMAIL PROTECTED] org.openejb.core.Container
  [EMAIL PROTECTED] org.openejb.Container
   @see org.openejb.core.DeploymentInfo
   </body>
   </html>
  
  
  

Reply via email to