You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2003/12/07 04:50:30 UTC
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service AbstractManagedObject.java
adc 2003/12/06 19:50:30
Modified: modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service
ClassSpaceMetadata.java MBeanMetadataXMLLoader.java
modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task
DeploymentTask.java
modules/kernel/src/java/org/apache/geronimo/kernel/service
AbstractManagedObject.java
Log:
Several corrections to typos and updates to javadoc from Jacek Laskowski.
Revision Changes Path
1.5 +2 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/ClassSpaceMetadata.java
Index: ClassSpaceMetadata.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/ClassSpaceMetadata.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassSpaceMetadata.java 10 Nov 2003 20:36:32 -0000 1.4
+++ ClassSpaceMetadata.java 7 Dec 2003 03:50:29 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
/**
- * This class contains the information necessary to setup a class space for a deployment.
+ * This class contains the information necessary to set up a class space for a deployment.
*
* @version $Revision$ $Date$
*/
1.6 +2 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadataXMLLoader.java
Index: MBeanMetadataXMLLoader.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/service/MBeanMetadataXMLLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MBeanMetadataXMLLoader.java 16 Nov 2003 00:50:28 -0000 1.5
+++ MBeanMetadataXMLLoader.java 7 Dec 2003 03:50:29 -0000 1.6
@@ -89,7 +89,7 @@
md.setName(new ObjectName(s));
}
} catch (MalformedObjectNameException e) {
- throw new DeploymentException("Invalid ObjectName" + s, e);
+ throw new DeploymentException("Invalid ObjectName: " + s, e);
}
NodeList nl = element.getElementsByTagName("constructor");
1.2 +7 -7 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeploymentTask.java
Index: DeploymentTask.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeploymentTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeploymentTask.java 8 Sep 2003 04:38:34 -0000 1.1
+++ DeploymentTask.java 7 Dec 2003 03:50:29 -0000 1.2
@@ -58,9 +58,9 @@
import org.apache.geronimo.kernel.deployment.DeploymentException;
/**
- * DeploymenTask is a single unit of work in a plan. The plan checks is all tasks canRun() before
- * executing the plan and performing all the tasks. I this task throws an exception during perform,
- * it must clean up after itself before throwing the exception as undo will not be called. If this
+ * DeploymentTask is a single unit of work in a plan. The plan checks whether or not all tasks canRun()
+ * before executing the plan and performing all the tasks. If this task threw an exception during perform,
+ * it must have cleaned up after itself before throwing as undo will not be called. If this
* task completes successfully but a subsequent task throws an exception the undo method will be
* called so the task can rollback any changes.
*
@@ -69,9 +69,9 @@
public interface DeploymentTask {
/**
* Can this task complete now?
- * @return true if the can can complete now; otherwise false and the plan should wait
- * @throws org.apache.geronimo.kernel.deployment.DeploymentException if a problem occurs while checking the task, if the can check
- * throws an exception the plan should be discarded
+ * @return true if the can complete now; otherwise false and the plan should wait
+ * @throws org.apache.geronimo.kernel.deployment.DeploymentException if a problem occurs while checking the task.
+ * If the exception is thrown the plan should be discarded
*/
boolean canRun() throws DeploymentException;
1.5 +16 -16 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java
Index: AbstractManagedObject.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractManagedObject.java 16 Nov 2003 00:46:37 -0000 1.4
+++ AbstractManagedObject.java 7 Dec 2003 03:50:29 -0000 1.5
@@ -283,19 +283,19 @@
/**
* Sends the specified MBean notification.
*
- * Note: This method can not be call while the current thread holds a syncronized lock on this MBean,
+ * Note: This method cannot be call while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
*
* @param type the notification type to send
*/
public final void sendNotification(String type) {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
notificationBroadcaster.sendNotification(new Notification(type, objectName, sequenceNumber++));
}
public void sendNotification(Notification notification) {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
notificationBroadcaster.sendNotification(notification);
}
@@ -304,17 +304,17 @@
}
/**
- * Moves this MBean to the STARTING state and then attempst to move this MBean immedately to the STARTED
+ * Moves this MBean to the STARTING state and then attempts to move this MBean immediately to the STARTED
* state.
*
- * Note: This method cannot be call while the current thread holds a syncronized lock on this MBean,
+ * Note: This method cannot be call while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
*
* @throws java.lang.Exception If an exception occurs while starting this MBean
*/
public final void start() throws Exception {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
// Move to the starting state
synchronized (this) {
@@ -359,14 +359,14 @@
* Moves this MBean to the STOPPING state, calls stop on all start dependent children, and then attempt
* to move this MBean to the STOPPED state.
*
- * Note: This method can not be call while the current thread holds a syncronized lock on this MBean,
+ * Note: This method can not be call while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
*
* @throws java.lang.Exception If an exception occurs while stoping this MBean or any of the childern
*/
public final void stop() throws Exception {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
// move to the stopping state
synchronized (this) {
@@ -430,14 +430,14 @@
/**
* Starts this MBean and then attempts to start all of the start dependent children of this MBean.
*
- * Note: This method can not be call while the current thread holds a syncronized lock on this MBean,
+ * Note: This method can not be call while the current thread holds a synchronized lock on this MBean,
* because this method sends JMX notifications. Sending a general notification from a synchronized block
* is a bad idea and therefore not allowed.
*
* @throws java.lang.Exception if a problem occurs will starting this MBean or any child MBean
*/
public final void startRecursive() throws Exception {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
State state = getStateInstance();
if (state != State.STOPPED && state != State.FAILED) {
@@ -532,7 +532,7 @@
case State.STOPPING_INDEX:
case State.FAILED_INDEX:
throw new IllegalStateException(
- "Can not transition to " + newState + " state from " + state);
+ "Cannot transition to " + newState + " state from " + state);
}
break;
@@ -545,7 +545,7 @@
case State.STOPPED_INDEX:
case State.STARTING_INDEX:
throw new IllegalStateException(
- "Can not transition to " + newState + " state from " + state);
+ "Cannot transition to " + newState + " state from " + state);
}
break;
@@ -558,7 +558,7 @@
case State.STARTING_INDEX:
case State.RUNNING_INDEX:
throw new IllegalStateException(
- "Can not transition to " + newState + " state from " + state);
+ "Cannot transition to " + newState + " state from " + state);
}
break;
@@ -572,7 +572,7 @@
case State.RUNNING_INDEX:
case State.STOPPING_INDEX:
throw new IllegalStateException(
- "Can not transition to " + newState + " state from " + state);
+ "Cannot transition to " + newState + " state from " + state);
}
break;
@@ -602,7 +602,7 @@
* Note: Do not call this from within a synchronized block as it makes may send a JMX notification
*/
protected void checkState() {
- assert !Thread.holdsLock(this): "This method cannot be called while holding a syncrhonized lock on this";
+ assert !Thread.holdsLock(this): "This method cannot be called while holding a synchronized lock on this";
State newState = null;
try {