jlaskowski 2005/06/19 18:40:31
Modified: modules/core/src/java/org/openejb/core/entity
EntityContainer.java EntityEjbObjectHandler.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.4 +6 -14
openejb1/modules/core/src/java/org/openejb/core/entity/EntityContainer.java
Index: EntityContainer.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/entity/EntityContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EntityContainer.java 26 Aug 2004 07:20:26 -0000 1.3
+++ EntityContainer.java 19 Jun 2005 22:40:31 -0000 1.4
@@ -162,7 +162,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()]);
@@ -175,7 +174,6 @@
* @param deploymentID
* @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){
@@ -194,7 +192,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;
@@ -202,7 +199,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
@@ -221,10 +218,9 @@
* @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.stateful.StatefulContainer#invoke
StatefulContainer.invoke
*/
public Object invoke(Object deployID, Method callMethod,Object []
args,Object primKey, Object securityIdentity) throws
org.openejb.OpenEJBException{
@@ -534,7 +530,7 @@
* @param callMethod
* @param args
* @param callContext
- * @return
+ * @return Object
* @exception org.openejb.OpenEJBException
*/
protected Object findMethod(Method callMethod, Object [] args,
ThreadContext callContext)
@@ -583,7 +579,7 @@
* @param callMethod
* @param args
* @param callContext
- * @return
+ * @return Object
* @exception org.openejb.OpenEJBException
*/
protected Object homeMethod(Method callMethod, Object [] args,
ThreadContext callContext)
@@ -608,8 +604,6 @@
EntityBean bean = null;
txPolicy.beforeInvoke( bean, txContext );
- Object returnValue = null;
-
try{
// this is nessary to ensure that the ejbLoad method is execute
in the context of the business method
bean = instanceManager.obtainInstance(callContext);
@@ -636,10 +630,8 @@
/**
- *
* @param bean
* @param threadContext
- * @exception org.openejb.SystemException
*/
public void discardInstance(EnterpriseBean bean, ThreadContext
threadContext) {
if ( bean != null ) {
1.2 +2 -2
openejb1/modules/core/src/java/org/openejb/core/entity/EntityEjbObjectHandler.java
Index: EntityEjbObjectHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/entity/EntityEjbObjectHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityEjbObjectHandler.java 26 Mar 2004 21:42:26 -0000 1.1
+++ EntityEjbObjectHandler.java 19 Jun 2005 22:40:31 -0000 1.2
@@ -150,7 +150,7 @@
* @param method
* @param args
* @param proxy
- * @return
+ * @return Object
* @exception Throwable
*/
protected Object isIdentical(Method method, Object[] args, Object proxy)
throws Throwable{
1.3 +1 -3
openejb1/modules/core/src/java/org/openejb/core/entity/package.html
Index: package.html
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/entity/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 8 Jul 2004 11:55:24 -0000 1.2
+++ package.html 19 Jun 2005 22:40:31 -0000 1.3
@@ -67,8 +67,6 @@
<!-- Put @see and @since tags down here. -->
@see org.openejb.core.ContainerSystem
[EMAIL PROTECTED] org.openejb.core.ContainerManager
[EMAIL PROTECTED] org.openejb.core.Container
@see org.openejb.core.DeploymentInfo
</body>
</html>
