svn commit: r476311 [1/2] - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/ ap...

[va...@apache.org]

Author: vamsic007
Date: Fri Nov 17 12:55:33 2006
New Revision: 476311

URL: http://svn.apache.org/viewvc?view=rev&rev=476311
Log:
modified svn properties

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ViewPluginDownloadHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerPortlet.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/CertificateDetailsHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/DeleteEntryHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/GenerateCSRHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/ImportCAReplyHandler.java   (props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java   (contents, props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/Entries.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/Entry.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/JspCalendar.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/TableBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/checkbox/CheckTest.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/colors/ColorGameBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionFilterTestServlet.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionResponseStream.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionServletResponseWrapper.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/dates/JspCalendar.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/error/Smart.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/ExampleTagBase.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/FooTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/FooTagExtraInfo.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/LogTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/ShowSource.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/ExampleFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/RequestDumperFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/SetCharacterEncodingFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/BookBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/FooBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/el/Functions.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/EchoAttributesTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/FindBookSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/listeners/ContextListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/listeners/SessionListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/num/NumberGuessBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/servletToJsp.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/sessions/DummyCart.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/util/HTMLFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/validators/DebugValidator.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/Entries.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/Entry.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/TableBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionResponseStream.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/error/Smart.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/ExampleTagBase.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/FooTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/FooTagExtraInfo.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/LogTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/ShowSource.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/RequestDumperFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/SetCharacterEncodingFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/BookBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/FooBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/el/Functions.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/listeners/ContextListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/listeners/SessionListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/num/NumberGuessBean.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/servletToJsp.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/sessions/DummyCart.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/util/HTMLFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/validators/DebugValidator.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/applet/Clock2.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/plugin/applet/Clock2.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/CookieExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/HelloWorldExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/RequestHeaderExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/RequestInfoExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/RequestParamExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/SessionExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/compressionFilters/CompressionFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/compressionFilters/CompressionFilterTestServlet.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/compressionFilters/CompressionResponseStream.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/compressionFilters/CompressionServletResponseWrapper.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/filters/ExampleFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/filters/RequestDumperFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/filters/SetCharacterEncodingFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/listeners/ContextListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/listeners/SessionListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/java/util/HTMLFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/CookieExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/HelloWorldExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/RequestHeaderExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/RequestInfoExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/RequestParamExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/SessionExample.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionResponseStream.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/filters/RequestDumperFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/filters/SetCharacterEncodingFilter.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/listeners/ContextListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/listeners/SessionListener.java   (props changed)
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/classes/util/HTMLFilter.java   (props changed)
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/test/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojoTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/src/main/java/org/apache/geronimo/clustering/wadi/jetty/WADIJettyClusteringBuilder.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicaStorageFactoryGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicReplicationManagerFactoryGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/BasicWADISessionManager.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/DispatcherHolder.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/RoundRobinBackingStrategyFactoryGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/TribesDispatcherHolder.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionAdaptor.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManager.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering-wadi/src/main/java/org/apache/geronimo/clustering/wadi/WADISessionManagerConfigInfo.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/BasicNode.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocation.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/ClusteredInvocationException.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Node.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/Session.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionAlreadyExistException.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionListener.java   (props changed)
    geronimo/server/trunk/modules/geronimo-clustering/src/main/java/org/apache/geronimo/clustering/SessionManager.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/src/main/java/org/apache/geronimo/jetty/cluster/wadi/WADIClusteredHandleInterceptor.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/DefaultWebApplicationHandlerFactory.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/GeronimoServletHttpRequest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/HandleInterceptor.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/WebApplicationHandlerFactory.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/AbstractClusteredHandleInterceptor.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredSessionManager.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandler.java   (props changed)
    geronimo/server/trunk/modules/geronimo-jetty/src/main/java/org/apache/geronimo/jetty/cluster/ClusteredWebApplicationHandlerFactory.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/GlobalContextGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/JavaCompContextGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/WritableContextGBean.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/AbstractContextTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompContextTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/JavaCompGBeanTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/KernelContextGBeanTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/GBeanBindingTest.java   (props changed)
    geronimo/server/trunk/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/binding/MockDataSource.java   (props changed)

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/AddRepositoryHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/car/ViewPluginDownloadHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerPortlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/CertificateDetailsHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/CertificateDetailsHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/DeleteEntryHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/DeleteEntryHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/GenerateCSRHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/GenerateCSRHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/ImportCAReplyHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/keystores/ImportCAReplyHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java?view=diff&rev=476311&r1=476310&r2=476311
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java Fri Nov 17 12:55:33 2006
@@ -1,446 +1,446 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.geronimo.console.ldapmanager;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.NameClassPair;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.servlet.http.HttpSession;
-
-import uk.ltd.getahead.dwr.WebContext;
-import uk.ltd.getahead.dwr.WebContextFactory;
-
-/**
- * The LDAP manager helper
- */
-public class LDAPManagerHelper {
-    private final static String LDAP_VERSION_KEY = "java.naming.ldap.version";
-
-    private final static String SSL_VALUE = "ssl";
-
-    private final static String NONE_VALUE = "none";
-
-    private final static String INITIAL_CONTEXT_FACTORY_DEFAULT = "com.sun.jndi.ldap.LdapCtxFactory";
-
-    private final static String HOST_DEFAULT = "localhost";
-
-    private final static String PORT_DEFAULT = "1389";
-
-    private final static String BASE_DN_DEFAULT = "ou=system";
-
-    // LDAP Version: "3", "2"
-    private final static String LDAP_VERSION_DEFAULT = "3";
-
-    // Security Protocol: "simple", "ssl", "sasl"
-    private final static String SECURITY_PROTOCOL_DEFAULT = "simple";
-
-    // Security Authentication: "simple", "none", "strong"
-    private final static String SECURITY_AUTHENTICATION_DEFAULT = "simple";
-
-    private final static String SECURITY_PRINCIPAL_DEFAULT = "uid=admin, ou=system";
-
-    private final static String SECURITY_CREDENTIALS_DEFAULT = "secret";
-
-    private final static String ONELEVEL_SCOPE = "onelevel";
-
-    private final static String SUBTREE_SCOPE = "subtree";
-
-    private final static String DIR_CONTEXT_KEY = "LDAPManagerHelper.dirContext";
-
-    private final static String DIR_ENV_KEY = "LDAPManagerHelper.dirEnv";
-
-    private final static String HOST_KEY = "LDAPManagerHelper.host";
-
-    private final static String PORT_KEY = "LDAPManagerHelper.port";
-
-    private final static String BASE_DN_KEY = "LDAPManagerHelper.baseDN";
-
-    private final static String SUCCESS_RESULT = "<SUCCESS>";
-
-    private DirContext dirContext;
-
-    private Hashtable dirEnv;
-
-    private String host;
-
-    private String port;
-
-    private String baseDN;
-
-    /**
-     * Construct an LDAP manager helper using config data (default)
-     */
-    public LDAPManagerHelper() throws Exception {
-        dirContext = (DirContext) getSessionAttribute(DIR_CONTEXT_KEY);
-        if (dirContext == null) {
-            // TODO: Get the default values from configuration / GBean
-            String result = connect(INITIAL_CONTEXT_FACTORY_DEFAULT,
-                    HOST_DEFAULT, PORT_DEFAULT, BASE_DN_DEFAULT,
-                    LDAP_VERSION_DEFAULT, SECURITY_PROTOCOL_DEFAULT,
-                    SECURITY_AUTHENTICATION_DEFAULT,
-                    SECURITY_PRINCIPAL_DEFAULT, SECURITY_CREDENTIALS_DEFAULT);
-            if (!SUCCESS_RESULT.equalsIgnoreCase(result)) {
-                throw new Exception(result);
-            }
-        } else {
-            dirEnv = (Hashtable) getSessionAttribute(DIR_ENV_KEY);
-            host = (String) getSessionAttribute(HOST_KEY);
-            port = (String) getSessionAttribute(PORT_KEY);
-            baseDN = (String) getSessionAttribute(BASE_DN_KEY);
-        }
-    }
-
-    /**
-     * Construct an LDAP manager helper using config data (partial)
-     */
-    public LDAPManagerHelper(String host, String port, String baseDN,
-            String securityAuthentication, String userDN, String userPwd)
-            throws Exception {
-        connect(INITIAL_CONTEXT_FACTORY_DEFAULT, host, port, baseDN,
-                LDAP_VERSION_DEFAULT, SECURITY_PROTOCOL_DEFAULT,
-                securityAuthentication, userDN, userPwd);
-    }
-
-    /**
-     * Construct an LDAP manager helper using config data (all)
-     */
-    public LDAPManagerHelper(String initialContextFactory, String host,
-            String port, String baseDN, String ldapVersion,
-            String securityProtocol, String securityAuthentication,
-            String securityPrincipal, String securityCredentials)
-            throws Exception {
-        connect(initialContextFactory, host, port, baseDN, ldapVersion,
-                securityProtocol, securityAuthentication, securityPrincipal,
-                securityCredentials);
-    }
-
-    /**
-     * Create a directory context using config data
-     */
-    public synchronized String connect(String initialContextFactory,
-            String host, String port, String baseDN, String ldapVersion,
-            String securityProtocol, String securityAuthentication,
-            String securityPrincipal, String securityCredentials)
-            throws Exception {
-        String result = SUCCESS_RESULT;
-
-        Hashtable dirEnv = new Hashtable();
-        dirEnv.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
-        String providerURL = createLDAPURL(host, port, ""); // Empty Base DN
-        dirEnv.put(Context.PROVIDER_URL, providerURL);
-        dirEnv.put(LDAP_VERSION_KEY, ldapVersion);
-        if (SSL_VALUE.equalsIgnoreCase(securityProtocol)) {
-            dirEnv.put(Context.SECURITY_PROTOCOL, SSL_VALUE);
-        }
-        dirEnv.put(Context.SECURITY_AUTHENTICATION, securityAuthentication);
-        if (!(NONE_VALUE.equalsIgnoreCase(securityAuthentication))) {
-            // Either "simple" or "strong"
-            dirEnv.put(Context.SECURITY_PRINCIPAL, securityPrincipal); // User DN
-            dirEnv.put(Context.SECURITY_CREDENTIALS, securityCredentials); // Password
-        }
-
-        try {
-            DirContext newDirContext = new InitialDirContext(dirEnv);
-            // Close old context
-            if (dirContext != null) {
-                dirContext.close();
-            }
-            // Save directory data to class vars
-            this.dirContext = newDirContext;
-            this.dirEnv = dirEnv;
-            this.host = host;
-            this.port = port;
-            this.baseDN = baseDN;
-            // Save directory data to session
-            setSessionAttribute(DIR_CONTEXT_KEY, dirContext);
-            setSessionAttribute(DIR_ENV_KEY, dirEnv);
-            setSessionAttribute(HOST_KEY, host);
-            setSessionAttribute(PORT_KEY, port);
-            setSessionAttribute(BASE_DN_KEY, baseDN);
-        } catch (NamingException e) {
-            result = "Problem connecting to directory server: "
-                    + e.getMessage();
-        }
-
-        return result;
-    }
-
-    /**
-     * Return directory context environment
-     */
-    public Map getEnvironment() {
-        Map env = new HashMap();
-        env.put("host", host);
-        env.put("port", port);
-        String ldapVersion = (String) dirEnv.get(LDAP_VERSION_KEY);
-        env.put("ldapVersion", ldapVersion);
-        env.put("baseDN", baseDN);
-        String securityProtocol = (String) dirEnv
-                .get(Context.SECURITY_PROTOCOL);
-        env.put("securityProtocol", securityProtocol);
-        String securityAuthentication = (String) dirEnv
-                .get(Context.SECURITY_AUTHENTICATION);
-        env.put("securityAuthentication", securityAuthentication);
-        String securityPrincipal = (String) dirEnv
-                .get(Context.SECURITY_PRINCIPAL);
-        env.put("securityPrincipal", securityPrincipal);
-
-        return env;
-    }
-
-    /**
-     * Returns the names bound in the named context
-     */
-    public Collection list(String name) throws Exception {
-        ArrayList result = new ArrayList();
-
-        try {
-            NamingEnumeration list = dirContext.list(name); // can't be ""
-
-            while (list.hasMore()) {
-                NameClassPair ncp = (NameClassPair) list.next();
-                String childName = ncp.getName();
-                String dn = childName + ", " + name;
-                String[] pair = { childName, dn };
-                result.add(pair);
-            }
-        } catch (NamingException e) {
-            throw new Exception("Problem getting directory list: "
-                    + e.getMessage());
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns the names bound in the base DN context
-     */
-    public Collection listBaseDN() throws Exception {
-        return list(baseDN);
-    }
-
-    /**
-     * Enumerates the names bound in the named context and return result as JSON
-     */
-    public String listJSON(String name) throws Exception {
-        return listJSON(name, null);
-    }
-
-    /**
-     * Enumerates the names bound in the named context and return result as JSON
-     */
-    public String listJSON(String name, String commonFields) throws Exception {
-        // JSON: [{title:"Title1",isFolder:true}, {title:"Title2"}]
-
-        StringBuffer json = new StringBuffer();
-        List list = (List) list(name);
-
-        json.append('[');
-        int size = list.size();
-        for (int i = 0; i < size; i++) {
-            String[] entry = (String[]) list.get(i);
-            json.append("{title:\"");
-            json.append(entry[0]);
-            json.append("\",widgetId:\"");
-            json.append(entry[1]);
-            json.append("\"");
-            if (commonFields != null) { // TODO: Do additional testing
-                json.append(commonFields);
-            }
-            json.append("}");
-            if ((i + 1) < size) {
-                json.append(',');
-            }
-        }
-        json.append("]");
-
-        return json.toString();
-    }
-
-    /**
-     * Return the attributes of an LDAP entry
-     */
-    public Collection getAttributes(String name) throws Exception {
-        ArrayList result = new ArrayList();
-        try {
-            Attributes attribs = dirContext.getAttributes(name);
-            NamingEnumeration attributes = attribs.getAll();
-            while (attributes.hasMore()) {
-                Attribute attribute = (Attribute) attributes.next();
-                String id = attribute.getID();
-                NamingEnumeration values = attribute.getAll();
-                while (values.hasMore()) {
-                    String value = values.next().toString();
-                    String[] pair = { id, value };
-                    result.add(pair);
-                }
-            }
-        } catch (NamingException e) {
-            throw new Exception("Problem retrieving attributes: "
-                    + e.getMessage());
-        }
-        return result;
-    }
-
-    /**
-     * Execute an LDAP search
-     */
-    public Collection search(String searchDN, String filter, String searchScope)
-            throws Exception {
-        ArrayList result = new ArrayList();
-        try {
-            String ldapURL = createLDAPURL(host, port, searchDN);
-            SearchControls sc = new SearchControls();
-            if (ONELEVEL_SCOPE.equalsIgnoreCase(searchScope)) {
-                sc.setSearchScope(SearchControls.ONELEVEL_SCOPE);
-            } else if (SUBTREE_SCOPE.equalsIgnoreCase(searchScope)) {
-                sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
-            } else {
-                // Default to one level scope
-                sc.setSearchScope(SearchControls.ONELEVEL_SCOPE);
-            }
-            // Filter: "(objectclass=*)"
-            boolean isSearchDNAdded = false;
-            NamingEnumeration ne = dirContext.search(ldapURL, filter, sc);
-            while (ne.hasMore()) {
-                SearchResult sr = (SearchResult) ne.next();
-                String name = sr.getName();
-                String dn = null;
-                if (name.length() > 0) {
-                    dn = name + "," + searchDN;
-                    result.add(dn);
-                } else if ((name.length() == 0) && !isSearchDNAdded) {
-                    dn = searchDN;
-                    result.add(dn);
-                    isSearchDNAdded = true;
-                }
-            }
-        } catch (NamingException e) {
-            throw new Exception("Problem performing directory search: "
-                    + e.getMessage());
-        }
-        return result;
-    }
-
-    /**
-     * Close directory context
-     */
-    public void close() throws Exception {
-        try {
-            dirContext.close();
-        } catch (NamingException e) {
-            throw new Exception("Problem closing directory context: "
-                    + e.getMessage());
-        }
-    }
-
-    /**
-     * Return base DN of this directory context
-     */
-    public String getBaseDN() {
-        return baseDN;
-    }
-
-    /**
-     * Create an LDAP url using host, port, and base DN
-     */
-    private String createLDAPURL(String host, String port, String baseDN) {
-        StringBuffer url = new StringBuffer();
-        url.append("ldap://");
-        url.append(host);
-        url.append(':');
-        url.append(port);
-        if ((baseDN != null) && (baseDN.length() >= 3)) {
-            if (!baseDN.startsWith("/")) {
-                url.append('/');
-            }
-            url.append(baseDN);
-        }
-        return url.toString();
-    }
-
-    /**
-     * Get the HTTP session
-     */
-    private HttpSession getSession() {
-        WebContext ctx = WebContextFactory.get();
-        HttpSession session = ctx.getSession();
-        return session;
-    }
-
-    /**
-     * Set an HTTP session attribute
-     */
-    private void setSessionAttribute(String name, Object value) {
-        getSession().setAttribute(name, value);
-    }
-
-    /**
-     * Get an HTTP session attribute
-     */
-    private Object getSessionAttribute(String name) {
-        return getSession().getAttribute(name);
-    }
-
-    /**
-     * Dump HTTP session attributes
-     */
-    private void dumpSession() {
-        System.out.println("--- dumpSession()");
-        WebContext ctx = WebContextFactory.get();
-        HttpSession session = ctx.getSession();
-        Enumeration attribNames = session.getAttributeNames();
-        while (attribNames.hasMoreElements()) {
-            String attribName = (String) attribNames.nextElement();
-            System.out.print("--- session: " + attribName + " = ");
-            Object attribValue = session.getAttribute(attribName);
-            System.out.println(attribValue);
-        }
-    }
-
-    /**
-     * Dump search enumeration
-     */
-    private void printSearchEnumeration(NamingEnumeration ne) {
-        try {
-            while (ne.hasMore()) {
-                SearchResult sr = (SearchResult) ne.next();
-                System.out.println("-->" + sr.getName());
-                System.out.println(sr.getAttributes());
-            }
-        } catch (NamingException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.ldapmanager;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.servlet.http.HttpSession;
+
+import uk.ltd.getahead.dwr.WebContext;
+import uk.ltd.getahead.dwr.WebContextFactory;
+
+/**
+ * The LDAP manager helper
+ */
+public class LDAPManagerHelper {
+    private final static String LDAP_VERSION_KEY = "java.naming.ldap.version";
+
+    private final static String SSL_VALUE = "ssl";
+
+    private final static String NONE_VALUE = "none";
+
+    private final static String INITIAL_CONTEXT_FACTORY_DEFAULT = "com.sun.jndi.ldap.LdapCtxFactory";
+
+    private final static String HOST_DEFAULT = "localhost";
+
+    private final static String PORT_DEFAULT = "1389";
+
+    private final static String BASE_DN_DEFAULT = "ou=system";
+
+    // LDAP Version: "3", "2"
+    private final static String LDAP_VERSION_DEFAULT = "3";
+
+    // Security Protocol: "simple", "ssl", "sasl"
+    private final static String SECURITY_PROTOCOL_DEFAULT = "simple";
+
+    // Security Authentication: "simple", "none", "strong"
+    private final static String SECURITY_AUTHENTICATION_DEFAULT = "simple";
+
+    private final static String SECURITY_PRINCIPAL_DEFAULT = "uid=admin, ou=system";
+
+    private final static String SECURITY_CREDENTIALS_DEFAULT = "secret";
+
+    private final static String ONELEVEL_SCOPE = "onelevel";
+
+    private final static String SUBTREE_SCOPE = "subtree";
+
+    private final static String DIR_CONTEXT_KEY = "LDAPManagerHelper.dirContext";
+
+    private final static String DIR_ENV_KEY = "LDAPManagerHelper.dirEnv";
+
+    private final static String HOST_KEY = "LDAPManagerHelper.host";
+
+    private final static String PORT_KEY = "LDAPManagerHelper.port";
+
+    private final static String BASE_DN_KEY = "LDAPManagerHelper.baseDN";
+
+    private final static String SUCCESS_RESULT = "<SUCCESS>";
+
+    private DirContext dirContext;
+
+    private Hashtable dirEnv;
+
+    private String host;
+
+    private String port;
+
+    private String baseDN;
+
+    /**
+     * Construct an LDAP manager helper using config data (default)
+     */
+    public LDAPManagerHelper() throws Exception {
+        dirContext = (DirContext) getSessionAttribute(DIR_CONTEXT_KEY);
+        if (dirContext == null) {
+            // TODO: Get the default values from configuration / GBean
+            String result = connect(INITIAL_CONTEXT_FACTORY_DEFAULT,
+                    HOST_DEFAULT, PORT_DEFAULT, BASE_DN_DEFAULT,
+                    LDAP_VERSION_DEFAULT, SECURITY_PROTOCOL_DEFAULT,
+                    SECURITY_AUTHENTICATION_DEFAULT,
+                    SECURITY_PRINCIPAL_DEFAULT, SECURITY_CREDENTIALS_DEFAULT);
+            if (!SUCCESS_RESULT.equalsIgnoreCase(result)) {
+                throw new Exception(result);
+            }
+        } else {
+            dirEnv = (Hashtable) getSessionAttribute(DIR_ENV_KEY);
+            host = (String) getSessionAttribute(HOST_KEY);
+            port = (String) getSessionAttribute(PORT_KEY);
+            baseDN = (String) getSessionAttribute(BASE_DN_KEY);
+        }
+    }
+
+    /**
+     * Construct an LDAP manager helper using config data (partial)
+     */
+    public LDAPManagerHelper(String host, String port, String baseDN,
+            String securityAuthentication, String userDN, String userPwd)
+            throws Exception {
+        connect(INITIAL_CONTEXT_FACTORY_DEFAULT, host, port, baseDN,
+                LDAP_VERSION_DEFAULT, SECURITY_PROTOCOL_DEFAULT,
+                securityAuthentication, userDN, userPwd);
+    }
+
+    /**
+     * Construct an LDAP manager helper using config data (all)
+     */
+    public LDAPManagerHelper(String initialContextFactory, String host,
+            String port, String baseDN, String ldapVersion,
+            String securityProtocol, String securityAuthentication,
+            String securityPrincipal, String securityCredentials)
+            throws Exception {
+        connect(initialContextFactory, host, port, baseDN, ldapVersion,
+                securityProtocol, securityAuthentication, securityPrincipal,
+                securityCredentials);
+    }
+
+    /**
+     * Create a directory context using config data
+     */
+    public synchronized String connect(String initialContextFactory,
+            String host, String port, String baseDN, String ldapVersion,
+            String securityProtocol, String securityAuthentication,
+            String securityPrincipal, String securityCredentials)
+            throws Exception {
+        String result = SUCCESS_RESULT;
+
+        Hashtable dirEnv = new Hashtable();
+        dirEnv.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
+        String providerURL = createLDAPURL(host, port, ""); // Empty Base DN
+        dirEnv.put(Context.PROVIDER_URL, providerURL);
+        dirEnv.put(LDAP_VERSION_KEY, ldapVersion);
+        if (SSL_VALUE.equalsIgnoreCase(securityProtocol)) {
+            dirEnv.put(Context.SECURITY_PROTOCOL, SSL_VALUE);
+        }
+        dirEnv.put(Context.SECURITY_AUTHENTICATION, securityAuthentication);
+        if (!(NONE_VALUE.equalsIgnoreCase(securityAuthentication))) {
+            // Either "simple" or "strong"
+            dirEnv.put(Context.SECURITY_PRINCIPAL, securityPrincipal); // User DN
+            dirEnv.put(Context.SECURITY_CREDENTIALS, securityCredentials); // Password
+        }
+
+        try {
+            DirContext newDirContext = new InitialDirContext(dirEnv);
+            // Close old context
+            if (dirContext != null) {
+                dirContext.close();
+            }
+            // Save directory data to class vars
+            this.dirContext = newDirContext;
+            this.dirEnv = dirEnv;
+            this.host = host;
+            this.port = port;
+            this.baseDN = baseDN;
+            // Save directory data to session
+            setSessionAttribute(DIR_CONTEXT_KEY, dirContext);
+            setSessionAttribute(DIR_ENV_KEY, dirEnv);
+            setSessionAttribute(HOST_KEY, host);
+            setSessionAttribute(PORT_KEY, port);
+            setSessionAttribute(BASE_DN_KEY, baseDN);
+        } catch (NamingException e) {
+            result = "Problem connecting to directory server: "
+                    + e.getMessage();
+        }
+
+        return result;
+    }
+
+    /**
+     * Return directory context environment
+     */
+    public Map getEnvironment() {
+        Map env = new HashMap();
+        env.put("host", host);
+        env.put("port", port);
+        String ldapVersion = (String) dirEnv.get(LDAP_VERSION_KEY);
+        env.put("ldapVersion", ldapVersion);
+        env.put("baseDN", baseDN);
+        String securityProtocol = (String) dirEnv
+                .get(Context.SECURITY_PROTOCOL);
+        env.put("securityProtocol", securityProtocol);
+        String securityAuthentication = (String) dirEnv
+                .get(Context.SECURITY_AUTHENTICATION);
+        env.put("securityAuthentication", securityAuthentication);
+        String securityPrincipal = (String) dirEnv
+                .get(Context.SECURITY_PRINCIPAL);
+        env.put("securityPrincipal", securityPrincipal);
+
+        return env;
+    }
+
+    /**
+     * Returns the names bound in the named context
+     */
+    public Collection list(String name) throws Exception {
+        ArrayList result = new ArrayList();
+
+        try {
+            NamingEnumeration list = dirContext.list(name); // can't be ""
+
+            while (list.hasMore()) {
+                NameClassPair ncp = (NameClassPair) list.next();
+                String childName = ncp.getName();
+                String dn = childName + ", " + name;
+                String[] pair = { childName, dn };
+                result.add(pair);
+            }
+        } catch (NamingException e) {
+            throw new Exception("Problem getting directory list: "
+                    + e.getMessage());
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns the names bound in the base DN context
+     */
+    public Collection listBaseDN() throws Exception {
+        return list(baseDN);
+    }
+
+    /**
+     * Enumerates the names bound in the named context and return result as JSON
+     */
+    public String listJSON(String name) throws Exception {
+        return listJSON(name, null);
+    }
+
+    /**
+     * Enumerates the names bound in the named context and return result as JSON
+     */
+    public String listJSON(String name, String commonFields) throws Exception {
+        // JSON: [{title:"Title1",isFolder:true}, {title:"Title2"}]
+
+        StringBuffer json = new StringBuffer();
+        List list = (List) list(name);
+
+        json.append('[');
+        int size = list.size();
+        for (int i = 0; i < size; i++) {
+            String[] entry = (String[]) list.get(i);
+            json.append("{title:\"");
+            json.append(entry[0]);
+            json.append("\",widgetId:\"");
+            json.append(entry[1]);
+            json.append("\"");
+            if (commonFields != null) { // TODO: Do additional testing
+                json.append(commonFields);
+            }
+            json.append("}");
+            if ((i + 1) < size) {
+                json.append(',');
+            }
+        }
+        json.append("]");
+
+        return json.toString();
+    }
+
+    /**
+     * Return the attributes of an LDAP entry
+     */
+    public Collection getAttributes(String name) throws Exception {
+        ArrayList result = new ArrayList();
+        try {
+            Attributes attribs = dirContext.getAttributes(name);
+            NamingEnumeration attributes = attribs.getAll();
+            while (attributes.hasMore()) {
+                Attribute attribute = (Attribute) attributes.next();
+                String id = attribute.getID();
+                NamingEnumeration values = attribute.getAll();
+                while (values.hasMore()) {
+                    String value = values.next().toString();
+                    String[] pair = { id, value };
+                    result.add(pair);
+                }
+            }
+        } catch (NamingException e) {
+            throw new Exception("Problem retrieving attributes: "
+                    + e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * Execute an LDAP search
+     */
+    public Collection search(String searchDN, String filter, String searchScope)
+            throws Exception {
+        ArrayList result = new ArrayList();
+        try {
+            String ldapURL = createLDAPURL(host, port, searchDN);
+            SearchControls sc = new SearchControls();
+            if (ONELEVEL_SCOPE.equalsIgnoreCase(searchScope)) {
+                sc.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+            } else if (SUBTREE_SCOPE.equalsIgnoreCase(searchScope)) {
+                sc.setSearchScope(SearchControls.SUBTREE_SCOPE);
+            } else {
+                // Default to one level scope
+                sc.setSearchScope(SearchControls.ONELEVEL_SCOPE);
+            }
+            // Filter: "(objectclass=*)"
+            boolean isSearchDNAdded = false;
+            NamingEnumeration ne = dirContext.search(ldapURL, filter, sc);
+            while (ne.hasMore()) {
+                SearchResult sr = (SearchResult) ne.next();
+                String name = sr.getName();
+                String dn = null;
+                if (name.length() > 0) {
+                    dn = name + "," + searchDN;
+                    result.add(dn);
+                } else if ((name.length() == 0) && !isSearchDNAdded) {
+                    dn = searchDN;
+                    result.add(dn);
+                    isSearchDNAdded = true;
+                }
+            }
+        } catch (NamingException e) {
+            throw new Exception("Problem performing directory search: "
+                    + e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * Close directory context
+     */
+    public void close() throws Exception {
+        try {
+            dirContext.close();
+        } catch (NamingException e) {
+            throw new Exception("Problem closing directory context: "
+                    + e.getMessage());
+        }
+    }
+
+    /**
+     * Return base DN of this directory context
+     */
+    public String getBaseDN() {
+        return baseDN;
+    }
+
+    /**
+     * Create an LDAP url using host, port, and base DN
+     */
+    private String createLDAPURL(String host, String port, String baseDN) {
+        StringBuffer url = new StringBuffer();
+        url.append("ldap://");
+        url.append(host);
+        url.append(':');
+        url.append(port);
+        if ((baseDN != null) && (baseDN.length() >= 3)) {
+            if (!baseDN.startsWith("/")) {
+                url.append('/');
+            }
+            url.append(baseDN);
+        }
+        return url.toString();
+    }
+
+    /**
+     * Get the HTTP session
+     */
+    private HttpSession getSession() {
+        WebContext ctx = WebContextFactory.get();
+        HttpSession session = ctx.getSession();
+        return session;
+    }
+
+    /**
+     * Set an HTTP session attribute
+     */
+    private void setSessionAttribute(String name, Object value) {
+        getSession().setAttribute(name, value);
+    }
+
+    /**
+     * Get an HTTP session attribute
+     */
+    private Object getSessionAttribute(String name) {
+        return getSession().getAttribute(name);
+    }
+
+    /**
+     * Dump HTTP session attributes
+     */
+    private void dumpSession() {
+        System.out.println("--- dumpSession()");
+        WebContext ctx = WebContextFactory.get();
+        HttpSession session = ctx.getSession();
+        Enumeration attribNames = session.getAttributeNames();
+        while (attribNames.hasMoreElements()) {
+            String attribName = (String) attribNames.nextElement();
+            System.out.print("--- session: " + attribName + " = ");
+            Object attribValue = session.getAttribute(attribName);
+            System.out.println(attribValue);
+        }
+    }
+
+    /**
+     * Dump search enumeration
+     */
+    private void printSearchEnumeration(NamingEnumeration ne) {
+        try {
+            while (ne.hasMore()) {
+                SearchResult sr = (SearchResult) ne.next();
+                System.out.println("-->" + sr.getName());
+                System.out.println(sr.getAttributes());
+            }
+        } catch (NamingException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java?view=diff&rev=476311&r1=476310&r2=476311
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java Fri Nov 17 12:55:33 2006
@@ -1,113 +1,113 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.geronimo.console.ldapmanager;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-
-/**
- * The LDAP manager portlet
- */
-public class LDAPManagerPortlet extends BasePortlet {
-    private static final String VIEWLDAPSERVER_ACTION = "viewLDAPServer";
-
-    private static final String VIEWLDAPSERVER_JSP = "/WEB-INF/view/ldapmanager/viewLDAPServer.jsp";
-
-    private static final String HELP_JSP = "/WEB-INF/view/ldapmanager/help.jsp";
-
-    private PortletRequestDispatcher viewLDAPServerView;
-
-    private PortletRequestDispatcher helpView;
-
-    private static LDAPManagerHelper helper = null /* new LDAPManagerHelper() */;
-
-    /**
-     * Process an action request
-     */
-    public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
-    }
-
-    /**
-     * Serve up the view mode
-     */
-    protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
-        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
-            return;
-        } else if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
-            String action = renderRequest.getParameter("action");
-            if (action == null) {
-                action = VIEWLDAPSERVER_ACTION;
-            }
-            if (VIEWLDAPSERVER_ACTION.equals(action)) {
-                viewLDAPServerView.include(renderRequest, renderResponse);
-            } else {
-                renderResponse.setContentType("text/html");
-                PrintWriter out = renderResponse.getWriter();
-                String errorMsg = "Invalid action message: " + action;
-                out.println(errorMsg);
-            }
-        } else if (WindowState.MAXIMIZED.equals(renderRequest.getWindowState())) {
-            renderResponse.setContentType("text/html");
-            PrintWriter out = renderResponse.getWriter();
-            String errorMsg = "Invalid window state: "
-                    + renderRequest.getWindowState();
-            out.println(errorMsg);
-        }
-    }
-
-    /**
-     * Serve up the help mode
-     */
-    protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
-        helpView.include(renderRequest, renderResponse);
-    }
-
-    /**
-     * Portlet is being placed into service
-     */
-    public void init(PortletConfig portletConfig) throws PortletException {
-        super.init(portletConfig);
-        PortletContext pc = portletConfig.getPortletContext();
-        viewLDAPServerView = pc.getRequestDispatcher(VIEWLDAPSERVER_JSP);
-        helpView = pc.getRequestDispatcher(HELP_JSP);
-    }
-
-    /**
-     * Portlet is being taken out of service
-     */
-    public void destroy() {
-        viewLDAPServerView = null;
-        helpView = null;
-        super.destroy();
-    }
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.ldapmanager;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.console.BasePortlet;
+
+/**
+ * The LDAP manager portlet
+ */
+public class LDAPManagerPortlet extends BasePortlet {
+    private static final String VIEWLDAPSERVER_ACTION = "viewLDAPServer";
+
+    private static final String VIEWLDAPSERVER_JSP = "/WEB-INF/view/ldapmanager/viewLDAPServer.jsp";
+
+    private static final String HELP_JSP = "/WEB-INF/view/ldapmanager/help.jsp";
+
+    private PortletRequestDispatcher viewLDAPServerView;
+
+    private PortletRequestDispatcher helpView;
+
+    private static LDAPManagerHelper helper = null /* new LDAPManagerHelper() */;
+
+    /**
+     * Process an action request
+     */
+    public void processAction(ActionRequest actionRequest,
+            ActionResponse actionResponse) throws PortletException, IOException {
+    }
+
+    /**
+     * Serve up the view mode
+     */
+    protected void doView(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws IOException, PortletException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        } else if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
+            String action = renderRequest.getParameter("action");
+            if (action == null) {
+                action = VIEWLDAPSERVER_ACTION;
+            }
+            if (VIEWLDAPSERVER_ACTION.equals(action)) {
+                viewLDAPServerView.include(renderRequest, renderResponse);
+            } else {
+                renderResponse.setContentType("text/html");
+                PrintWriter out = renderResponse.getWriter();
+                String errorMsg = "Invalid action message: " + action;
+                out.println(errorMsg);
+            }
+        } else if (WindowState.MAXIMIZED.equals(renderRequest.getWindowState())) {
+            renderResponse.setContentType("text/html");
+            PrintWriter out = renderResponse.getWriter();
+            String errorMsg = "Invalid window state: "
+                    + renderRequest.getWindowState();
+            out.println(errorMsg);
+        }
+    }
+
+    /**
+     * Serve up the help mode
+     */
+    protected void doHelp(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws PortletException, IOException {
+        helpView.include(renderRequest, renderResponse);
+    }
+
+    /**
+     * Portlet is being placed into service
+     */
+    public void init(PortletConfig portletConfig) throws PortletException {
+        super.init(portletConfig);
+        PortletContext pc = portletConfig.getPortletContext();
+        viewLDAPServerView = pc.getRequestDispatcher(VIEWLDAPSERVER_JSP);
+        helpView = pc.getRequestDispatcher(HELP_JSP);
+    }
+
+    /**
+     * Portlet is being taken out of service
+     */
+    public void destroy() {
+        viewLDAPServerView = null;
+        helpView = null;
+        super.destroy();
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerPortlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/Entries.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/Entry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/JspCalendar.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/cal/TableBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/checkbox/CheckTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/colors/ColorGameBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionFilterTestServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionResponseStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/compressionFilters/CompressionServletResponseWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/dates/JspCalendar.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/error/Smart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/ExampleTagBase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/FooTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/FooTagExtraInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/LogTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/examples/ShowSource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/ExampleFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/RequestDumperFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/filters/SetCharacterEncodingFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/BookBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/FooBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/el/Functions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/EchoAttributesTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/FindBookSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/listeners/ContextListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/listeners/SessionListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/num/NumberGuessBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/servletToJsp.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/sessions/DummyCart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/util/HTMLFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/java/validators/DebugValidator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/Entries.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/Entry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/cal/TableBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/error/Smart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/ExampleTagBase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/FooTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/FooTagExtraInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/LogTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/examples/ShowSource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/RequestDumperFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/BookBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/FooBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/el/Functions.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/listeners/ContextListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/listeners/SessionListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/num/NumberGuessBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/servletToJsp.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/sessions/DummyCart.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/util/HTMLFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/classes/validators/DebugValidator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/applet/Clock2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/plugin/applet/Clock2.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain