geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty JettyWebAccessLog.java JettyWebApplication.java
Date Fri, 16 Jan 2004 23:10:14 GMT
djencks     2004/01/16 15:10:14

  Modified:    modules/web/src/java/org/apache/geronimo/web
                        AbstractWebAccessLog.java
                        AbstractWebApplication.java
               modules/web/src/java/org/apache/geronimo/web/jetty
                        JettyWebAccessLog.java JettyWebApplication.java
  Log:
  mostly more typos
  
  Revision  Changes    Path
  1.4       +2 -2      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebAccessLog.java
  
  Index: AbstractWebAccessLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebAccessLog.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractWebAccessLog.java	16 Jan 2004 02:19:23 -0000	1.3
  +++ AbstractWebAccessLog.java	16 Jan 2004 23:10:14 -0000	1.4
  @@ -315,7 +315,7 @@
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  -    public static GBeanInfo getGbeanInfo() {
  +    public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
       }
   
  
  
  
  1.14      +19 -6     incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java
  
  Index: AbstractWebApplication.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractWebApplication.java	16 Jan 2004 02:19:23 -0000	1.13
  +++ AbstractWebApplication.java	16 Jan 2004 23:10:14 -0000	1.14
  @@ -120,8 +120,21 @@
       private ClassLoader parentClassLoader;
       private UserTransactionImpl userTransaction;
   
  +    /**
  +     * User transaction must be a parameter since it is also possibly already included
in the ReadOnlyContext
  +     * @param uri
  +     * @param parentClassLoader
  +     * @param webApp
  +     * @param geronimoWebAppDocument
  +     * @param contextPath
  +     * @param context
  +     * @param java2ClassLoadingCompliance
  +     * @param userTransaction
  +     * @param transactionManager
  +     * @param trackedConnectionAssociator
  +     */
       public AbstractWebApplication(URI uri, ClassLoader parentClassLoader, WebApp webApp,
GeronimoWebAppDocument geronimoWebAppDocument, String contextPath,
  -                                  Context context, boolean java2ClassLoadingCompliance,
TransactionManager transactionManager, TrackedConnectionAssociator trackedConnectionAssociator)
{
  +                                  Context context, boolean java2ClassLoadingCompliance,
UserTransactionImpl userTransaction, TransactionManager transactionManager, TrackedConnectionAssociator
trackedConnectionAssociator) {
           this.uri = uri;
           this.parentClassLoader = parentClassLoader;
           this.webApp = webApp;
  @@ -129,7 +142,7 @@
           this.contextPath = contextPath;
           this.context = context;
           this.java2ClassLoadingCompliance = java2ClassLoadingCompliance;
  -        userTransaction = new UserTransactionImpl();
  +        this.userTransaction = userTransaction;
           userTransaction.setTransactionManager(transactionManager);
           userTransaction.setTrackedConnectionAssociator(trackedConnectionAssociator);
       }
  @@ -281,15 +294,15 @@
           infoFactory.addEndpoint(new GEndpointInfo("TrackedConnectionAssociator", TrackedConnectionAssociator.class.getName()));
           infoFactory.setConstructor(new GConstructorInfo(
                   Arrays.asList(new Object[]{"URI", "ParentClassLoader", "WebApp", "GeronimoWebAppDoc",
"ContextPath",
  -                                  "Context", "Java2ClassLoadingCompliance", "TransactionManager",
"TrackedConnectionAssociator"}),
  +                                  "Context", "Java2ClassLoadingCompliance", "UserTransaction",
 "TransactionManager", "TrackedConnectionAssociator"}),
                   Arrays.asList(new Object[]{URI.class, ClassLoader.class, WebApp.class,
GeronimoWebAppDocument.class, String.class,
  -                                  Context.class,Boolean.TYPE, TransactionManager.class,
TrackedConnectionAssociator.class})
  +                                  Context.class, Boolean.TYPE, UserTransactionImpl.class,
TransactionManager.class, TrackedConnectionAssociator.class})
           ));
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  -    public static GBeanInfo getGbeanInfo() {
  +    public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
       }
   
  
  
  
  1.4       +3 -3      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebAccessLog.java
  
  Index: JettyWebAccessLog.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebAccessLog.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JettyWebAccessLog.java	16 Jan 2004 02:19:23 -0000	1.3
  +++ JettyWebAccessLog.java	16 Jan 2004 23:10:14 -0000	1.4
  @@ -256,7 +256,7 @@
       }
   
       static {
  -        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Access Log", "Wrapped
Jetty access log", JettyWebAccessLog.class.getName(), AbstractWebAccessLog.getGbeanInfo());
  +        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Access Log", "Wrapped
Jetty access log", JettyWebAccessLog.class.getName(), AbstractWebAccessLog.getGBeanInfo());
           infoFactory.addAttribute(new GAttributeInfo("Buffering", true, "Should log buffer"));
           infoFactory.addOperation(new GOperationInfo("registerLog", new String[]{"Jetty
Server"}, new String[]{Server.class.getName()}));
           infoFactory.addOperation(new GOperationInfo("unregisterLog", new String[]{"Jetty
Server"}, new String[]{Server.class.getName()}));
  @@ -273,7 +273,7 @@
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  -    public static GBeanInfo getGbeanInfo() {
  +    public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
       }
   
  
  
  
  1.11      +6 -5      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebApplication.java
  
  Index: JettyWebApplication.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/jetty/JettyWebApplication.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JettyWebApplication.java	16 Jan 2004 02:19:23 -0000	1.10
  +++ JettyWebApplication.java	16 Jan 2004 23:10:14 -0000	1.11
  @@ -22,6 +22,7 @@
   import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
   import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
   import org.apache.geronimo.web.AbstractWebApplication;
  +import org.apache.geronimo.transaction.manager.UserTransactionImpl;
   import org.mortbay.jetty.servlet.WebApplicationContext;
   
   
  @@ -48,9 +49,9 @@
       }
   
       public JettyWebApplication(URI uri, ClassLoader parentClassLoader, WebApp webApp, GeronimoWebAppDocument
geronimoWebAppDocument, String contextPath,
  -                               Context context, boolean java2ClassLoadingCompliance, TransactionManager
transactionManager, TrackedConnectionAssociator trackedConnectionAssociator) {
  +                               Context context, boolean java2ClassLoadingCompliance, UserTransactionImpl
userTransaction, TransactionManager transactionManager, TrackedConnectionAssociator trackedConnectionAssociator)
{
           super(uri, parentClassLoader, webApp, geronimoWebAppDocument, contextPath, context,
  -                java2ClassLoadingCompliance, transactionManager, trackedConnectionAssociator);
  +                java2ClassLoadingCompliance, userTransaction, transactionManager, trackedConnectionAssociator);
           if (uri == null) {
               jettyContext = new JettyWebApplicationContext();
           } else {
  @@ -130,12 +131,12 @@
       }
   
       static {
  -        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Application", "Wrapped
Jetty application", JettyWebApplication.class.getName(), AbstractWebApplication.getGbeanInfo());
  +        GBeanInfoFactory infoFactory = new GBeanInfoFactory("Jetty Web Application", "Wrapped
Jetty application", JettyWebApplication.class.getName(), AbstractWebApplication.getGBeanInfo());
           infoFactory.addOperation(new GOperationInfo("getJettyContext", Collections.EMPTY_LIST));
           GBEAN_INFO = infoFactory.getBeanInfo();
       }
   
  -    public static GBeanInfo getGbeanInfo() {
  +    public static GBeanInfo getGBeanInfo() {
           return GBEAN_INFO;
       }
   
  
  
  

Mime
View raw message