djencks 2004/01/01 01:55:09
Modified:
modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking
ConnectionTrackingCoordinator.java
modules/kernel/src/java/org/apache/geronimo/kernel/deployment
DependencyService.java
modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task
CreateClassSpace.java DeployGeronimoMBean.java
DeploymentTask.java
modules/kernel/src/java/org/apache/geronimo/kernel/service
AbstractManagedObject2.java DependencyService2.java
GeronimoMBeanEndpoint.java GeronimoMBeanTarget.java
specs/j2ee-connector project.xml
specs/jsp project.xml
Log:
typo corrections from GERONIMO-135
Revision Changes Path
1.3 +5 -8
incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
Index: ConnectionTrackingCoordinator.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionTrackingCoordinator.java 10 Dec 2003 09:39:46 -0000
1.2
+++ ConnectionTrackingCoordinator.java 1 Jan 2004 09:55:08 -0000
1.3
@@ -70,31 +70,28 @@
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
/**
- * CachedConnectionManager tracks connections that are in use by
+ * ConnectionTrackingCoordinator tracks connections that are in use by
* components such as EJB's. The component must notify the ccm
* when a method enters and exits. On entrance, the ccm will
* notify ConnectionManager stacks so the stack can make sure all
* connection handles left open from previous method calls are
* attached to ManagedConnections of the correct security context, and
- * the ManagedConnections are enrolled in any current transaction.
+ * the ManagedConnections are enrolled in any current transaction.
* On exit, the ccm will notify ConnectionManager stacks of the handles
* left open, so they may be disassociated if appropriate.
* In addition, when a UserTransaction is started the ccm will notify
* ConnectionManager stacks so the existing ManagedConnections can be
* enrolled properly.
*
- *
* @version $Revision$ $Date$
- *
- * */
+ */
public class ConnectionTrackingCoordinator implements
TrackedConnectionAssociator, ConnectionTracker {
private final ThreadLocal currentConnectorComponentContexts = new
ThreadLocal();
private final ThreadLocal currentConnectorTransactionContexts = new
ThreadLocal();
private final ThreadLocal currentUnshareableResources = new
ThreadLocal();
- public ConnectorComponentContext enter(ConnectorComponentContext
newConnectorComponentContext
- )
+ public ConnectorComponentContext enter(ConnectorComponentContext
newConnectorComponentContext)
throws ResourceException {
ConnectorComponentContext oldConnectorComponentContext =
(ConnectorComponentContext) currentConnectorComponentContexts.get();
currentConnectorComponentContexts.set(newConnectorComponentContext);
1.2 +2 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DependencyService.java
Index: DependencyService.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DependencyService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyService.java 8 Sep 2003 04:38:33 -0000 1.1
+++ DependencyService.java 1 Jan 2004 09:55:08 -0000 1.2
@@ -299,7 +299,7 @@
log.trace("Parent is running: parent=" + startParent);
} catch (AttributeNotFoundException e) {
// ok -- parent is not a startable
- log.trace("Parent does not have a State attibute");
+ log.trace("Parent does not have a State attribute");
} catch (InstanceNotFoundException e) {
// depended on instance was removed bewteen the register
check and the invoke
log.trace("Cannot run because parent is not registered:
parent=" + startParent);
1.6 +2 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/CreateClassSpace.java
Index: CreateClassSpace.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/CreateClassSpace.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateClassSpace.java 10 Dec 2003 13:00:09 -0000 1.5
+++ CreateClassSpace.java 1 Jan 2004 09:55:08 -0000 1.6
@@ -116,7 +116,7 @@
List urls = metadata.getUrls();
if (!server.isRegistered(name)) {
if (metadata.getCreate() == ClassSpaceMetadata.CREATE_NEVER) {
- throw new DeploymentException("No class space is registerd
with name: objectName=" + metadata.getName());
+ throw new DeploymentException("No class space is registered
with name: objectName=" + metadata.getName());
}
// Get the mbean descriptor
1.10 +13 -10
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeployGeronimoMBean.java
Index: DeployGeronimoMBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/task/DeployGeronimoMBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeployGeronimoMBean.java 28 Dec 2003 19:28:58 -0000 1.9
+++ DeployGeronimoMBean.java 1 Jan 2004 09:55:08 -0000 1.10
@@ -64,6 +64,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.ReflectionException;
+import javax.management.MBeanAttributeInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -120,6 +121,8 @@
if (log.isTraceEnabled()) {
log.trace("Creating GeronimoMBean name=" +
metadata.getName());
}
+ GeronimoMBean mbean = new GeronimoMBean();
+ mbean.setClassSpace(metadata.getLoaderName());
if (metadata.getGeronimoMBeanInfo() == null) {
try {
metadata.setGeronimoMBeanInfo(GeronimoMBean.getGeronimoMBeanInfo(metadata.getGeronimoMBeanDescriptor()));
@@ -127,26 +130,26 @@
log.trace("Failed to obtain coded
GeronimoMBeanInfo", e);
}
}
- GeronimoMBean mbean = new GeronimoMBean();
- mbean.setClassSpace(metadata.getLoaderName());
- GeronimoMBeanInfo geronimoMBeanInfo =
metadata.getGeronimoMBeanInfo();
- if (geronimoMBeanInfo == null) {
+ if (metadata.getGeronimoMBeanInfo() == null) {
String descriptorName =
metadata.getGeronimoMBeanDescriptor();
- log.info("Looking for descriptor: " + descriptorName);
+ log.info("Looking for xml descriptor: " +
descriptorName);
URL url = newCL.getResource(descriptorName);
if(url == null) {
throw new DeploymentException("GeronimoMBean
descriptor not found: " + descriptorName);
}
- geronimoMBeanInfo =
GeronimoMBeanInfoXMLLoader.loadMBean(url);
+
metadata.setGeronimoMBeanInfo(GeronimoMBeanInfoXMLLoader.loadMBean(url));
}
+ //mbean info is now set.
+ GeronimoMBeanInfo geronimoMBeanInfo =
metadata.getGeronimoMBeanInfo();
+ mbean.setMBeanInfo(geronimoMBeanInfo);
Map metadataAttributes = metadata.getAttributeValues();
- for (int i = 0; i <
geronimoMBeanInfo.getAttributes().length; i++) {
- GeronimoAttributeInfo attributeInfo =
(GeronimoAttributeInfo) geronimoMBeanInfo.getAttributes()[i];
+ MBeanAttributeInfo[] attributeInfos =
geronimoMBeanInfo.getAttributes();
+ for (int i = 0; i < attributeInfos.length; i++) {
+ GeronimoAttributeInfo attributeInfo =
(GeronimoAttributeInfo) attributeInfos[i];
if (attributeInfo.getInitialValue() == null) {
attributeInfo.setInitialValue(metadataAttributes.get(attributeInfo.getName()));
}
}
- mbean.setMBeanInfo(geronimoMBeanInfo);
//If there are constructor args, build the default target
ourselves.
if (geronimoMBeanInfo.getTarget() == null &&
metadata.getConstructorArgs() != null) {
Object target =
ParserUtil.instantiate(geronimoMBeanInfo.getTargetClass(),
1.3 +3 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeploymentTask.java 7 Dec 2003 03:50:29 -0000 1.2
+++ DeploymentTask.java 1 Jan 2004 09:55:08 -0000 1.3
@@ -69,14 +69,14 @@
public interface DeploymentTask {
/**
* Can this task complete now?
- * @return true if the can complete now; otherwise false and the plan
should wait
+ * @return true if it 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;
/**
- * Executes the task. If a DeploymentException is throw undo will not
be called, so task
+ * Executes the task. If a DeploymentException is thrown undo will not
be called, so task
* should clean up after itself before throwing the exception
* @throws org.apache.geronimo.kernel.deployment.DeploymentException if
an unrecoverable problem occurs in the task, plan should
* be rolled back
1.5 +34 -29
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject2.java
Index: AbstractManagedObject2.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/AbstractManagedObject2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractManagedObject2.java 18 Nov 2003 02:20:08 -0000 1.4
+++ AbstractManagedObject2.java 1 Jan 2004 09:55:08 -0000 1.5
@@ -58,27 +58,28 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.JMException;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
+import javax.management.MBeanServerNotification;
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.NotificationEmitter;
import javax.management.NotificationFilter;
+import javax.management.NotificationFilterSupport;
import javax.management.NotificationListener;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServerNotification;
-import javax.management.NotificationFilterSupport;
-import javax.management.JMException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.apache.geronimo.kernel.jmx.MBeanProxyFactory;
import org.apache.geronimo.kernel.management.EventProvider;
import org.apache.geronimo.kernel.management.ManagedObject;
import org.apache.geronimo.kernel.management.NotificationType;
@@ -146,7 +147,7 @@
protected final NotificationBroadcasterSupport notificationBroadcaster =
new NotificationBroadcasterSupport();
/**
- * Check if component can start. Dependencies in the dependency service
have already been
+ * Check if component can start. Dependencies in the dependency service
have already been
* checked at this point.
*
* Note: this method is called from within a synchronized block, so be
careful what you call as you
@@ -159,7 +160,7 @@
}
/**
- * Do the start tasks for the component. Called in the STARTING state by
+ * Do the start tasks for the component. Called in the [EMAIL
PROTECTED] State#STARTING} state by
* the start() and startRecursive() methods to perform the tasks
required to
* start the component.
*
@@ -197,7 +198,7 @@
}
/**
- * Do the failure tasks for the component. Called in the FAILED state
by the fail()
+ * Do the failure tasks for the component. Called in the [EMAIL
PROTECTED] State#FAILED} state by the fail()
* method to perform the tasks required to cleanup a failed component.
*
* Note: this method is called from within a synchronized block, so be
careful what you call as you
@@ -303,17 +304,19 @@
}
/**
- * Moves this MBean to the STARTING state and then attempst to move this
MBean immedately to the STARTED
- * state.
+ * Moves this MBean to the [EMAIL PROTECTED] State#STARTING} state
+ * and then attempts to move this MBean immedately to the [EMAIL
PROTECTED] State#STARTED} state.
*
- * Note: This method cannot be call while the current thread holds a
syncronized lock on this MBean,
- * because this method sends JMX notifications. Sending a general
notification from a synchronized block
+ * Note: This method cannot be called 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 Exception If an exception occurs while starting this MBean
+ *
+ * @see #attemptFullStart()
*/
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) {
@@ -434,20 +437,21 @@
}
/**
- * Attempts to bring the component into the fully running state. If an
Exception occurs while
- * starting the component, the component will be failed.
+ * Attempts to bring the component into [EMAIL PROTECTED]
State#RUNNING}. If an Exception occurs while
+ * starting the component, the component will be transitioned to [EMAIL
PROTECTED] State#FAILED} state.
+ *
* @throws Exception if a problem occurs while starting the component
*
- * Note: Do not call this from within a synchronized block as it makes
may send a JMX notification
+ * Note: Do not call this from within a synchronized block as it may
send a JMX notification
*/
void attemptFullStart() 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 newState = null;
try {
synchronized (this) {
try {
- // if we are still trying to start and can start now...
start
+ // only transition when in STARTING state
if (getStateInstance() != State.STARTING) {
return;
}
@@ -545,14 +549,15 @@
}
/**
- * Attempt to bring the component into the fully stopped state.
- * If an exception occurs while stopping the component, the component
will be failed.
+ * Attempt to bring the component into [EMAIL PROTECTED] State#STOPPED}.
+ * If an exception occurs while stopping the component, the component
will be moved to [EMAIL PROTECTED] State#FAILED}.
+ *
* @throws Exception if a problem occurs while stopping the component
*
- * Note: Do not call this from within a synchronized block as it makes
may send a JMX notification
+ * Note: Do not call this from within a synchronized block as it may
send a JMX notification
*/
void attemptFullStop() 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 newState = null;
try {
@@ -682,7 +687,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;
@@ -695,7 +700,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;
@@ -708,7 +713,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;
@@ -721,7 +726,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;
@@ -734,7 +739,7 @@
case State.STOPPED_INDEX:
case State.FAILED_INDEX:
throw new IllegalStateException(
- "Can not transition to " + newState + " state from "
+ state);
+ "Cannot transition to " + newState + " state from "
+ state);
}
break;
}
1.2 +8 -5
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/DependencyService2.java
Index: DependencyService2.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/DependencyService2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyService2.java 6 Nov 2003 19:50:08 -0000 1.1
+++ DependencyService2.java 1 Jan 2004 09:55:08 -0000 1.2
@@ -77,7 +77,7 @@
/**
* DependencyService is the record keeper of the dependencies in Geronimo.
The DependencyService
- * does not enforce any dependencies, it is simply a place where components
can register thier intent
+ * does not enforce any dependencies, it is simply a place where components
can register their intent
* to be dependent on another component. Since a JMX Component can pretty
much do whatever it wants
* a component must watch the components it depends on to assure that they
are following the
* J2EE-Management state machine.
@@ -208,7 +208,8 @@
}
/**
- * Adds dependcies from the child to every parent in the parents set
+ * Adds dependencies from the child to every parent in the parents set
+ *
* @param child the dependent component
* @param parents the set of components the child is depending on
*
@@ -236,7 +237,8 @@
/**
* Gets the set of parents that the child is depending on
- * @param child the depend component
+ *
+ * @param child the dependent component
* @return a collection containing all of the components the child
depends on; will never be null
*
* @jmx:managed-operation
@@ -250,7 +252,8 @@
}
/**
- * Gets all of the MBeans that have a dependency on the specificed
startParent.
+ * Gets all of the MBeans that have a dependency on the specified
startParent.
+ *
* @param parent the component the returned childen set depend on
* @return a collection containing all of the components that depend on
the parent; will never be null
*
1.7 +2 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanEndpoint.java
Index: GeronimoMBeanEndpoint.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanEndpoint.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GeronimoMBeanEndpoint.java 30 Dec 2003 08:25:32 -0000 1.6
+++ GeronimoMBeanEndpoint.java 1 Jan 2004 09:55:08 -0000 1.7
@@ -271,7 +271,7 @@
// peers
if (source.peers.isEmpty()) {
- throw new IllegalArgumentException("Source must have at lease
one peer specified");
+ throw new IllegalArgumentException("Source must have at least
one peer specified");
}
peers = new HashSet(source.peers);
1.2 +2 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanTarget.java
Index: GeronimoMBeanTarget.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/service/GeronimoMBeanTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeronimoMBeanTarget.java 8 Sep 2003 04:38:35 -0000 1.1
+++ GeronimoMBeanTarget.java 1 Jan 2004 09:55:08 -0000 1.2
@@ -60,7 +60,7 @@
/**
* An optional interface for targets of a GeronimoMBean. When a target
implements this interface, the target
- * will get a regerence to the GeronimoMBeanContext, and will get life-cycle
callbacks.
+ * will get a reference to the GeronimoMBeanContext, and will get life-cycle
callbacks.
*
* @version $Revision$ $Date$
*/
1.5 +2 -2 incubator-geronimo/specs/j2ee-connector/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/specs/j2ee-connector/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 16 Aug 2003 19:31:46 -0000 1.4
+++ project.xml 1 Jan 2004 09:55:09 -0000 1.5
@@ -6,7 +6,7 @@
<pomVersion>3</pomVersion>
<extend>${basedir}/../../etc/project.xml</extend>
- <name>Geronimo :: J2EE Connector Architecure Specification</name>
+ <name>Geronimo :: J2EE Connector Architecture Specification</name>
<groupId>geronimo-spec</groupId>
<id>geronimo-spec-j2ee-connector</id>
<shortDescription>J2EE Connector Architecture</shortDescription>
1.3 +2 -2 incubator-geronimo/specs/jsp/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/specs/jsp/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 17 Sep 2003 20:25:04 -0000 1.2
+++ project.xml 1 Jan 2004 09:55:09 -0000 1.3
@@ -6,7 +6,7 @@
<pomVersion>3</pomVersion>
<extend>${basedir}/../../etc/project.xml</extend>
- <name>Geronimo :: Java Server Pages Specification</name>
+ <name>Geronimo :: JavaServer Pages Specification</name>
<groupId>geronimo-spec</groupId>
<id>geronimo-spec-jsp</id>
<shortDescription>
