notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1452 - in trunk/main: central/src/docs/about/resources depot/build/etc/bin depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks planet/http planet/http/impl/src/main/net/dpml/http planet/http/impl/src/test/net/dpml/http
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1452 - in trunk/main: central/src/docs/about/resources depot/build/etc/bin depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks planet/http planet/http/impl/src/main/net/dpml/http planet/http/impl/src/test/net/dpml/http
- Date: Mon, 22 May 2006 20:00:11 +0200
Author: mcconnell
Date: 2006-05-22 19:59:49 +0200 (Mon, 22 May 2006)
New Revision: 1452
Modified:
trunk/main/central/src/docs/about/resources/code.xml
trunk/main/depot/build/etc/bin/build
trunk/main/depot/build/etc/bin/build.lap
trunk/main/depot/library/src/main/net/dpml/library/Resource.java
trunk/main/depot/library/src/main/net/dpml/library/Type.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractConnectorContextTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/ServletContextHandlerTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
trunk/main/planet/http/module.xml
Log:
update to jetty 6.0.0 R516
Modified: trunk/main/central/src/docs/about/resources/code.xml
===================================================================
--- trunk/main/central/src/docs/about/resources/code.xml 2006-05-19
15:39:24 UTC (rev 1451)
+++ trunk/main/central/src/docs/about/resources/code.xml 2006-05-22
17:59:49 UTC (rev 1452)
@@ -97,7 +97,7 @@
<p>
If you contribute to a file (code or documentation), add yourself as
- the copyright source at the begging of the file.
+ the copyright source at the beggining of the file.
For .java files the preferred Javadoc format is:
</p>
Modified: trunk/main/depot/build/etc/bin/build
===================================================================
--- trunk/main/depot/build/etc/bin/build 2006-05-19 15:39:24 UTC (rev
1451)
+++ trunk/main/depot/build/etc/bin/build 2006-05-22 17:59:49 UTC (rev
1452)
@@ -1,4 +1,5 @@
#!/bin/sh
+# Copyright 2005-2006 Stephen J. McConnell
#
BUILD_JVM_OPTS="-Ddpml.transit.include.tools=true
-Ddpml.depot.application=dpml.builder"
Modified: trunk/main/depot/build/etc/bin/build.lap
===================================================================
--- trunk/main/depot/build/etc/bin/build.lap 2006-05-19 15:39:24 UTC (rev
1451)
+++ trunk/main/depot/build/etc/bin/build.lap 2006-05-22 17:59:49 UTC (rev
1452)
@@ -1,5 +1,6 @@
#
# This file contains the runtime configuration of the Janel java launcher
application.
+# Copyright 2005-2006 Stephen J. McConnell
#
-Ddpml.transit.include.tools=true
Modified: trunk/main/depot/library/src/main/net/dpml/library/Resource.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Resource.java
2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/depot/library/src/main/net/dpml/library/Resource.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -22,7 +22,6 @@
import net.dpml.library.info.Scope;
import net.dpml.library.info.ResourceDirective.Classifier;
-import net.dpml.library.info.DataDirective;
import net.dpml.transit.Artifact;
import net.dpml.lang.Category;
Modified: trunk/main/depot/library/src/main/net/dpml/library/Type.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -18,8 +18,6 @@
package net.dpml.library;
-import org.w3c.dom.Element;
-
/**
* Declaration of a type production.
*
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -44,8 +44,6 @@
import net.dpml.lang.Category;
import net.dpml.lang.DuplicateKeyException;
-import net.dpml.util.Logger;
-
/**
* A Module is a collection of resources. It serves to establish a
* namespace and a framework for sharing properties and characteristics
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -40,7 +40,6 @@
import net.dpml.library.Resource;
import net.dpml.library.Type;
import net.dpml.library.Data;
-import net.dpml.library.info.DataDirective;
import net.dpml.library.info.InfoDirective;
import net.dpml.library.info.TypeDirective;
import net.dpml.library.info.ResourceDirective;
@@ -52,8 +51,6 @@
import net.dpml.library.info.FilterDirective;
import net.dpml.library.info.Scope;
-import net.dpml.util.Logger;
-
import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -20,7 +20,6 @@
import java.util.Arrays;
-import net.dpml.lang.AbstractDirective;
import net.dpml.util.ElementHelper;
import org.w3c.dom.Element;
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -30,7 +30,6 @@
import net.dpml.library.Feature;
import net.dpml.library.TypeBuilder;
import net.dpml.library.info.ResourceDirective.Classifier;
-import net.dpml.library.info.DependencyDirective;
import net.dpml.lang.Category;
import net.dpml.lang.Part;
@@ -858,22 +857,9 @@
}
else if( COMMON_XSD_URI.equals( namespace ) )
{
- if( "AbstractType".equals( typeName ) )
- {
- final String id = getID( element );
- final boolean alias = getAliasFlag( element );
- return new TypeDirective( id, alias );
- }
- else
- {
- final String error =
- "Cannot create type bacause the element type is
unrecognized."
- + "\nNamespace: "
- + namespace
- + "\nType Name: "
- + info.getTypeName();
- throw new DecodingException( element, error );
- }
+ final String id = getID( element );
+ final boolean alias = getAliasFlag( element );
+ return new TypeDirective( id, alias );
}
else if( MODULE_XSD_URI.equals( namespace ) )
{
@@ -889,10 +875,6 @@
final boolean alias = getAliasFlag( element );
return new JarTypeDirective( element, alias );
}
- else if( "RMICType".equals( typeName ) )
- {
- return new DataDirective( element );
- }
else
{
final String error =
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -44,6 +44,7 @@
* @param data datatypes produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
+ * @param filters project filters
* @param resources subsidary resources
* @return the immediate enclosing resource
*/
@@ -113,6 +114,7 @@
* @param dependencies resource dependencies
* @param resources resource included within the module
* @param properties suppliementary properties
+ * @param filters project filters
*/
public ModuleDirective(
String name, String version, Classifier classifier, String basedir,
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -85,7 +85,7 @@
* @param classifier LOCAL or EXTERNAL classifier
* @param basedir the project basedir
* @param info info descriptor
- * @param types types produced by the resource
+ * @param data types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
* @param filters project filters
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -22,8 +22,6 @@
import net.dpml.library.Type;
-import net.dpml.lang.AbstractDirective;
-
import org.w3c.dom.Element;
/**
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Stephen J. McConnell
+ * Copyright 2005-2006 Stephen J. McConnell
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
import net.dpml.library.Resource;
import net.dpml.library.Type;
import net.dpml.library.info.Scope;
-import net.dpml.library.info.TypeDirective;
import net.dpml.library.info.JarTypeDirective;
import net.dpml.tools.model.Context;
@@ -37,10 +36,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
-import org.w3c.dom.Element;
-import org.w3c.dom.TypeInfo;
-
-
/**
* Processor supporting ujava class compilation, jar creation,
* testcase compilation and test execution.
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -20,7 +20,6 @@
import java.io.File;
-import net.dpml.library.Resource;
import net.dpml.library.info.Scope;
import net.dpml.tools.model.Context;
Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/LogAdapter.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -54,6 +54,14 @@
}
/**
+ * Set the debug enabled status.
+ * @param flag true if debug is enabled
+ */
+ public void setDebugEnabled( boolean flag )
+ {
+ }
+
+ /**
* Publish an info level log message.
* @param msg the message
* @param arg0 an intial argument
Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/LoggerAdapter.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -78,6 +78,15 @@
}
/**
+ * Set the debug enabled status.
+ * @param flag true if debug is enabled
+ */
+ public void setDebugEnabled( boolean flag )
+ {
+ // ummmm
+ }
+
+ /**
* Publish an info level log message.
* @param msg the message
* @param arg0 an intial argument
Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -26,10 +26,12 @@
import net.dpml.component.Provider;
import org.mortbay.thread.ThreadPool;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Handler;
import org.mortbay.jetty.RequestLog;
-import org.mortbay.xml.XmlConfiguration;
+import org.mortbay.jetty.handler.HandlerCollection;
import org.mortbay.jetty.security.UserRealm;
-import org.mortbay.jetty.Connector;
+import org.mortbay.xml.XmlConfiguration;
/**
* HTTP server implementation.
@@ -55,16 +57,6 @@
URI getConfiguration( URI uri );
/**
- * Get the assigned request logger. If no request logger is
- * assigned by the deployment scenario a default request logger
- * will be established.
- *
- * @param logger the default value
- * @return the resolved request logger
- */
- RequestLog getRequestLog( RequestLog logger );
-
- /**
* Get the assigned thread pool. If no thread pool is
* assigned by the deployment scenario a default pool
* will be established.
@@ -141,26 +133,12 @@
}
//
- // setup the request log
- //
-
- RequestLog log = context.getRequestLog( null );
- if( null != log )
- {
- super.setRequestLog( log );
- }
- else
- {
- super.setRequestLog( parts.getRequestLog() );
- }
-
- //
// add connectors, realms and context handlers
//
addConnectors( parts );
addUserRealms( parts );
- addContextHandlers( parts );
+ addHandlers( parts );
getLogger().debug( "server established" );
}
@@ -190,11 +168,12 @@
setConnectors( connectors );
}
- private void addContextHandlers( PartsManager parts ) throws Exception
+ private void addHandlers( PartsManager parts ) throws Exception
{
- getLogger().debug( "commencing context handler addition" );
- ComponentHandler[] handlers = parts.getComponentHandlers(
org.mortbay.jetty.handler.ContextHandler.class );
+ getLogger().debug( "commencing handler addition" );
+ ComponentHandler[] handlers = parts.getComponentHandlers(
Handler.class );
getLogger().debug( "handler count: " + handlers.length );
+ HandlerCollection collection = new HandlerCollection();
for( int i=0; i<handlers.length; i++ )
{
ComponentHandler handler = handlers[i];
@@ -202,24 +181,25 @@
try
{
Provider provider = handler.getProvider();
- org.mortbay.jetty.handler.ContextHandler ch =
- (org.mortbay.jetty.handler.ContextHandler)
provider.getValue( false );
- super.addHandler( ch );
+ org.mortbay.jetty.Handler ch =
+ (org.mortbay.jetty.Handler) provider.getValue( false );
+ collection.addHandler( ch );
}
catch( Throwable e )
{
final String error =
- "Failed to deploy content handler: " + handler;
+ "Failed to deploy handler: " + handler;
throw new Exception( error, e );
}
}
+ super.setHandler( collection );
}
private void addUserRealms( PartsManager parts ) throws Exception
{
getLogger().debug( "commencing realm addition" );
ArrayList list = new ArrayList();
- ComponentHandler[] handlers = parts.getComponentHandlers(
org.mortbay.jetty.security.UserRealm.class );
+ ComponentHandler[] handlers = parts.getComponentHandlers(
UserRealm.class );
for( int i=0; i<handlers.length; i++ )
{
ComponentHandler handler = handlers[i];
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractConnectorContextTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractConnectorContextTestCase.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractConnectorContextTestCase.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -20,13 +20,7 @@
import java.util.Map;
import java.util.Hashtable;
-
-import net.dpml.http.ResourceContextHandler.Context;
-import net.dpml.util.ContextInvocationHandler;
-
-import net.dpml.logging.Logger;
-
import org.mortbay.jetty.AbstractConnector;
import junit.framework.TestCase;
@@ -51,7 +45,8 @@
private static final String INTEGRAL_SCHEME = "http"; // normally https
/**
- * Setup the context map.
+ * Setup the context map.
+ * @return the context map
* @throws Exception if an error occurs
*/
protected Map createMap() throws Exception
@@ -73,6 +68,10 @@
return map;
}
+ /**
+ * Return the connector under test.
+ * @return the connector
+ */
protected abstract AbstractConnector getConnector();
/**
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/AbstractContextHandlerTestCase.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -20,16 +20,9 @@
import java.util.Map;
import java.util.Hashtable;
-
-import net.dpml.http.ResourceContextHandler.Context;
-import net.dpml.util.ContextInvocationHandler;
-
-import net.dpml.logging.Logger;
-
import org.mortbay.jetty.handler.ErrorHandler;
import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.MimeTypes;
import junit.framework.TestCase;
@@ -40,7 +33,7 @@
{
private static final String[] VIRTUAL_HOSTS = new
String[]{"virtual.acme.org", "virtual.secret.acme.org"};
private static final String[] HOSTS = new String[]{"www.acme.org",
"secret.acme.org"};
- private static final String[] WELCOME_FILES = new
String[]{"about.html","index.html","index.htm"};
+ private static final String[] WELCOME_FILES = new String[]{"about.html",
"index.html", "index.htm"};
private static final ClassLoader CLASSLOADER =
AbstractContextHandlerTestCase.class.getClassLoader();
private static final Map MIME_TYPES = new Hashtable();
private static final String CONTEXT_PATH = "acme";
@@ -65,6 +58,10 @@
return map;
}
+ /**
+ * Return the test context handler.
+ * @return the context handler
+ */
protected abstract ContextHandler getContextHandler();
/**
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/ServletContextHandlerTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/ServletContextHandlerTestCase.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/ServletContextHandlerTestCase.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -20,7 +20,6 @@
import java.io.File;
import java.util.Map;
-import java.util.Hashtable;
import net.dpml.http.ServletContextHandler.Context;
@@ -55,6 +54,10 @@
m_handler = new ServletContextHandler( logger, context );
}
+ /**
+ * Return the context handler under test.
+ * @return the context handler
+ */
protected ContextHandler getContextHandler()
{
return m_handler;
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
2006-05-19 15:39:24 UTC (rev 1451)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/SslSocketConnectorTestCase.java
2006-05-22 17:59:49 UTC (rev 1452)
@@ -21,7 +21,6 @@
import java.io.File;
import java.net.URI;
import java.util.Map;
-import java.util.Hashtable;
import net.dpml.http.SslSocketConnector.Context;
@@ -69,6 +68,10 @@
m_connector = new SslSocketConnector( context );
}
+ /**
+ * Return the connector under test.
+ * @return the connector
+ */
protected AbstractConnector getConnector()
{
return m_connector;
Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-05-19 15:39:24 UTC (rev 1451)
+++ trunk/main/planet/http/module.xml 2006-05-22 17:59:49 UTC (rev 1452)
@@ -4,7 +4,7 @@
<properties>
<property
name="project.xsd.builder.artifact:xsd:dpml/lang/dpml-component#1.0"
value="link:part:dpml/metro/dpml-metro-runtime"/>
- <property name="jetty.version" value="6.0.0-B14"/>
+ <property name="jetty.version" value="6.0.0-R516"/>
<property name="jasper.version" value="5.5.15"/>
<property name="sl4j.version" value="1.0-rc5"/>
</properties>
- r1452 - in trunk/main: central/src/docs/about/resources depot/build/etc/bin depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks planet/http planet/http/impl/src/main/net/dpml/http planet/http/impl/src/test/net/dpml/http, mcconnell at BerliOS, 05/22/2006
Archive powered by MHonArc 2.6.24.