Author: jlaskowski Date: Sun Jan 2 15:01:01 2005 New Revision: 123914 URL: http://svn.apache.org/viewcvs?view=rev&rev=123914 Log: Got rid of a deprecated ctor and typos. Some files got their svn:keywords set
Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (contents, props changed) geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java (contents, props changed) geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=123914&p1=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r1=123913&p2=geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original) +++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Sun Jan 2 15:01:01 2005 @@ -415,28 +415,28 @@ if (moduleXml.isSetEjb()) { modulePath = moduleXml.getEjb().getStringValue(); if (ejbConfigBuilder == null) { - throw new DeploymentException("Can not deploy ejb application; No ejb deployer defined: " + modulePath); + throw new DeploymentException("Cannot deploy ejb application; No ejb deployer defined: " + modulePath); } builder = ejbConfigBuilder; moduleTypeName = "an EJB"; } else if (moduleXml.isSetWeb()) { modulePath = moduleXml.getWeb().getWebUri().getStringValue(); if (webConfigBuilder == null) { - throw new DeploymentException("Can not deploy web application; No war deployer defined: " + modulePath); + throw new DeploymentException("Cannot deploy web application; No war deployer defined: " + modulePath); } builder = webConfigBuilder; moduleTypeName = "a war"; } else if (moduleXml.isSetConnector()) { modulePath = moduleXml.getConnector().getStringValue(); if (connectorConfigBuilder == null) { - throw new DeploymentException("Can not deploy resource adapter; No rar deployer defined: " + modulePath); + throw new DeploymentException("Cannot deploy resource adapter; No rar deployer defined: " + modulePath); } builder = connectorConfigBuilder; moduleTypeName = "a connector"; } else if (moduleXml.isSetJava()) { modulePath = moduleXml.getJava().getStringValue(); if (appClientConfigBuilder == null) { - throw new DeploymentException("Can not deploy app client; No app client deployer defined: " + modulePath); + throw new DeploymentException("Cannot deploy app client; No app client deployer defined: " + modulePath); } builder = appClientConfigBuilder; moduleTypeName = "an application client"; @@ -492,22 +492,22 @@ private ModuleBuilder getBuilder(Module module) throws DeploymentException { if (module instanceof EJBModule) { if (ejbConfigBuilder == null) { - throw new DeploymentException("Can not deploy ejb application; No ejb deployer defined: " + module.getModuleURI()); + throw new DeploymentException("Cannot deploy ejb application; No ejb deployer defined: " + module.getModuleURI()); } return ejbConfigBuilder; } else if (module instanceof WebModule) { if (webConfigBuilder == null) { - throw new DeploymentException("Can not deploy web application; No war deployer defined: " + module.getModuleURI()); + throw new DeploymentException("Cannot deploy web application; No war deployer defined: " + module.getModuleURI()); } return webConfigBuilder; } else if (module instanceof ConnectorModule) { if (connectorConfigBuilder == null) { - throw new DeploymentException("Can not deploy resource adapter; No rar deployer defined: " + module.getModuleURI()); + throw new DeploymentException("Cannot deploy resource adapter; No rar deployer defined: " + module.getModuleURI()); } return connectorConfigBuilder; } else if (module instanceof AppClientModule) { if (appClientConfigBuilder == null) { - throw new DeploymentException("Can not deploy app client; No app client deployer defined: " + module.getModuleURI()); + throw new DeploymentException("Cannot deploy app client; No app client deployer defined: " + module.getModuleURI()); } return appClientConfigBuilder; } Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?view=diff&rev=123914&p1=geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java&r1=123913&p2=geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original) +++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Sun Jan 2 15:01:01 2005 @@ -48,7 +48,7 @@ import org.apache.geronimo.transaction.context.TransactionContextManager; /** - * @version $Rev: $ $Date: $ + * @version $Rev$ $Date$ */ public class JettyModuleBuilderTest extends TestCase { Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java?view=diff&rev=123914&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java&r1=123913&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java (original) +++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanData.java Sun Jan 2 15:01:01 2005 @@ -29,7 +29,7 @@ import javax.management.ObjectName; /** - * @version $Rev: $ $Date: $ + * @version $Rev$ $Date$ */ public class GBeanData implements Externalizable { private ObjectName name; Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java?view=diff&rev=123914&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java&r1=123913&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java (original) +++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Sun Jan 2 15:01:01 2005 @@ -191,8 +191,8 @@ /** * Add a reference to another GBean or collection of GBeans - * @param name - * @param type The proxy type or the GBean or objects in a ReferenceCollection + * @param name the name of the reference + * @param type The proxy type of the GBean or objects in a ReferenceCollection */ public void addReference(String name, Class type) { references.put(name, type.getName()); Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java?view=diff&rev=123914&p1=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java&r1=123913&p2=geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java (original) +++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java Sun Jan 2 15:01:01 2005 @@ -69,7 +69,9 @@ * The Kernel also provides a ConfigurationStore which is used to stage * installed Configurations (providing a local filesystem based classpath) and * used hold the persistent state of each Configuration. This allows - * Configurations to restart in he event of system failure. + * Configurations to restart in the event of system failure. + * + * TODO: Describe the order of method invocation (e.g. if loadGbean may be before boot) * * @version $Rev$ $Date$ */ Modified: geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java?view=diff&rev=123914&p1=geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java&r1=123913&p2=geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java&r2=123914 ============================================================================== --- geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java (original) +++ geronimo/trunk/modules/kernel/src/test/org/apache/geronimo/kernel/BootstrapTest.java Sun Jan 2 15:01:01 2005 @@ -31,7 +31,7 @@ private File kernelState; public void testCreate() throws Exception { - Kernel kernel = new Kernel("test.kernel", "geronimo"); + Kernel kernel = new Kernel("test.kernel"); assertEquals("No kernel should be registered", null, Kernel.getKernel("test.kernel")); kernel.boot(); assertEquals("test.kernel kernel should be registered", kernel, Kernel.getKernel("test.kernel"));
