You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/05/04 20:08:51 UTC
svn commit: r399797 - in /geronimo/branches/1.1/modules:
j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/
jetty-builder/src/java/org/apache/geronimo/jetty/deployment/
jetty/src/java/org/apache/geronimo/jetty/
Author: djencks
Date: Thu May 4 11:08:50 2006
New Revision: 399797
URL: http://svn.apache.org/viewcvs?rev=399797&view=rev
Log:
Clarify that the default servlet templates are not real live servlets according to their jsr-77 name
Modified:
geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java
Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=399797&r1=399796&r2=399797&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Thu May 4 11:08:50 2006
@@ -103,6 +103,7 @@
public static final String CONFIGURATION_ENTRY = "ConfigurationEntry";
public static final String PERSISTENT_CONFIGURATION_LIST = "PersistentConfigurationList"; //duplicated in FileConfigurationList
// public static final String URL_PATTERN = "URLPattern";
+ public static final String SERVLET_TEMPLATE = "ServletTemplate";
public static final String SERVLET_WEB_SERVICE_TEMPLATE = "ServletWebServiceTemplate";
public static final String CORBA_CSS = "CORBACSS";
public static final String CORBA_TSS = "CORBATSS";
Modified: geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=399797&r1=399796&r2=399797&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Thu May 4 11:08:50 2006
@@ -940,10 +940,10 @@
infoBuilder.addAttribute("defaultContextPriorityClassloader", boolean.class, true, true);
infoBuilder.addAttribute("defaultWelcomeFiles", List.class, true, true);
infoBuilder.addAttribute("jettyContainerObjectName", AbstractNameQuery.class, true, true);
- infoBuilder.addReference("DefaultServlets", JettyDefaultServletHolder.class, NameFactory.SERVLET);
+ infoBuilder.addReference("DefaultServlets", JettyDefaultServletHolder.class, NameFactory.SERVLET_TEMPLATE);
infoBuilder.addReference("DefaultFilters", Object.class);
infoBuilder.addReference("DefaultFilterMappings", Object.class);
- infoBuilder.addReference("PojoWebServiceTemplate", Object.class, "ServletWebServiceTemplate");
+ infoBuilder.addReference("PojoWebServiceTemplate", Object.class, NameFactory.SERVLET_WEB_SERVICE_TEMPLATE);
infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("kernel", Kernel.class, false);
infoBuilder.addInterface(ModuleBuilder.class);
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java?rev=399797&r1=399796&r2=399797&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyDefaultServletHolder.java Thu May 4 11:08:50 2006
@@ -40,7 +40,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JettyDefaultServletHolder.class, JettyServletHolder.GBEAN_INFO, NameFactory.SERVLET);
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JettyDefaultServletHolder.class, JettyServletHolder.GBEAN_INFO, NameFactory.SERVLET_TEMPLATE);
GBEAN_INFO = infoBuilder.getBeanInfo();
}