cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast McastServiceImpl.java

2004-02-22 Thread fhanik
fhanik  2004/02/22 22:58:28

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastServiceImpl.java
  Log:
  reenabled the doRun flag
  
  Revision  ChangesPath
  1.8   +7 -6  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
  
  Index: McastServiceImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- McastServiceImpl.java 23 Feb 2004 06:36:13 -  1.7
  +++ McastServiceImpl.java 23 Feb 2004 06:58:28 -  1.8
  @@ -186,9 +186,10 @@
* @throws IllegalStateException if the service is already started
*/
   public synchronized void start(int level) throws IOException {
  -if ( doRun ) throw new IllegalStateException("Service already running.");
  +if ( sender != null && receiver != null ) throw new 
IllegalStateException("Service already running.");
   if ( level == 1 ) {
   socket.joinGroup(address);
  +doRun = true;
   receiver = new ReceiverThread();
   receiver.setDaemon(true);
   receiver.start();
  @@ -198,7 +199,7 @@
   sender = new SenderThread(sendFrequency);
   sender.setDaemon(true);
   sender.start();
  -doRun = true;
  +
   }
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp SimpleTcpCluster.java

2004-02-22 Thread fhanik
fhanik  2004/02/22 22:36:13

  Modified:modules/cluster/src/share/org/apache/catalina/cluster
Member.java MembershipService.java
   modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
   modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java DeltaSession.java
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
  Log:
  just minor logging changes, and added a start level to the cluster membership, for 
future member merging purposes
  
  Revision  ChangesPath
  1.3   +6 -5  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/Member.java
  
  Index: Member.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/Member.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Member.java   16 Nov 2003 22:22:45 -  1.2
  +++ Member.java   23 Feb 2004 06:36:13 -  1.3
  @@ -106,4 +106,5 @@
* @return nr of milliseconds since this member started.
*/
   public long getMemberAliveTime();
  -}
  \ No newline at end of file
  +
  +}
  
  
  
  1.3   +16 -4 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/MembershipService.java
  
  Index: MembershipService.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/MembershipService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MembershipService.java5 Feb 2004 05:27:31 -   1.2
  +++ MembershipService.java23 Feb 2004 06:36:13 -  1.3
  @@ -88,9 +88,21 @@
   /**
* Starts the membership service. If a membership listeners is added
* the listener will start to receive membership events.
  + * Performs a start level 1 and 2
* @throws java.lang.Exception if the service fails to start.
*/
   public void start() throws java.lang.Exception;
  +
  +/**
  + * Starts the membership service. If a membership listeners is added
  + * the listener will start to receive membership events.
  + * @param level - level 1 starts listening for members, level 2 
  + * starts broad casting the server
  + * @throws java.lang.Exception if the service fails to start.
  + */
  +public void start(int level) throws java.lang.Exception;
  +
  +
   /**
* Stops the membership service
*/
  
  
  
  1.8   +14 -6 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java
  
  Index: McastService.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- McastService.java 5 Feb 2004 22:57:52 -   1.7
  +++ McastService.java 23 Feb 2004 06:36:13 -  1.8
  @@ -192,7 +192,15 @@
* @throws java.lang.Exception if a IO error occurs
*/
   public void start() throws java.lang.Exception {
  -if ( impl != null ) return;
  +start(1);
  +start(2);
  +}
  +
  +public void start(int level) throws java.lang.Exception {
  +if ( impl != null ) {
  +impl.start(level);
  +return;
  +}
   String host = getProperties().getProperty("tcpListenHost");
   int port = Integer.parseInt(getProperties().getProperty("tcpListenPort"));
   String name = "tcp://"+host+":"+port;
  @@ -215,7 +223,7 @@
   
java.net.InetAddress.getByName(properties.getProperty("mcastAddress")),
   this);
   
  -impl.start();
  +impl.start(level);
   log.info("Sleeping for 
"+(Long.parseLong(properties.getProperty("msgFrequency"))*4)+" secs to establish 
cluster membership");
   
Thread.currentThread().sleep((Long.parseLong(properties.getProperty("msgFrequency"))*4));
   
  
  
  
  1.7   +19 -15
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
  
  Index: McastServiceImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- McastServiceImpl.java 13 Jan 2004 00:07:18 -  1.6
  +

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java

2004-02-22 Thread billbarker
billbarker2004/02/22 22:30:55

  Modified:src/share/org/apache/jasper CommandLineContext.java
Constants.java EmbededServletOptions.java
JasperEngineContext.java JasperException.java
JasperOptionsImpl.java JspC.java
JspCompilationContext.java JspEngineContext.java
Options.java
   src/share/org/apache/jasper/servlet JasperLoader.java
JasperLoader12.java JspServlet.java
ServletEngine.java TomcatServletEngine.java
  Log:
  Fix cut-and-paste problem with license.
  
  Revision  ChangesPath
  1.11  +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java
  
  Index: CommandLineContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CommandLineContext.java   23 Feb 2004 03:41:26 -  1.10
  +++ CommandLineContext.java   23 Feb 2004 06:30:55 -  1.11
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper;
  
  
  
  1.27  +2 -1  jakarta-tomcat/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Constants.java23 Feb 2004 03:41:26 -  1.26
  +++ Constants.java23 Feb 2004 06:30:55 -  1.27
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper;
  
  
  
  1.11  +5 -4  
jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EmbededServletOptions.java23 Feb 2004 03:41:26 -  1.10
  +++ EmbededServletOptions.java23 Feb 2004 06:30:55 -  1.11
  @@ -15,7 +15,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper;
  
  
  
  1.5   +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java
  
  Index: JasperEngineContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperEngineContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JasperEngineContext.java  23 Feb 2004 03:41:26 -  1.4
  +++ JasperEngineContext.java  23 Feb 2004 06:30:55 -  1.5
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper;
  
  
  
  1.3   +5 -4  jakarta-tomcat/src/share/org/apache/jasper/JasperException.java
  
  Index: JasperException.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JasperException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JasperException.java  23 Feb 2004 03:41:26 -  1.2
  +++ JasperException.java  23 Feb 2004 06:30:55 -00

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html

2004-02-22 Thread billbarker
billbarker2004/02/22 22:26:32

  Modified:src/share/org/apache/jasper/runtime BodyContentImpl.java
HttpJspBase.java JspFactoryImpl.java JspLoader.java
JspRuntimeLibrary.java JspWriterImpl.java
PageContextImpl.java TagHandlerPool.java
TagHandlerPoolImpl.java TagPoolManager.java
TagPoolManagerImpl.java package.html
  Log:
  Fix cut-and-paste problem with license.
  
  Revision  ChangesPath
  1.14  +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BodyContentImpl.java  23 Feb 2004 03:23:12 -  1.13
  +++ BodyContentImpl.java  23 Feb 2004 06:26:32 -  1.14
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.runtime;
  
  
  
  1.8   +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java
  
  Index: HttpJspBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HttpJspBase.java  23 Feb 2004 03:23:12 -  1.7
  +++ HttpJspBase.java  23 Feb 2004 06:26:32 -  1.8
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.runtime;
  
  
  
  1.17  +5 -4  
jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java
  
  Index: JspFactoryImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspFactoryImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JspFactoryImpl.java   23 Feb 2004 03:23:13 -  1.16
  +++ JspFactoryImpl.java   23 Feb 2004 06:26:32 -  1.17
  @@ -15,7 +15,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.runtime;
  
  
  
  1.19  +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java
  
  Index: JspLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspLoader.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JspLoader.java23 Feb 2004 03:23:13 -  1.18
  +++ JspLoader.java23 Feb 2004 06:26:32 -  1.19
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.runtime;
  
  
  
  1.11  +2 -1  
jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
  
  Index: JspRuntimeLibrary.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JspRuntimeLibrary.java23 Feb 2004 03:23:13 -  1.10
  +++ JspRuntimeLibrary.java23 Feb 2004 06:26:32 -  1.11
  @@ -10,7 +10,8 @@
*  Unless required by applicable law or agreed to in writing, software
*  dis

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.java PluginGenerator.java ScriptletGenerator.java ServiceMethodPhase.java ServletWriter.java SetPropertyGenerator.java StaticInitializerPhase.java StoredCharDataGenerator.java SunJavaCompiler.java TagBeginGenerator.java TagCache.java TagEndGenerator.java TagGeneratorBase.java TagLibraries.java TagLibraryInfoImpl.java TagPoolGenerator.java TagPoolManagerGenerator.java

2004-02-22 Thread billbarker
billbarker2004/02/22 22:22:38

  Modified:src/share/org/apache/jasper/compiler BaseJspListener.java
BeanEndGenerator.java BeanGenerator.java
BeanRepository.java CharDataGenerator.java
ClassDeclarationPhase.java ClassName.java
CommandLineCompiler.java CommentGenerator.java
CompileException.java Compiler.java
CoreElement.java DeclarationGenerator.java
DelegatingListener.java DestroyMethodPhase.java
DumbParseEventListener.java
EscapeUnicodeWriter.java ExpressionGenerator.java
FileDeclarationPhase.java ForwardGenerator.java
Generator.java GeneratorBase.java
GetPropertyGenerator.java IncludeGenerator.java
InfoGenerator.java InitMethodPhase.java
JakartaCommentGenerator.java JasperMangler.java
JavaCompiler.java JikesJavaCompiler.java
JspCompiler.java JspParseEventListener.java
JspReader.java JspUtil.java Mangler.java
MappedCharDataGenerator.java Mark.java
ParseEventListener.java ParseException.java
Parser.java PluginGenerator.java
ScriptletGenerator.java ServiceMethodPhase.java
ServletWriter.java SetPropertyGenerator.java
StaticInitializerPhase.java
StoredCharDataGenerator.java SunJavaCompiler.java
TagBeginGenerator.java TagCache.java
TagEndGenerator.java TagGeneratorBase.java
TagLibraries.java TagLibraryInfoImpl.java
TagPoolGenerator.java TagPoolManagerGenerator.java
  Log:
  Fix cut-and-paste problem with license.
  
  Revision  ChangesPath
  1.9   +5 -4  
jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java
  
  Index: BaseJspListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BaseJspListener.java  23 Feb 2004 02:45:11 -  1.8
  +++ BaseJspListener.java  23 Feb 2004 06:22:36 -  1.9
  @@ -15,7 +15,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.compiler;
  
  
  
  1.3   +5 -4  
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java
  
  Index: BeanEndGenerator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BeanEndGenerator.java 23 Feb 2004 02:45:11 -  1.2
  +++ BeanEndGenerator.java 23 Feb 2004 06:22:36 -  1.3
  @@ -15,7 +15,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.compiler;
  
  
  
  1.12  +5 -4  
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java
  
  Index: BeanGenerator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BeanGenerator.java23 Feb 2004 02:45:11 -  1.11
  +++ BeanGenerator.java23 Feb 2004 06:22:36 -  1.12
  @@ -14,7 +14,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.jasper.compiler;
  
  
  
  1.4   +5 -4   

cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade CookieFacade.java HttpServletRequestFacade.java HttpServletResponseFacade.java HttpSessionFacade.java JspInterceptor.java LoadOnStartupInterceptor.java RequestDispatcherImpl.java Servlet22Interceptor.java ServletConfigImpl.java ServletContextFacade.java ServletHandler.java ServletInfo.java ServletInputStreamFacade.java ServletOutputStreamFacade.java ServletWriterFacade.java SessionContextImpl.java TagPoolManagerInterceptor.java WebXmlReader.java package.html

2004-02-22 Thread billbarker
billbarker2004/02/22 22:06:13

  Modified:src/facade22/org/apache/tomcat/facade CookieFacade.java
HttpServletRequestFacade.java
HttpServletResponseFacade.java
HttpSessionFacade.java JspInterceptor.java
LoadOnStartupInterceptor.java
RequestDispatcherImpl.java
Servlet22Interceptor.java ServletConfigImpl.java
ServletContextFacade.java ServletHandler.java
ServletInfo.java ServletInputStreamFacade.java
ServletOutputStreamFacade.java
ServletWriterFacade.java SessionContextImpl.java
TagPoolManagerInterceptor.java WebXmlReader.java
package.html
  Log:
  Fix cut-and-paste problem with license.
  
  Revision  ChangesPath
  1.8   +2 -1  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java
  
  Index: CookieFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/CookieFacade.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CookieFacade.java 23 Feb 2004 02:08:54 -  1.7
  +++ CookieFacade.java 23 Feb 2004 06:06:13 -  1.8
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   package org.apache.tomcat.facade;
  
  
  
  1.36  +2 -1  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java
  
  Index: HttpServletRequestFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletRequestFacade.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- HttpServletRequestFacade.java 23 Feb 2004 02:08:54 -  1.35
  +++ HttpServletRequestFacade.java 23 Feb 2004 06:06:13 -  1.36
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   
  
  
  
  1.33  +5 -4  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
  
  Index: HttpServletResponseFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- HttpServletResponseFacade.java23 Feb 2004 02:08:54 -  1.32
  +++ HttpServletResponseFacade.java23 Feb 2004 06:06:13 -  1.33
  @@ -15,7 +15,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   
  
  
  
  1.23  +2 -1  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java
  
  Index: HttpSessionFacade.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpSessionFacade.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- HttpSessionFacade.java23 Feb 2004 02:08:54 -  1.22
  +++ HttpSessionFacade.java23 Feb 2004 06:06:13 -  1.23
  @@ -10,7 +10,8 @@
*  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 
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
*/
   
   
  
  
  
  1.43  +2 -1  
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
  
  Index: JspInterceptor.java
  

[GUMP@lsd]: jakarta-tomcat-5/jakarta-tomcat-5 failed

2004-02-22 Thread bobh
To whom it may engage...

This is an automated request, but not an unsolicited one. For help understanding the 
request please visit http://jakarta.apache.org/gump/nagged.html, and/or contact [EMAIL 
PROTECTED]

Project jakarta-tomcat-5 has an issue affecting it's community integration, and has 
been outstanding for 3 runs. The current state is 'Failed', for reason 'Build Failed'

Full details are available at: 
http://lsd.student.utwente.nl/gump/jakarta-tomcat-5/jakarta-tomcat-5.html, however 
some snippets follow:

-  -  -  -  - -- --  G U M P

Gump provided these annotations:

 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-default.jar] 
identifier set to jar basename: [servlets-default.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/common/lib/naming-common.jar] 
identifier set to jar basename: [naming-common.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/common/lib/naming-resources.jar] 
identifier set to jar basename: [naming-resources.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/catalina.jar] 
identifier set to jar basename: [catalina.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/bin/bootstrap.jar] identifier set 
to jar basename: [bootstrap.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-common.jar] 
identifier set to jar basename: [servlets-common.jar]
 - Warning - Jar [/data3/gump/jakarta-tomcat-5/dist/server/lib/servlets-invoker.jar] 
identifier set to jar basename: [servlets-invoker.jar]
 - Info - Dependency on javamail exists, no need to add for property mail.jar.
 - Info - Dependency on jaf exists, no need to add for property activation.jar.
 - Info - Dependency on jakarta-servletapi-5-servlet exists, no need to add for 
property servlet-api.jar.
 - Info - Dependency on jakarta-servletapi-5-jsp exists, no need to add for property 
jsp-api.jar.
 - Info - Dependency on xml-xerces exists, no need to add for property xercesImpl.jar.
 - Info - Dependency on xml-xerces exists, no need to add for property 
xmlParserAPIs.jar.
 - Info - Dependency on jakarta-tomcat-util exists, no need to add for property 
tomcat-util.jar.
 - Info - Dependency on commons-el exists, no need to add for property commons-el.jar.
 - Info - Dependency on commons-logging exists, no need to add for property 
commons-logging-api.jar.
 - Info - Dependency on commons-modeler exists, no need to add for property 
commons-modeler.jar.
 - Info - Dependency on ant exists, no need to add for property ant.home.
 - Info - Dependency on jsse exists, no need to add for property jsse.home.
 - Info - Dependency on jmx exists, no need to add for property jmx.home.
 - Info - Dependency on jmx exists, no need to add for property jmx.jar.
 - Info - Dependency on jmx exists, no need to add for property jmx-tools.jar.
 - Info - Dependency on jndi exists, no need to add for property jndi.home.
 - Info - Dependency on jakarta-regexp exists, no need to add for property regexp.home.
 - Info - Dependency on jakarta-regexp exists, no need to add for property regexp.jar.
 - Info - Dependency on javamail exists, no need to add for property mail.home.
 - Info - Dependency on jakarta-tomcat-coyote exists, no need to add for property 
tomcat-coyote.home.
 - Info - Dependency on jakarta-tomcat-jasper_tc5 exists, no need to add for property 
jasper.home.
 - Info - Dependency on jaf exists, no need to add for property activation.home.
 - Info - Dependency on commons-modeler exists, no need to add for property 
commons-modeler.home.
 - Info - Dependency on commons-daemon exists, no need to add for property 
commons-daemon.jsvc.tar.gz.
 - Info - Dependency on jakarta-struts exists, no need to add for property struts.home.
 - Error - Failed with reason build failed


-  -  -  -  - -- --  G U M P
Gump performed this work:

Work Name: build_jakarta-tomcat-5_jakarta-tomcat-5 (Type: Build)
State: Failed
Elapsed: 0 hours, 1 minutes, 41 seconds
Command Line: java -Djava.awt.headless=true 
-Xbootclasspath/p:/data3/gump/xml-xerces2/java/build/xercesImpl.jar:/data3/gump/xml-xerces2/java/build/xmlParserAPIs.jar:/data3/gump/xml-xalan/java/build/xalan-unbundled.jar:/data3/gump/xml-commons/java/external/build/xml-apis.jar
 org.apache.tools.ant.Main -Dbuild.clonevm=true 
-Dgump.merge=/data3/gump/gump/work/merge.xml -Dbuild.sysclasspath=only 
-Dtomcat33.home=*Unset* 
-Djsp-api.jar=/data3/gump/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar 
-Dtomcat-coyote.home=/data3/gump/jakarta-tomcat-connectors/coyote 
-Djndi.jar=/data3/gump/opt/jndi1_2_1/lib/jndi.jar 
-Dsite2.home=/data3/gump/jakarta-site2 
-DxmlParserAPIs.jar=/data3/gump/xml-xerces2/java/build/xercesImpl.jar 
-Dactivation.home=/data3/gump/opt/jaf-1.0.1 -Djmx.home=/data3/gump/opt/jmx-1_2-ri 
-Djdbc20ext.jar=/data3/gump/opt/jdbc2_0/jdbc2_0-stdext.jar 
-Djmx-tools.jar=/data3/gump/opt/jmx-1_2-ri/lib/jmxtools.jar 
-Dregexp.jar=/data3/gump/jaka

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler CommentGenerator.java

2004-02-22 Thread billbarker
billbarker2004/02/22 20:04:05

  Modified:src/share/org/apache/jasper/compiler CommentGenerator.java
  Log:
  Fix typo.
  
  Revision  ChangesPath
  1.4   +0 -1  
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java
  
  Index: CommentGenerator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CommentGenerator.java 23 Feb 2004 02:45:12 -  1.3
  +++ CommentGenerator.java 23 Feb 2004 04:04:05 -  1.4
  @@ -12,7 +12,6 @@
*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*  See the License for the specific language 
*/
  -/*
   
   package org.apache.jasper.compiler;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/share/org/apache/jasper CommandLineContext.java Constants.java EmbededServletOptions.java JasperEngineContext.java JasperException.java JasperOptionsImpl.java JspC.java JspCompilationContext.java JspEngineContext.java Options.java

2004-02-22 Thread billbarker
billbarker2004/02/22 19:41:26

  Modified:src/share/org/apache/jasper CommandLineContext.java
Constants.java EmbededServletOptions.java
JasperEngineContext.java JasperException.java
JasperOptionsImpl.java JspC.java
JspCompilationContext.java JspEngineContext.java
Options.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.10  +12 -58
jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java
  
  Index: CommandLineContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/CommandLineContext.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CommandLineContext.java   22 Sep 2003 09:17:46 -  1.9
  +++ CommandLineContext.java   23 Feb 2004 03:41:26 -  1.10
  @@ -1,63 +1,17 @@
   /*
  - * 
  - * 
  - * The Apache Software License, Version 1.1
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - */ 
  -
  -
  -
  -
  + *  Licensed 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 
  + */
   
   package org.apache.jasper;
   
  
  
  
  1.26  +12 -54jakarta-tomcat/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Constants.java22 Sep 2003 09:17:46 -  1.25
  +++ Constants.java23 Feb 2004 03:41:26 -  1.26
  @@ -1,59 +1,17 @@
  -
   /*
  - * The Apache 

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/servlet JasperLoader.java JasperLoader12.java JspServlet.java ServletEngine.java TomcatServletEngine.java

2004-02-22 Thread billbarker
billbarker2004/02/22 19:28:28

  Modified:src/share/org/apache/jasper/servlet JasperLoader.java
JasperLoader12.java JspServlet.java
ServletEngine.java TomcatServletEngine.java
  Log:
  Update to the Apache License v2.0.
  
  Revision  ChangesPath
  1.5   +12 -54
jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java
  
  Index: JasperLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JasperLoader.java 22 Sep 2003 09:17:46 -  1.4
  +++ JasperLoader.java 23 Feb 2004 03:28:28 -  1.5
  @@ -1,59 +1,17 @@
   /*
  - * 
  - * 
  - * The Apache Software License, Version 1.1
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - */ 
  + *  Licensed 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 
  + */
   
   package org.apache.jasper.servlet;
   
  
  
  
  1.5   +12 -54
jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java
  
  Index: JasperLoader12.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/servlet/JasperLoader12.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JasperLoader12.java   22 Sep 2003 09:17:46 -  1.4
  +++ JasperLoader12.java   23 Feb 2004 03:28:28 -  1.5
  @@ -1,59 +1,17 @@
   /*
  - * 
  - * 
  - * The Apache Software License, Version 1.1
  + *  Copyright 1999-2004 The Apache Software Founda

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime BodyContentImpl.java HttpJspBase.java JspFactoryImpl.java JspLoader.java JspRuntimeLibrary.java JspWriterImpl.java PageContextImpl.java TagHandlerPool.java TagHandlerPoolImpl.java TagPoolManager.java TagPoolManagerImpl.java package.html

2004-02-22 Thread billbarker
billbarker2004/02/22 19:23:13

  Modified:src/share/org/apache/jasper/runtime BodyContentImpl.java
HttpJspBase.java JspFactoryImpl.java JspLoader.java
JspRuntimeLibrary.java JspWriterImpl.java
PageContextImpl.java TagHandlerPool.java
TagHandlerPoolImpl.java TagPoolManager.java
TagPoolManagerImpl.java package.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.13  +12 -52
jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BodyContentImpl.java  22 Sep 2003 09:17:47 -  1.12
  +++ BodyContentImpl.java  23 Feb 2004 03:23:12 -  1.13
  @@ -1,57 +1,17 @@
   /*
  - * The Apache Software License, Version 1.1
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - */ 
  + *  Licensed 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 
  + */
   
   package org.apache.jasper.runtime;
   
  
  
  
  1.7   +12 -52
jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java
  
  Index: HttpJspBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpJspBase.java  22 Sep 2003 09:17:47 -  1.6
  +++ HttpJspBase.java  23 Feb 2004 03:23:12 -  1.7
  @@ -1,57 +1,17 @@
   /*
  - * The Apache Software License, Version 1.

cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler BaseJspListener.java BeanEndGenerator.java BeanGenerator.java BeanRepository.java CharDataGenerator.java ClassDeclarationPhase.java ClassName.java CommandLineCompiler.java CommentGenerator.java CompileException.java Compiler.java CoreElement.java DeclarationGenerator.java DelegatingListener.java DestroyMethodPhase.java DumbParseEventListener.java EscapeUnicodeWriter.java ExpressionGenerator.java FileDeclarationPhase.java ForwardGenerator.java Generator.java GeneratorBase.java GetPropertyGenerator.java IncludeGenerator.java InfoGenerator.java InitMethodPhase.java JakartaCommentGenerator.java JasperMangler.java JavaCompiler.java JikesJavaCompiler.java JspCompiler.java JspParseEventListener.java JspReader.java JspUtil.java Mangler.java MappedCharDataGenerator.java Mark.java ParseEventListener.java ParseException.java Parser.java PluginGenerator.java ScriptletGenerator.java ServiceMethodPhase.java ServletWriter.java SetPropertyGenerator.java StaticInitializerPhase.java StoredCharDataGenerator.java SunJavaCompiler.java TagBeginGenerator.java TagCache.java TagEndGenerator.java TagGeneratorBase.java TagLibraries.java TagLibraryInfoImpl.java TagPoolGenerator.java TagPoolManagerGenerator.java

2004-02-22 Thread billbarker
billbarker2004/02/22 18:45:13

  Modified:src/share/org/apache/jasper/compiler BaseJspListener.java
BeanEndGenerator.java BeanGenerator.java
BeanRepository.java CharDataGenerator.java
ClassDeclarationPhase.java ClassName.java
CommandLineCompiler.java CommentGenerator.java
CompileException.java Compiler.java
CoreElement.java DeclarationGenerator.java
DelegatingListener.java DestroyMethodPhase.java
DumbParseEventListener.java
EscapeUnicodeWriter.java ExpressionGenerator.java
FileDeclarationPhase.java ForwardGenerator.java
Generator.java GeneratorBase.java
GetPropertyGenerator.java IncludeGenerator.java
InfoGenerator.java InitMethodPhase.java
JakartaCommentGenerator.java JasperMangler.java
JavaCompiler.java JikesJavaCompiler.java
JspCompiler.java JspParseEventListener.java
JspReader.java JspUtil.java Mangler.java
MappedCharDataGenerator.java Mark.java
ParseEventListener.java ParseException.java
Parser.java PluginGenerator.java
ScriptletGenerator.java ServiceMethodPhase.java
ServletWriter.java SetPropertyGenerator.java
StaticInitializerPhase.java
StoredCharDataGenerator.java SunJavaCompiler.java
TagBeginGenerator.java TagCache.java
TagEndGenerator.java TagGeneratorBase.java
TagLibraries.java TagLibraryInfoImpl.java
TagPoolGenerator.java TagPoolManagerGenerator.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.8   +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BaseJspListener.java.diff?r1=1.7&r2=1.8
  
  
  1.2   +13 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanEndGenerator.java.diff?r1=1.1&r2=1.2
  
  
  1.11  +17 -56
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanGenerator.java.diff?r1=1.10&r2=1.11
  
  
  1.3   +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/BeanRepository.java.diff?r1=1.2&r2=1.3
  
  
  1.7   +13 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java.diff?r1=1.6&r2=1.7
  
  
  1.2   +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassDeclarationPhase.java.diff?r1=1.1&r2=1.2
  
  
  1.4   +13 -55
jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassName.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/ClassName.java.diff?r1=1.3&r2=1.4
  
  
  1.9   +12 -51
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommandLineCompiler.java.diff?r1=1.8&r2=1.9
  
  
  1.3   +13 -55
jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CommentGenerator.java.diff?r1=1.2&r2=1.3
  
  
  1.2   +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/CompileException.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CompileException.java.diff?r1=1.1&r2=1.2
  
  
  1.26  +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java.diff?r1=1.25&r2=1.26
  
  
  1.2   +14 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/CoreElement.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CoreElement.java.diff?r1=1.1&r2=1.2
  
  
  1.2   +13 -54
jakarta-tomcat/src/share/org/apache/jasper/compiler/DeclarationGenerator.java
  
  
http://cvs.apache.org/viewcvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Decl

cvs commit: jakarta-tomcat/src/examples/servlets cookies.html helloworld.html index.html reqheaders.html reqinfo.html reqparams.html sessions.html

2004-02-22 Thread billbarker
billbarker2004/02/22 15:46:31

  Modified:src/examples/servlets cookies.html helloworld.html
index.html reqheaders.html reqinfo.html
reqparams.html sessions.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +15 -0 jakarta-tomcat/src/examples/servlets/cookies.html
  
  Index: cookies.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/cookies.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cookies.html  10 Dec 1999 20:30:46 -  1.3
  +++ cookies.html  22 Feb 2004 23:46:31 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  
  1.3   +15 -0 jakarta-tomcat/src/examples/servlets/helloworld.html
  
  Index: helloworld.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/helloworld.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- helloworld.html   10 Dec 1999 02:31:29 -  1.2
  +++ helloworld.html   22 Feb 2004 23:46:31 -  1.3
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  
  1.3   +15 -0 jakarta-tomcat/src/examples/servlets/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/index.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.html8 Nov 1999 03:13:36 -   1.2
  +++ index.html22 Feb 2004 23:46:31 -  1.3
  @@ -1,5 +1,20 @@
   
   
  +
   
  
  
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/servlets/reqheaders.html
  
  Index: reqheaders.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqheaders.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- reqheaders.html   10 Dec 1999 20:30:46 -  1.3
  +++ reqheaders.html   22 Feb 2004 23:46:31 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/servlets/reqinfo.html
  
  Index: reqinfo.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqinfo.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- reqinfo.html  10 Dec 1999 20:30:46 -  1.3
  +++ reqinfo.html  22 Feb 2004 23:46:31 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/servlets/reqparams.html
  
  Index: reqparams.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/reqparams.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- reqparams.html10 Dec 1999 20:30:46 -  1.3
  +++ reqparams.html22 Feb 2004 23:46:31 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/servlets/sessions.html
  
  Index: sessions.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/servlets/sessions.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sessions.html 10 Dec 1999 20:30:46 -  1.3
  +++ sessions.html 22 Feb 2004 23:46:31 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Untitled Document
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/snp snoop.html snoop.jsp snoop.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:44:17

  Modified:src/examples/jsp index.html source.jsp
   src/examples/jsp/snp snoop.html snoop.jsp snoop.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.6   +14 -3 jakarta-tomcat/src/examples/jsp/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/index.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.html9 Mar 2001 22:54:06 -   1.5
  +++ index.html22 Feb 2004 23:44:17 -  1.6
  @@ -5,9 +5,20 @@
  
  
  JSP Examples
  -
   
   
  
  
  
  1.2   +15 -0 jakarta-tomcat/src/examples/jsp/source.jsp
  
  Index: source.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/source.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- source.jsp19 Nov 1999 01:30:16 -  1.1
  +++ source.jsp22 Feb 2004 23:44:17 -  1.2
  @@ -1,3 +1,18 @@
  +<%--   
  +Copyright 1999-2004 The Apache Software Foundation
  +  
  +Licensed 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.
  +--%>
   <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %>
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.html
  
  Index: snoop.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- snoop.html10 Mar 2001 03:00:56 -  1.3
  +++ snoop.html22 Feb 2004 23:44:17 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.6   +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.jsp
  
  Index: snoop.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- snoop.jsp 16 Feb 2003 23:14:01 -  1.5
  +++ snoop.jsp 22 Feb 2004 23:44:17 -  1.6
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/snp/snoop.txt
  
  Index: snoop.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/snp/snoop.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- snoop.txt 22 Dec 1999 11:53:42 -  1.3
  +++ snoop.txt 22 Feb 2004 23:44:17 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/simpletag foo.html foo.jsp foo.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:39:36

  Modified:src/examples/jsp/simpletag foo.html foo.jsp foo.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.html
  
  Index: foo.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- foo.html  10 Mar 2001 03:00:55 -  1.3
  +++ foo.html  22 Feb 2004 23:39:36 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   Untitled Document
  
  
  
  1.7   +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.jsp
  
  Index: foo.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- foo.jsp   20 Oct 1999 23:29:49 -  1.6
  +++ foo.jsp   22 Feb 2004 23:39:36 -  1.7
  @@ -1,7 +1,18 @@
   
  -
   
   <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %>
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/simpletag/foo.txt
  
  Index: foo.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/simpletag/foo.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- foo.txt   8 Nov 1999 03:13:26 -   1.2
  +++ foo.txt   22 Feb 2004 23:39:36 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   <%@ taglib uri="http://java.apache.org/tomcat/examples-taglib"; prefix="eg" %>
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/sessions DummyCart.html carts.html carts.jsp carts.txt crt.html

2004-02-22 Thread billbarker
billbarker2004/02/22 15:38:05

  Modified:src/examples/jsp/sessions DummyCart.html carts.html
carts.jsp carts.txt crt.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/sessions/DummyCart.html
  
  Index: DummyCart.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/DummyCart.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DummyCart.html20 Oct 1999 23:20:10 -  1.2
  +++ DummyCart.html22 Feb 2004 23:38:05 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.html
  
  Index: carts.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- carts.html20 Oct 1999 23:20:10 -  1.2
  +++ carts.html22 Feb 2004 23:38:05 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.jsp
  
  Index: carts.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- carts.jsp 16 Feb 2003 23:14:00 -  1.3
  +++ carts.jsp 22 Feb 2004 23:38:05 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/sessions/carts.txt
  
  Index: carts.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/carts.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- carts.txt 20 Oct 1999 23:20:11 -  1.2
  +++ carts.txt 22 Feb 2004 23:38:05 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/sessions/crt.html
  
  Index: crt.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/sessions/crt.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- crt.html  10 Mar 2001 03:00:54 -  1.3
  +++ crt.html  22 Feb 2004 23:38:05 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/security/protected index.jsp

2004-02-22 Thread billbarker
billbarker2004/02/22 15:35:45

  Modified:src/examples/jsp/security error.txt index.jsp index.txt
login.txt policy.jsp security.html
   src/examples/jsp/security/login error.jsp login.jsp
   src/examples/jsp/security/protected index.jsp
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +15 -0 jakarta-tomcat/src/examples/jsp/security/error.txt
  
  Index: error.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/error.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- error.txt 9 Oct 2000 02:38:14 -   1.2
  +++ error.txt 22 Feb 2004 23:35:45 -  1.3
  @@ -1,4 +1,19 @@
   
  +
   
   Login Error
   
  
  
  
  1.2   +14 -3 jakarta-tomcat/src/examples/jsp/security/index.jsp
  
  Index: index.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/index.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.jsp 9 Mar 2001 22:54:06 -   1.1
  +++ index.jsp 22 Feb 2004 23:35:45 -  1.2
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +15 -0 jakarta-tomcat/src/examples/jsp/security/index.txt
  
  Index: index.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/index.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.txt 9 Oct 2000 02:38:14 -   1.2
  +++ index.txt 22 Feb 2004 23:35:45 -  1.3
  @@ -1,4 +1,19 @@
   
  +
   
   Protected Area Page
   
  
  
  
  1.3   +15 -0 jakarta-tomcat/src/examples/jsp/security/login.txt
  
  Index: login.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- login.txt 9 Oct 2000 02:38:14 -   1.2
  +++ login.txt 22 Feb 2004 23:35:45 -  1.3
  @@ -1,4 +1,19 @@
   
  +
   
   Login page for examples
   
  
  
  
  1.2   +15 -0 jakarta-tomcat/src/examples/jsp/security/policy.jsp
  
  Index: policy.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/policy.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- policy.jsp30 Aug 2000 05:39:28 -  1.1
  +++ policy.jsp22 Feb 2004 23:35:45 -  1.2
  @@ -1,3 +1,18 @@
  +
   Security test 
   
   Attempting to create /tmp/sectest
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/security/security.html
  
  Index: security.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/security.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- security.html 10 Mar 2001 03:00:56 -  1.3
  +++ security.html 22 Feb 2004 23:35:45 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.2   +15 -0 jakarta-tomcat/src/examples/jsp/security/login/error.jsp
  
  Index: error.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login/error.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- error.jsp 31 Mar 2000 20:59:46 -  1.1
  +++ error.jsp 22 Feb 2004 23:35:45 -  1.2
  @@ -1,4 +1,19 @@
   
  +
   
   Login Error
   
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/jsp/security/login/login.jsp
  
  Index: login.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/login/login.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- login.jsp 9 Mar 2001 22:54:06 -   1.3
  +++ login.jsp 22 Feb 2004 23:35:45 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Login page for examples
   
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/jsp/security/protected/index.jsp
  
  Index: index.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/security/protected/index.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.jsp 6 Apr 2000 17:49:22 -   1.3
  +++ index.jsp 22 Feb 2004 23:35:45 -  1.4
  @@ -1,4 +1,19 @@
   
  +
   
   Protected Area Page
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

2004-02-22 Thread billbarker
billbarker2004/02/22 15:32:15

  Modified:src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt
   src/examples/jsp/plugin/applet Clock2.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.html
  
  Index: plugin.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.html   10 Mar 2001 03:00:55 -  1.3
  +++ plugin.html   22 Feb 2004 23:32:15 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   Untitled Document
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp
  
  Index: plugin.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jsp20 Oct 1999 23:19:50 -  1.2
  +++ plugin.jsp22 Feb 2004 23:32:15 -  1.3
  @@ -1,7 +1,18 @@
   
  -
Plugin example 
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/plugin/plugin.txt
  
  Index: plugin.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.txt20 Oct 1999 23:19:51 -  1.2
  +++ plugin.txt22 Feb 2004 23:32:15 -  1.3
  @@ -1,7 +1,18 @@
   
  -
Plugin example 
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java
  
  Index: Clock2.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Clock2.java   20 Oct 1999 23:19:53 -  1.2
  +++ Clock2.java   22 Feb 2004 23:32:15 -  1.3
  @@ -1,6 +1,17 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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.
*/
   
   import java.util.*;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/num numguess.html numguess.jsp numguess.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:28:47

  Modified:src/examples/jsp/num numguess.html numguess.jsp numguess.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.5   +15 -3 jakarta-tomcat/src/examples/jsp/num/numguess.html
  
  Index: numguess.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/num/numguess.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- numguess.html 31 May 2000 20:29:10 -  1.4
  +++ numguess.html 22 Feb 2004 23:28:47 -  1.5
  @@ -1,8 +1,20 @@
   
  +
   
   
   

cvs commit: jakarta-tomcat/src/examples/jsp/jsptoserv hello.jsp jsptoservlet.jsp jts.html jts.txt stj.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:26:25

  Modified:src/examples/jsp/jsptoserv hello.jsp jsptoservlet.jsp
jts.html jts.txt stj.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/hello.jsp
  
  Index: hello.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/hello.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hello.jsp 20 Oct 1999 23:19:26 -  1.2
  +++ hello.jsp 22 Feb 2004 23:26:25 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jsptoservlet.jsp
  
  Index: jsptoservlet.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jsptoservlet.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jsptoservlet.jsp  20 Oct 1999 23:19:26 -  1.2
  +++ jsptoservlet.jsp  22 Feb 2004 23:26:25 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.5   +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jts.html
  
  Index: jts.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jts.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jts.html  11 Mar 2001 21:32:14 -  1.4
  +++ jts.html  22 Feb 2004 23:26:25 -  1.5
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/jts.txt
  
  Index: jts.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/jts.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jts.txt   20 Oct 1999 23:19:27 -  1.2
  +++ jts.txt   22 Feb 2004 23:26:25 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +15 -3 jakarta-tomcat/src/examples/jsp/jsptoserv/stj.txt
  
  Index: stj.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/jsptoserv/stj.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- stj.txt   20 Oct 1999 23:19:28 -  1.2
  +++ stj.txt   22 Feb 2004 23:26:25 -  1.3
  @@ -1,7 +1,19 @@
  -/**
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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.
*/
  +
   import javax.servlet.*;
   import javax.servlet.http.*;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/include foo.jsp inc.html include.jsp include.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:22:51

  Modified:src/examples/jsp/include foo.jsp inc.html include.jsp
include.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/include/foo.jsp
  
  Index: foo.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/foo.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- foo.jsp   20 Oct 1999 23:19:01 -  1.2
  +++ foo.jsp   22 Feb 2004 23:22:51 -  1.3
  @@ -1,6 +1,17 @@
  -
   
   
  
  
  
  1.4   +15 -3 jakarta-tomcat/src/examples/jsp/include/inc.html
  
  Index: inc.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/inc.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- inc.html  10 Mar 2001 03:00:55 -  1.3
  +++ inc.html  22 Feb 2004 23:22:51 -  1.4
  @@ -1,8 +1,20 @@
   
  -
  +
   
   Untitled Document
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/include/include.jsp
  
  Index: include.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/include.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- include.jsp   20 Oct 1999 23:19:02 -  1.2
  +++ include.jsp   22 Feb 2004 23:22:51 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/include/include.txt
  
  Index: include.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/include/include.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- include.txt   20 Oct 1999 23:19:02 -  1.2
  +++ include.txt   22 Feb 2004 23:22:51 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/forward forward.jsp forward.txt fwd.html one.jsp two.html

2004-02-22 Thread billbarker
billbarker2004/02/22 15:20:28

  Modified:src/examples/jsp/forward forward.jsp forward.txt fwd.html
one.jsp two.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/forward/forward.jsp
  
  Index: forward.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/forward.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forward.jsp   20 Oct 1999 23:18:35 -  1.2
  +++ forward.jsp   22 Feb 2004 23:20:28 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   <% 
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/forward/forward.txt
  
  Index: forward.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/forward.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forward.txt   20 Oct 1999 23:18:37 -  1.2
  +++ forward.txt   22 Feb 2004 23:20:28 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   <% 
  
  
  
  1.4   +15 -3 jakarta-tomcat/src/examples/jsp/forward/fwd.html
  
  Index: fwd.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/fwd.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fwd.html  10 Mar 2001 03:00:55 -  1.3
  +++ fwd.html  22 Feb 2004 23:20:28 -  1.4
  @@ -1,8 +1,20 @@
   
  -
  +
   
   Untitled Document
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/forward/one.jsp
  
  Index: one.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/one.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- one.jsp   20 Oct 1999 23:18:39 -  1.2
  +++ one.jsp   22 Feb 2004 23:20:28 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +15 -3 jakarta-tomcat/src/examples/jsp/forward/two.html
  
  Index: two.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/forward/two.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- two.html  14 Jan 2004 08:39:14 -  1.3
  +++ two.html  22 Feb 2004 23:20:28 -  1.4
  @@ -1,8 +1,20 @@
   
  -
  +
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/error er.html err.jsp err.txt error.html errorpge.jsp

2004-02-22 Thread billbarker
billbarker2004/02/22 15:17:55

  Modified:src/examples/jsp/error er.html err.jsp err.txt error.html
errorpge.jsp
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/error/er.html
  
  Index: er.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/er.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- er.html   10 Mar 2001 03:00:55 -  1.3
  +++ er.html   22 Feb 2004 23:17:55 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +15 -3 jakarta-tomcat/src/examples/jsp/error/err.jsp
  
  Index: err.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/err.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- err.jsp   20 Oct 1999 23:18:13 -  1.2
  +++ err.jsp   22 Feb 2004 23:17:55 -  1.3
  @@ -1,8 +1,20 @@
   
  -
  +
   
   
<%@ page errorPage="errorpge.jsp" %>
  
  
  
  1.3   +15 -3 jakarta-tomcat/src/examples/jsp/error/err.txt
  
  Index: err.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/err.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- err.txt   20 Oct 1999 23:18:13 -  1.2
  +++ err.txt   22 Feb 2004 23:17:55 -  1.3
  @@ -1,8 +1,20 @@
   
  -
  +
   
   
<%@ page errorPage="errorpge.jsp" %>
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/error/error.html
  
  Index: error.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/error.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- error.html20 Oct 1999 23:18:14 -  1.2
  +++ error.html22 Feb 2004 23:17:55 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/error/errorpge.jsp
  
  Index: errorpge.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/error/errorpge.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- errorpge.jsp  20 Oct 1999 23:18:14 -  1.2
  +++ errorpge.jsp  22 Feb 2004 23:17:55 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/dates date.html date.jsp date.txt

2004-02-22 Thread billbarker
billbarker2004/02/22 15:15:41

  Modified:src/examples/jsp/dates date.html date.jsp date.txt
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.html
  
  Index: date.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- date.html 10 Mar 2001 03:00:54 -  1.3
  +++ date.html 22 Feb 2004 23:15:41 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.5   +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.jsp
  
  Index: date.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- date.jsp  12 Jan 2000 07:11:14 -  1.4
  +++ date.jsp  22 Feb 2004 23:15:41 -  1.5
  @@ -1,7 +1,18 @@
   
  -
   
   <%@ page session="false"%>
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/dates/date.txt
  
  Index: date.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/dates/date.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- date.txt  12 Jan 2000 07:11:14 -  1.3
  +++ date.txt  22 Feb 2004 23:15:41 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/colors ColorGameBean.html clr.html colors.html colors.txt colrs.jsp

2004-02-22 Thread billbarker
billbarker2004/02/22 15:13:32

  Modified:src/examples/jsp/colors ColorGameBean.html clr.html
colors.html colors.txt colrs.jsp
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html
  
  Index: ColorGameBean.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/ColorGameBean.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ColorGameBean.html20 Oct 1999 23:17:14 -  1.2
  +++ ColorGameBean.html22 Feb 2004 23:13:32 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/colors/clr.html
  
  Index: clr.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/clr.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- clr.html  10 Mar 2001 03:00:54 -  1.3
  +++ clr.html  22 Feb 2004 23:13:32 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.html
  
  Index: colors.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- colors.html   20 Oct 1999 23:17:18 -  1.2
  +++ colors.html   22 Feb 2004 23:13:32 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/colors/colors.txt
  
  Index: colors.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colors.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- colors.txt20 Oct 1999 23:17:19 -  1.2
  +++ colors.txt22 Feb 2004 23:13:32 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -59jakarta-tomcat/src/examples/jsp/colors/colrs.jsp
  
  Index: colrs.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/colors/colrs.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- colrs.jsp 8 Feb 2000 18:25:32 -   1.2
  +++ colrs.jsp 22 Feb 2004 23:13:32 -  1.3
  @@ -1,63 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/checkbox CheckTest.html check.html checkresult.jsp checkresult.txt cresult.html

2004-02-22 Thread billbarker
billbarker2004/02/22 15:10:53

  Modified:src/examples/jsp/checkbox CheckTest.html check.html
checkresult.jsp checkresult.txt cresult.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/CheckTest.html
  
  Index: CheckTest.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/CheckTest.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CheckTest.html20 Oct 1999 20:39:51 -  1.2
  +++ CheckTest.html22 Feb 2004 23:10:52 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/check.html
  
  Index: check.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/check.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- check.html20 Oct 1999 20:39:52 -  1.2
  +++ check.html22 Feb 2004 23:10:52 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/checkresult.jsp
  
  Index: checkresult.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/checkresult.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- checkresult.jsp   16 Feb 2003 23:14:00 -  1.3
  +++ checkresult.jsp   22 Feb 2004 23:10:52 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/checkresult.txt
  
  Index: checkresult.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/checkresult.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- checkresult.txt   20 Oct 1999 20:39:52 -  1.2
  +++ checkresult.txt   22 Feb 2004 23:10:52 -  1.3
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  
  1.4   +14 -3 jakarta-tomcat/src/examples/jsp/checkbox/cresult.html
  
  Index: cresult.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/checkbox/cresult.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cresult.html  10 Mar 2001 03:00:54 -  1.3
  +++ cresult.html  22 Feb 2004 23:10:52 -  1.4
  @@ -1,7 +1,18 @@
   
  -
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/jsp/cal Entries.txt Entry.txt JspCalendar.txt TableBean.txt cal1.jsp cal1.txt cal2.txt calendar.html login.html

2004-02-22 Thread billbarker
billbarker2004/02/22 15:08:11

  Modified:src/examples/jsp/cal Entries.txt Entry.txt JspCalendar.txt
TableBean.txt cal1.jsp cal1.txt cal2.txt
calendar.html login.html
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +15 -3 jakarta-tomcat/src/examples/jsp/cal/Entries.txt
  
  Index: Entries.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/Entries.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Entries.txt   20 Oct 1999 20:39:17 -  1.2
  +++ Entries.txt   22 Feb 2004 23:08:11 -  1.3
  @@ -1,7 +1,19 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 cal;
  
  
  
  1.3   +15 -3 jakarta-tomcat/src/examples/jsp/cal/Entry.txt
  
  Index: Entry.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/Entry.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Entry.txt 20 Oct 1999 20:39:17 -  1.2
  +++ Entry.txt 22 Feb 2004 23:08:11 -  1.3
  @@ -1,7 +1,19 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 cal;
   
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/cal/JspCalendar.txt
  
  Index: JspCalendar.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/JspCalendar.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JspCalendar.txt   20 Oct 1999 20:39:17 -  1.2
  +++ JspCalendar.txt   22 Feb 2004 23:08:11 -  1.3
  @@ -1,6 +1,17 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 cal;
  
  
  
  1.3   +14 -3 jakarta-tomcat/src/examples/jsp/cal/TableBean.txt
  
  Index: TableBean.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/cal/TableBean.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TableBean.txt 20 Oct 1999 20:39:17 -  1.2
  +++ TableBean.txt 22 Feb 2004 23:08:11 -  1.3
  @@ -1,6 +1,17 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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, softwa

cvs commit: jakarta-tomcat/src/examples/WEB-INF/jsp/applet Clock2.java

2004-02-22 Thread billbarker
billbarker2004/02/22 15:02:14

  Modified:src/examples/WEB-INF web.xml
   src/examples/WEB-INF/jsp example-taglib.tld
   src/examples/WEB-INF/jsp/applet Clock2.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.15  +15 -0 jakarta-tomcat/src/examples/WEB-INF/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/web.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- web.xml   25 Aug 2001 16:12:46 -  1.14
  +++ web.xml   22 Feb 2004 23:02:14 -  1.15
  @@ -1,4 +1,19 @@
   
  +
   
   
  +
   http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";>
  
  
  
  1.3   +14 -57jakarta-tomcat/src/examples/WEB-INF/jsp/applet/Clock2.java
  
  Index: Clock2.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/jsp/applet/Clock2.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Clock2.java   8 Feb 2000 18:25:31 -   1.2
  +++ Clock2.java   22 Feb 2004 23:02:14 -  1.3
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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.
  + */
   import java.util.*;
   import java.awt.*;
   import java.applet.*;
  
  
  

-
To unsubscr

cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/util HTMLFilter.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:57:59

  Modified:src/examples/WEB-INF/classes CookieExample.java
CookieExample1.java Hello.java HelloW.java
HelloWorldExample.java LocalStrings.properties
LocalStrings_en.properties
LocalStrings_es.properties
LocalStrings_fr.properties
LocalStrings_ja.properties
RequestHeaderExample.java RequestInfoExample.java
RequestParamExample.java SessionExample.java
SnoopServlet.java servletToJsp.java
   src/examples/WEB-INF/classes/num NumberGuessBean.java
   src/examples/WEB-INF/classes/sessions DummyCart.java
   src/examples/WEB-INF/classes/util HTMLFilter.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +16 -1 jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample.java
  
  Index: CookieExample.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CookieExample.java29 Sep 2003 07:39:48 -  1.3
  +++ CookieExample.java22 Feb 2004 22:57:59 -  1.4
  @@ -1,6 +1,21 @@
   /* $Id$
*
*/
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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.
  + */
   
   import java.io.IOException;
   import java.io.PrintWriter;
  
  
  
  1.5   +16 -1 jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample1.java
  
  Index: CookieExample1.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/CookieExample1.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CookieExample1.java   29 Sep 2003 07:39:48 -  1.4
  +++ CookieExample1.java   22 Feb 2004 22:57:59 -  1.5
  @@ -1,6 +1,21 @@
   /* $Id$
*
*/
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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.
  + */
   
   import java.io.IOException;
   import java.io.PrintWriter;
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java
  
  Index: Hello.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/Hello.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Hello.java29 Sep 2003 07:39:48 -  1.3
  +++ Hello.java22 Feb 2004 22:57:59 -  1.4
  @@ -1,3 +1,18 @@
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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.
  + */
   import java.io.IOException;
   
   import javax.servlet.ServletConfig;
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/HelloW.java
  
  Index: HelloW.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/HelloW.java,v
  retrieving revision 1.3
  retrieving r

cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/examples ExampleTagBase.java FooTag.java FooTagExtraInfo.java LogTag.java ShowSource.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:47:50

  Modified:src/examples/WEB-INF/classes/examples ExampleTagBase.java
FooTag.java FooTagExtraInfo.java LogTag.java
ShowSource.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +15 -0 
jakarta-tomcat/src/examples/WEB-INF/classes/examples/ExampleTagBase.java
  
  Index: ExampleTagBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/ExampleTagBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExampleTagBase.java   29 Sep 2003 07:39:48 -  1.2
  +++ ExampleTagBase.java   22 Feb 2004 22:47:50 -  1.3
  @@ -1,3 +1,18 @@
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 examples;
   
   import javax.servlet.jsp.JspException;
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTag.java
  
  Index: FooTag.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FooTag.java   29 Sep 2003 07:39:48 -  1.3
  +++ FooTag.java   22 Feb 2004 22:47:50 -  1.4
  @@ -1,3 +1,18 @@
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 examples;
   
   import java.io.IOException;
  
  
  
  1.3   +15 -0 
jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
  
  Index: FooTagExtraInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/FooTagExtraInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FooTagExtraInfo.java  29 Sep 2003 07:39:48 -  1.2
  +++ FooTagExtraInfo.java  22 Feb 2004 22:47:50 -  1.3
  @@ -1,3 +1,18 @@
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 examples;
   
   import javax.servlet.jsp.tagext.TagData;
  
  
  
  1.4   +15 -0 jakarta-tomcat/src/examples/WEB-INF/classes/examples/LogTag.java
  
  Index: LogTag.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/examples/LogTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LogTag.java   29 Sep 2003 07:39:48 -  1.3
  +++ LogTag.java   22 Feb 2004 22:47:50 -  1.4
  @@ -1,3 +1,18 @@
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 t

cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/error Smart.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:45:37

  Modified:src/examples/WEB-INF/classes/error Smart.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/error/Smart.java
  
  Index: Smart.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/error/Smart.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Smart.java29 Sep 2003 07:39:49 -  1.3
  +++ Smart.java22 Feb 2004 22:45:37 -  1.4
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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 error;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/dates JspCalendar.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:44:19

  Modified:src/examples/WEB-INF/classes/dates JspCalendar.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -57
jakarta-tomcat/src/examples/WEB-INF/classes/dates/JspCalendar.java
  
  Index: JspCalendar.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/dates/JspCalendar.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspCalendar.java  29 Sep 2003 07:39:48 -  1.3
  +++ JspCalendar.java  22 Feb 2004 22:44:19 -  1.4
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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 dates;
   
   import java.util.Calendar;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/colors ColorGameBean.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:42:25

  Modified:src/examples/WEB-INF/classes/colors ColorGameBean.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -57
jakarta-tomcat/src/examples/WEB-INF/classes/colors/ColorGameBean.java
  
  Index: ColorGameBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/colors/ColorGameBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ColorGameBean.java29 Sep 2003 07:39:50 -  1.3
  +++ ColorGameBean.java22 Feb 2004 22:42:24 -  1.4
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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 colors;
   
   import javax.servlet.http.HttpServletRequest;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/checkbox CheckTest.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:41:11

  Modified:src/examples/WEB-INF/classes/checkbox CheckTest.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.3   +14 -57
jakarta-tomcat/src/examples/WEB-INF/classes/checkbox/CheckTest.java
  
  Index: CheckTest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/checkbox/CheckTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CheckTest.java8 Feb 2000 18:25:30 -   1.2
  +++ CheckTest.java22 Feb 2004 22:41:11 -  1.3
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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 checkbox;
   
   public class CheckTest {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 27100] - WebDAV locking implementation incompatible with some clients.

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27100

WebDAV locking implementation incompatible with some clients.

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 22:36 ---
Having had a good look through the spec I don't think that it does allow the 
lock token to be obsfucated. I am basing this opinion on the following quotes:
- 6.3 Anyone can find out anyone else's lock token by performing lock 
discovery.
- 17.3 Security through Obscurity

   WebDAV provides, through the PROPFIND method, a mechanism for listing
   the member resources of a collection.  This greatly diminishes the
   effectiveness of security or privacy techniques that rely only on the
   difficulty of discovering the names of network resources.  Users of
   WebDAV servers are encouraged to use access control techniques to
   prevent unwanted access to resources, rather than depending on the
   relative obscurity of their resource names.


I have just committed a patch to CVS that removes the lock obsfucation 
functionality. This will be included in the next release.
It has also been ported to TC4.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets WebdavServlet.java

2004-02-22 Thread markt
markt   2004/02/22 14:35:35

  Modified:catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
  Log:
  Fix bug 27100.
  - Remove lock obsfucation functionality as it breaks a number of webdav clients and 
does not appear to be covered by the webdav spec.
  - Reported by Ryan Dewell.
  - Ported from TC5.
  
  Revision  ChangesPath
  1.34  +9 -24 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- WebdavServlet.java13 Feb 2004 22:21:04 -  1.33
  +++ WebdavServlet.java22 Feb 2004 22:35:35 -  1.34
  @@ -1298,7 +1298,7 @@
   generatedXML.writeElement(null, "lockdiscovery",
 XMLWriter.OPENING);
   
  -lock.toXML(generatedXML, true);
  +lock.toXML(generatedXML);
   
   generatedXML.writeElement(null, "lockdiscovery",
 XMLWriter.CLOSING);
  @@ -2703,15 +2703,6 @@
* append an XML fragment to the given XML writer.
*/
   public void toXML(XMLWriter generatedXML) {
  -toXML(generatedXML, false);
  -}
  -
  -
  -/**
  - * Get an XML representation of this lock token. This method will
  - * append an XML fragment to the given XML writer.
  - */
  -public void toXML(XMLWriter generatedXML, boolean showToken) {
   
   generatedXML.writeElement(null, "activelock", XMLWriter.OPENING);
   
  @@ -2741,17 +2732,11 @@
   generatedXML.writeElement(null, "timeout", XMLWriter.CLOSING);
   
   generatedXML.writeElement(null, "locktoken", XMLWriter.OPENING);
  -if (showToken) {
  -Enumeration tokensList = tokens.elements();
  -while (tokensList.hasMoreElements()) {
  -generatedXML.writeElement(null, "href", XMLWriter.OPENING);
  -generatedXML.writeText("opaquelocktoken:"
  -   + tokensList.nextElement());
  -generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
  -}
  -} else {
  +Enumeration tokensList = tokens.elements();
  +while (tokensList.hasMoreElements()) {
   generatedXML.writeElement(null, "href", XMLWriter.OPENING);
  -generatedXML.writeText("opaquelocktoken:dummytoken");
  +generatedXML.writeText("opaquelocktoken:"
  +   + tokensList.nextElement());
   generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
   }
   generatedXML.writeElement(null, "locktoken", XMLWriter.CLOSING);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/examples/WEB-INF/classes/cal Entries.java Entry.java JspCalendar.java TableBean.java

2004-02-22 Thread billbarker
billbarker2004/02/22 14:34:42

  Modified:src/examples/WEB-INF/classes/cal Entries.java Entry.java
JspCalendar.java TableBean.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  ChangesPath
  1.4   +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entries.java
  
  Index: Entries.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entries.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Entries.java  29 Sep 2003 07:39:50 -  1.3
  +++ Entries.java  22 Feb 2004 22:34:42 -  1.4
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - * [Additional notices, if required by prior licensing conditions]
  - *
  - */ 
  + *  Licensed 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 cal;
   
   import java.util.Hashtable;
  
  
  
  1.3   +14 -57jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entry.java
  
  Index: Entry.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/examples/WEB-INF/classes/cal/Entry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Entry.java8 Feb 2000 18:25:29 -   1.2
  +++ Entry.java22 Feb 2004 22:34:42 -  1.3
  @@ -1,61 +1,18 @@
  -/*
  - * 
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
*
  - * The Apache Softwa

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets WebdavServlet.java

2004-02-22 Thread markt
markt   2004/02/22 14:34:16

  Modified:catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
  Log:
  Fix bug 27100.
  - Remove lock obsfucation functionality as it breaks a number of webdav clients and 
does not appear to be covered by the webdav spec.
  - Reported by Ryan Dewell.
  
  Revision  ChangesPath
  1.11  +9 -24 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- WebdavServlet.java13 Feb 2004 22:19:52 -  1.10
  +++ WebdavServlet.java22 Feb 2004 22:34:16 -  1.11
  @@ -1298,7 +1298,7 @@
   generatedXML.writeElement(null, "lockdiscovery",
 XMLWriter.OPENING);
   
  -lock.toXML(generatedXML, true);
  +lock.toXML(generatedXML);
   
   generatedXML.writeElement(null, "lockdiscovery",
 XMLWriter.CLOSING);
  @@ -2703,15 +2703,6 @@
* append an XML fragment to the given XML writer.
*/
   public void toXML(XMLWriter generatedXML) {
  -toXML(generatedXML, false);
  -}
  -
  -
  -/**
  - * Get an XML representation of this lock token. This method will
  - * append an XML fragment to the given XML writer.
  - */
  -public void toXML(XMLWriter generatedXML, boolean showToken) {
   
   generatedXML.writeElement(null, "activelock", XMLWriter.OPENING);
   
  @@ -2741,17 +2732,11 @@
   generatedXML.writeElement(null, "timeout", XMLWriter.CLOSING);
   
   generatedXML.writeElement(null, "locktoken", XMLWriter.OPENING);
  -if (showToken) {
  -Enumeration tokensList = tokens.elements();
  -while (tokensList.hasMoreElements()) {
  -generatedXML.writeElement(null, "href", XMLWriter.OPENING);
  -generatedXML.writeText("opaquelocktoken:"
  -   + tokensList.nextElement());
  -generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
  -}
  -} else {
  +Enumeration tokensList = tokens.elements();
  +while (tokensList.hasMoreElements()) {
   generatedXML.writeElement(null, "href", XMLWriter.OPENING);
  -generatedXML.writeText("opaquelocktoken:dummytoken");
  +generatedXML.writeText("opaquelocktoken:"
  +   + tokensList.nextElement());
   generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
   }
   generatedXML.writeElement(null, "locktoken", XMLWriter.CLOSING);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin index.html

2004-02-22 Thread billbarker
billbarker2004/02/22 14:01:42

  Modified:src/admin index.html
  Log:
  Update to Apache License v2.0.
  
  Revision  ChangesPath
  1.7   +13 -2 jakarta-tomcat/src/admin/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/index.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index.html18 Apr 2002 13:57:59 -  1.6
  +++ index.html22 Feb 2004 22:01:42 -  1.7
  @@ -1,7 +1,18 @@
   
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp watchdog-servlet.jsp

2004-02-22 Thread billbarker
billbarker2004/02/22 13:58:41

  Modified:src/admin/test sanity-form.jsp test.jsp watchdog-jsp.jsp
watchdog-servlet.jsp
  Log:
  Updating to Apache License v2.0.
  
  Revision  ChangesPath
  1.9   +15 -0 jakarta-tomcat/src/admin/test/sanity-form.jsp
  
  Index: sanity-form.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/sanity-form.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- sanity-form.jsp   20 Feb 2004 03:55:03 -  1.8
  +++ sanity-form.jsp   22 Feb 2004 21:58:41 -  1.9
  @@ -1,3 +1,18 @@
  +
   
   <%!
 void listOptions(String[] opts, String sel, JspWriter out)
  
  
  
  1.20  +18 -1 jakarta-tomcat/src/admin/test/test.jsp
  
  Index: test.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- test.jsp  31 Dec 2001 21:46:16 -  1.19
  +++ test.jsp  22 Feb 2004 21:58:41 -  1.20
  @@ -1,4 +1,21 @@
  -Tomcat Self-Test
  +
  +
  +Tomcat Self-Test
  +
   
   Tomcat Self-test 
   <%@ page import="java.util.*" %>
  
  
  
  1.5   +15 -0 jakarta-tomcat/src/admin/test/watchdog-jsp.jsp
  
  Index: watchdog-jsp.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-jsp.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- watchdog-jsp.jsp  17 Jul 2001 13:40:52 -  1.4
  +++ watchdog-jsp.jsp  22 Feb 2004 21:58:41 -  1.5
  @@ -1,3 +1,18 @@
  +
   Tomcat Self-test 
   
   <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; 
  
  
  
  1.3   +15 -0 jakarta-tomcat/src/admin/test/watchdog-servlet.jsp
  
  Index: watchdog-servlet.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/watchdog-servlet.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- watchdog-servlet.jsp  1 Feb 2001 04:43:48 -   1.2
  +++ watchdog-servlet.jsp  22 Feb 2004 21:58:41 -  1.3
  @@ -1,3 +1,18 @@
  +
   Tomcat Self-test 
   
   <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin/contextAdmin adminError.jsp contextAdd.jsp contextAdmin.html contextAdmin.jsp contextList.jsp contextRemove.jsp contextRestart.jsp contextsRestart.jsp ctxDetail.jsp moduleList.jsp restart.jsp sessionExpire.jsp sessionState.jsp threadList.jsp

2004-02-22 Thread billbarker
billbarker2004/02/22 13:53:28

  Modified:src/admin/contextAdmin adminError.jsp contextAdd.jsp
contextAdmin.html contextAdmin.jsp contextList.jsp
contextRemove.jsp contextRestart.jsp
contextsRestart.jsp ctxDetail.jsp moduleList.jsp
restart.jsp sessionExpire.jsp sessionState.jsp
threadList.jsp
  Log:
  Updating to Apache License v2.0.
  
  Revision  ChangesPath
  1.2   +13 -2 jakarta-tomcat/src/admin/contextAdmin/adminError.jsp
  
  Index: adminError.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/adminError.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- adminError.jsp22 Sep 2001 23:55:47 -  1.1
  +++ adminError.jsp22 Feb 2004 21:53:28 -  1.2
  @@ -2,8 +2,19 @@
   <%@ page isErrorPage="true" %>
   
   
   
   
  
  
  
  1.3   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdd.jsp
  
  Index: contextAdd.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdd.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- contextAdd.jsp4 Apr 2003 06:33:20 -   1.2
  +++ contextAdd.jsp22 Feb 2004 21:53:28 -  1.3
  @@ -3,8 +3,19 @@
  prefix="adm" %>
   
   
   
   
  
  
  
  1.5   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html
  
  Index: contextAdmin.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- contextAdmin.html 4 Apr 2003 06:33:20 -   1.4
  +++ contextAdmin.html 22 Feb 2004 21:53:28 -  1.5
  @@ -1,7 +1,18 @@
   
   
   
   
  
  
  
  1.3   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp
  
  Index: contextAdmin.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextAdmin.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- contextAdmin.jsp  27 Dec 2000 21:41:31 -  1.2
  +++ contextAdmin.jsp  22 Feb 2004 21:53:28 -  1.3
  @@ -1,7 +1,18 @@
   
   
   
   
  
  
  
  1.5   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextList.jsp
  
  Index: contextList.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextList.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- contextList.jsp   4 Apr 2003 06:33:20 -   1.4
  +++ contextList.jsp   22 Feb 2004 21:53:28 -  1.5
  @@ -4,8 +4,19 @@
  prefix="adm" %>
   
   
   
   
  
  
  
  1.3   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextRemove.jsp
  
  Index: contextRemove.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextRemove.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- contextRemove.jsp 4 Apr 2003 06:33:20 -   1.2
  +++ contextRemove.jsp 22 Feb 2004 21:53:28 -  1.3
  @@ -3,8 +3,19 @@
  prefix="adm" %>
   
   
   
   
  
  
  
  1.2   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextRestart.jsp
  
  Index: contextRestart.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextRestart.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- contextRestart.jsp4 Apr 2003 06:35:18 -   1.1
  +++ contextRestart.jsp22 Feb 2004 21:53:28 -  1.2
  @@ -5,8 +5,19 @@
  prefix="adm" %>
   
   
   
   
  
  
  
  1.2   +13 -2 jakarta-tomcat/src/admin/contextAdmin/contextsRestart.jsp
  
  Index: contextsRestart.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/contextsRestart.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- contextsRestart.jsp   4 Apr 2003 06:35:18 -   1.1
  +++ contextsRestart.jsp   22 Feb 2004 21:53:28 -  1.2
  @@ -3,8 +3,19 @@
   <%@ taglib uri="http://jakarta.apache.org/taglibs/tomcat_admin-1.0"; 
  prefix="adm" %>
   
   
   
  
  
  
  1.6   +15 -0 jakarta-tomcat/src/admin/contextAdmin/ctxDetail.jsp
  
  Index: ctxDetail.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/contextAdmin/ctxDetail.jsp,v
  retrieving r

DO NOT REPLY [Bug 27073] - Only response body is sent and no HTTP headers on many GET and PROPFIND requests.

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27073

Only response body is sent and no HTTP headers on many GET and PROPFIND requests.





--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 21:48 ---
A simple servlet is a servlet which only depends on the servlet API, and a
telnet displays very clearly the requests and responses. You can capture the
traffic using other means of course.
As for your remarks, Tomcat 4.1.29 uses the same HTTP connector as 5.0.14, and
4.1.30 uses the same as 5.0.18, hence my doubts about your report.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin/WEB-INF admin.tld ant.tld web.xml

2004-02-22 Thread billbarker
billbarker2004/02/22 13:42:26

  Modified:src/admin/WEB-INF admin.tld ant.tld web.xml
  Log:
  Licencing with Apache License v2.0.
  
  Revision  ChangesPath
  1.11  +16 -0 jakarta-tomcat/src/admin/WEB-INF/admin.tld
  
  Index: admin.tld
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- admin.tld 4 Apr 2003 06:33:20 -   1.10
  +++ admin.tld 22 Feb 2004 21:42:26 -  1.11
  @@ -1,4 +1,20 @@
   
  +
  +
   http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";>
  
  
  
  1.3   +16 -0 jakarta-tomcat/src/admin/WEB-INF/ant.tld
  
  Index: ant.tld
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/ant.tld,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.tld   1 Feb 2001 04:43:48 -   1.2
  +++ ant.tld   22 Feb 2004 21:42:26 -  1.3
  @@ -1,4 +1,20 @@
   
  +
  +
   http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd";>
  
  
  
  1.8   +16 -0 jakarta-tomcat/src/admin/WEB-INF/web.xml
  
  Index: web.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/web.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- web.xml   1 Feb 2001 04:43:48 -   1.7
  +++ web.xml   22 Feb 2004 21:42:26 -  1.8
  @@ -1,4 +1,20 @@
   
  +
  +
   http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin/WEB-INF/scripts run-test.bat run-test.sh watchdog-jsp.xml watchdog-servlet.xml

2004-02-22 Thread billbarker
billbarker2004/02/22 13:38:58

  Modified:src/admin/WEB-INF/scripts run-test.bat run-test.sh
watchdog-jsp.xml watchdog-servlet.xml
  Log:
  Licencing with Apache Licence v2.0.
  
  Revision  ChangesPath
  1.4   +15 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.bat
  
  Index: run-test.bat
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.bat,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- run-test.bat  22 Sep 2001 02:54:43 -  1.3
  +++ run-test.bat  22 Feb 2004 21:38:58 -  1.4
  @@ -1,3 +1,18 @@
  +rem
  +rem Copyright 2001-2004 The Apache Software Foundation
  +rem
  +rem Licensed under the Apache License, Version 2.0 (the "License");
  +rem you may not use this file except in compliance with the License.
  +rem You may obtain a copy of the License at
  +rem
  +rem http://www.apache.org/licenses/LICENSE-2.0
  +rem
  +rem Unless required by applicable law or agreed to in writing, software
  +rem distributed under the License is distributed on an "AS IS" BASIS,
  +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +rem See the License for the specific language governing permissions and
  +rem limitations under the License.
  +rem
   @echo off
   
   rem Batch file to run the tomcat sanity test suite
  
  
  
  1.5   +14 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.sh
  
  Index: run-test.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/run-test.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- run-test.sh   22 Sep 2001 02:54:43 -  1.4
  +++ run-test.sh   22 Feb 2004 21:38:58 -  1.5
  @@ -1,5 +1,19 @@
   #!/bin/sh
   #
  +# Copyright 2001-2004 The Apache Software Foundation
  +#
  +# Licensed 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.
  +#
   
   # Shell script to run the tomcat sanity test suite 

  
  
  
  1.4   +16 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml
  
  Index: watchdog-jsp.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-jsp.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- watchdog-jsp.xml  20 Feb 2004 03:55:03 -  1.3
  +++ watchdog-jsp.xml  22 Feb 2004 21:38:58 -  1.4
  @@ -1,3 +1,19 @@
  +
  +
   
   
 
  
  
  
  1.8   +16 -0 jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml
  
  Index: watchdog-servlet.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/scripts/watchdog-servlet.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- watchdog-servlet.xml  20 Feb 2004 03:55:03 -  1.7
  +++ watchdog-servlet.xml  22 Feb 2004 21:38:58 -  1.8
  @@ -1,3 +1,19 @@
  +
  +
   
   
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat/src/admin/WEB-INF/classes/tadm AntProperty.java AntServletLogger.java AntTEI.java AntTag.java AntTarget.java ContextAdmin.java GTestTEI.java GTestTag.java ModuleAdmin.java ModuleAdminTEI.java ThreadAdmin.java TomcatAdmin.java TomcatAdminTEI.java TomcatIterate.java TomcatIterateTEI.java

2004-02-22 Thread billbarker
billbarker2004/02/22 13:31:51

  Modified:src/admin/WEB-INF/classes/tadm AntProperty.java
AntServletLogger.java AntTEI.java AntTag.java
AntTarget.java ContextAdmin.java GTestTEI.java
GTestTag.java ModuleAdmin.java ModuleAdminTEI.java
ThreadAdmin.java TomcatAdmin.java
TomcatAdminTEI.java TomcatIterate.java
TomcatIterateTEI.java
  Log:
  Licencing under Apache Licence v2.0
  
  Revision  ChangesPath
  1.5   +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntProperty.java
  
  Index: AntProperty.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntProperty.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AntProperty.java  29 Sep 2003 07:39:49 -  1.4
  +++ AntProperty.java  22 Feb 2004 21:31:50 -  1.5
  @@ -1,3 +1,19 @@
  +/*
  + *  Copyright 2001-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 tadm;
   import javax.servlet.ServletContext;
   import javax.servlet.http.HttpServletRequest;
  
  
  
  1.4   +16 -0 
jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntServletLogger.java
  
  Index: AntServletLogger.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntServletLogger.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AntServletLogger.java 29 Sep 2003 07:39:49 -  1.3
  +++ AntServletLogger.java 22 Feb 2004 21:31:51 -  1.4
  @@ -1,3 +1,19 @@
  +/*
  + *  Copyright 2001-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 tadm;
   import java.io.IOException;
   import java.io.PrintStream;
  
  
  
  1.3   +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTEI.java
  
  Index: AntTEI.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTEI.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AntTEI.java   29 Sep 2003 07:39:49 -  1.2
  +++ AntTEI.java   22 Feb 2004 21:31:51 -  1.3
  @@ -1,3 +1,19 @@
  +/*
  + *  Copyright 2001-2004 The Apache Software Foundation
  + *
  + *  Licensed 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 tadm;
   import javax.servlet.jsp.tagext.TagData;
   import javax.servlet.jsp.tagext.TagExtraInfo;
  
  
  
  1.7   +16 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java
  
  Index: AntTag.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/AntTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AntTag.java   29 Sep 2003 07:39:49 -  1.6
  +++ AntTag.java   22 Feb 2004 21:31:51 -  1.7
  @@ -1,3 +1,19 @@
  +/*
  + *  Copyright 2001-2004 The Apache Software Foundation
  + *
  + *  Licensed under the Apache License, Version 2.0 (the "License");
  

cvs commit: jakarta-tomcat NOTICE LICENSE

2004-02-22 Thread billbarker
billbarker2004/02/22 13:14:29

  Modified:.LICENSE
  Added:   .NOTICE
  Log:
  Upgrading to the Apache v2.0 License.
  
  Revision  ChangesPath
  1.2   +203 -60   jakarta-tomcat/LICENSE
  
  Index: LICENSE
  ===
  RCS file: /home/cvs/jakarta-tomcat/LICENSE,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LICENSE   9 Oct 1999 00:19:57 -   1.1
  +++ LICENSE   22 Feb 2004 21:14:29 -  1.2
  @@ -1,63 +1,206 @@
  -/*
  - * $Header$
  - * $Revision$
  - * $Date$
  - *
  - * 
  - * 
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *notice, this list of conditions and the following disclaimer. 
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *notice, this list of conditions and the following disclaimer in
  - *the documentation and/or other materials provided with the
  - *distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *any, must include the following acknowlegement:  
  - *   "This product includes software developed by the 
  - *Apache Software Foundation (http://www.apache.org/)."
  - *Alternately, this acknowlegement may appear in the software itself,
  - *if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *Foundation" must not be used to endorse or promote products derived
  - *from this software without prior written permission. For written 
  - *permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *nor may "Apache" appear in their names without prior written
  - *permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * 
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * .
  - *
  - */ 
  +
  + Apache License
  +   Version 2.0, January 2004
  +http://www.apache.org/licenses/
  +
  +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  +
  +   1. Definitions.
  +
  +  "License" shall mean the terms and conditions for use, reproduction,
  +  and distribution as defined by Sections 1 through 9 of this document.
  +
  +  "Licensor" shall mean the copyright owner or entity authorized by
  +  the copyright owner that is granting the License.
  +
  +  "Legal Entity" shall mean the union of the acting entity and all
  +  other entities that control, are controlled by, or are under common
  +  control with that entity. For the purposes of this definition,
  +  "control" means (i) the power, direct or indirect, to cause the
  +  direction or management of such entity, whether by contract or
  +  otherwise, or (ii) ownership of fifty percent (50%) or more of the
  +  outstanding shares, or (iii) beneficial ownership of such entity.
  +
  +  "You" (or "Your") shall mean an individual or Legal Entity
  +  exercising permissions granted by this License.
  +
  +  "Source" form shall mean the preferred form for making modifications,
  +  including but not limited to software source code, documentation
  +  source, and configuration files.
  +
  +  "Object" form shall mean any form resulting from mechanical
  +  transformation or translation of a Source form, including but
  +

DO NOT REPLY [Bug 10469] - URLs of resources from application archives contain spaces

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10469

URLs of resources from application archives contain spaces

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 21:08 ---
This has been fixed in CVS and will be included in the next release.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java

2004-02-22 Thread Mark Thomas
I would be grateful if someone more knowledgeable than I in the area of class
loaders reviewed the URL encoding part of this patch.

Thanks,

Mark

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
> Sent: Sunday, February 22, 2004 9:04 PM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: 
> jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/load
> er WebappClassLoader.java
> 
> markt   2004/02/22 13:04:18
> 
>   Modified:catalina/src/share/org/apache/catalina/loader
> WebappClassLoader.java
>   Log:
>   - Fix bug 10469. Inconsistent encoding of URLs.
>   - Remove missing imports (thanks to Eclipse).
>   - Access static method, Thread.dumpStack(), in a static way 
> (Eclipse again).
>   
>   Revision  ChangesPath
>   1.50  +20 -13
> jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/load
er/WebappClassLoader.java
>   
>   Index: WebappClassLoader.java
>   ===
>   RCS file: 
> /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/cat
alina/loader/WebappClassLoader.java,v
>   retrieving revision 1.49
>   retrieving revision 1.50
>   diff -u -r1.49 -r1.50
>   --- WebappClassLoader.java  29 Apr 2003 22:03:08 -  1.49
>   +++ WebappClassLoader.java  22 Feb 2004 21:04:18 -  1.50
>   @@ -69,13 +69,9 @@
>import java.io.InputStream;
>import java.io.ByteArrayInputStream;
>import java.io.IOException;
>   -import java.net.JarURLConnection;
>import java.net.MalformedURLException;
>import java.net.URL;
>import java.net.URLClassLoader;
>   -import java.net.URLConnection;
>   -import java.net.URLStreamHandlerFactory;
>   -import java.net.URLStreamHandler;
>import java.security.AccessControlException;
>import java.security.AccessController;
>import java.security.CodeSource;
>   @@ -83,7 +79,6 @@
>import java.security.PermissionCollection;
>import java.security.Policy;
>import java.security.PrivilegedAction;
>   -import java.security.cert.Certificate;
>import java.util.ArrayList;
>import java.util.Enumeration;
>import java.util.HashMap;
>   @@ -91,7 +86,6 @@
>import java.util.Vector;
>import java.util.jar.JarFile;
>import java.util.jar.JarEntry;
>   -import java.util.jar.JarInputStream;
>import java.util.jar.Manifest;
>import java.util.jar.Attributes;
>import java.util.jar.Attributes.Name;
>   @@ -102,9 +96,9 @@
>import javax.naming.NameClassPair;
>
>import org.apache.catalina.Lifecycle;
>   -import org.apache.catalina.LifecycleEvent;
>import org.apache.catalina.LifecycleException;
>import org.apache.catalina.LifecycleListener;
>   +import org.apache.catalina.util.URLEncoder;
>
>import org.apache.naming.JndiPermission;
>import org.apache.naming.resources.ResourceAttributes;
>   @@ -1326,7 +1320,7 @@
>// Don't load classes if class loader is stopped
>if (!started) {
>log("Lifecycle error : CL stopped");
>   -Thread.currentThread().dumpStack();
>   +Thread.dumpStack();
>throw new ClassNotFoundException(name);
>}
>
>   @@ -2062,8 +2056,21 @@
>}
>
>//return new URL("file:" + realFile.getPath());
>   -return realFile.toURL();
>   +URLEncoder urlEncoder = new URLEncoder();
>   +urlEncoder.addSafeCharacter(',');
>   +urlEncoder.addSafeCharacter(':');
>   +urlEncoder.addSafeCharacter('-');
>   +urlEncoder.addSafeCharacter('_');
>   +urlEncoder.addSafeCharacter('.');
>   +urlEncoder.addSafeCharacter('*');
>   +urlEncoder.addSafeCharacter('/');
>   +urlEncoder.addSafeCharacter('!');
>   +urlEncoder.addSafeCharacter('~');
>   +urlEncoder.addSafeCharacter('\'');
>   +urlEncoder.addSafeCharacter('(');
>   +urlEncoder.addSafeCharacter(')');
>
>   +return new 
> URL(urlEncoder.encode(realFile.toURL().toString()));
>}
>
>
>   
>   
>   
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader WebappClassLoader.java

2004-02-22 Thread markt
markt   2004/02/22 13:04:18

  Modified:catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
  Log:
  - Fix bug 10469. Inconsistent encoding of URLs.
  - Remove missing imports (thanks to Eclipse).
  - Access static method, Thread.dumpStack(), in a static way (Eclipse again).
  
  Revision  ChangesPath
  1.50  +20 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- WebappClassLoader.java29 Apr 2003 22:03:08 -  1.49
  +++ WebappClassLoader.java22 Feb 2004 21:04:18 -  1.50
  @@ -69,13 +69,9 @@
   import java.io.InputStream;
   import java.io.ByteArrayInputStream;
   import java.io.IOException;
  -import java.net.JarURLConnection;
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLClassLoader;
  -import java.net.URLConnection;
  -import java.net.URLStreamHandlerFactory;
  -import java.net.URLStreamHandler;
   import java.security.AccessControlException;
   import java.security.AccessController;
   import java.security.CodeSource;
  @@ -83,7 +79,6 @@
   import java.security.PermissionCollection;
   import java.security.Policy;
   import java.security.PrivilegedAction;
  -import java.security.cert.Certificate;
   import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.HashMap;
  @@ -91,7 +86,6 @@
   import java.util.Vector;
   import java.util.jar.JarFile;
   import java.util.jar.JarEntry;
  -import java.util.jar.JarInputStream;
   import java.util.jar.Manifest;
   import java.util.jar.Attributes;
   import java.util.jar.Attributes.Name;
  @@ -102,9 +96,9 @@
   import javax.naming.NameClassPair;
   
   import org.apache.catalina.Lifecycle;
  -import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
  +import org.apache.catalina.util.URLEncoder;
   
   import org.apache.naming.JndiPermission;
   import org.apache.naming.resources.ResourceAttributes;
  @@ -1326,7 +1320,7 @@
   // Don't load classes if class loader is stopped
   if (!started) {
   log("Lifecycle error : CL stopped");
  -Thread.currentThread().dumpStack();
  +Thread.dumpStack();
   throw new ClassNotFoundException(name);
   }
   
  @@ -2062,8 +2056,21 @@
   }
   
   //return new URL("file:" + realFile.getPath());
  -return realFile.toURL();
  +URLEncoder urlEncoder = new URLEncoder();
  +urlEncoder.addSafeCharacter(',');
  +urlEncoder.addSafeCharacter(':');
  +urlEncoder.addSafeCharacter('-');
  +urlEncoder.addSafeCharacter('_');
  +urlEncoder.addSafeCharacter('.');
  +urlEncoder.addSafeCharacter('*');
  +urlEncoder.addSafeCharacter('/');
  +urlEncoder.addSafeCharacter('!');
  +urlEncoder.addSafeCharacter('~');
  +urlEncoder.addSafeCharacter('\'');
  +urlEncoder.addSafeCharacter('(');
  +urlEncoder.addSafeCharacter(')');
   
  +return new URL(urlEncoder.encode(realFile.toURL().toString()));
   }
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 27073] - Only response body is sent and no HTTP headers on many GET and PROPFIND requests.

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27073

Only response body is sent and no HTTP headers on many GET and PROPFIND requests.





--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 19:00 ---
O.K. for now you have no proof that it is a bug, so you decision to resolve it 
is in my opinion correct for now. 

But what I do not understand is your will to constrain this test to only simple 
servlets (what is simple servlet?) and telnet clients what can make my test not 
reproductible. 

Anyway as I told I will try to prepare this test (it will take me some time to 
do this), then I will reopen this bug again.

For now I'm switching to Tomcat 4.1.x on which I do not have this problem (web 
server that does not send always HTTP response headers is not production quality 
server).

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Bug report for Watchdog [2004/02/22]

2004-02-22 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug|
|  279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug|
|  469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat|
|  470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B|
| 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths|
|10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher|
|11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()|
|11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav|
|11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie|
|11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro|
|11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.|
|14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec|
|15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv|
|24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara|
+-+---+---+--+--+
| Total   14 bugs   |
+---+

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Bug report for Tomcat 4 [2004/02/22]

2004-02-22 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  218|Unc|Nor|2000-11-02|IIS & in-process tomcat BugRat Report#333 |
| 3614|Opn|Nor|2001-09-14|bug in manager webapp |
| 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped   |
| 4091|Opn|Nor|2001-10-11|custom host with unpackWARs="true" don't expand wa|
| 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st|
| 4352|Ass|Nor|2001-10-22|JDBCRealm does not work with CLIENT-CERT auth-meth|
| 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5704|Ass|Maj|2002-01-05|CgiServlet corrupting images? |
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5858|New|Enh|2002-01-15|Add tomcat dir to java.library.path   |
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6218|Opn|Nor|2002-02-04|Relative links broken for servlets|
| 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out   |
| 6399|New|Nor|2002-02-12|unknown protocol: https   |
| 6582|New|Min|2002-02-20|Sample code does not match behavior   |
| 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI|
| 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam|
| 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty|
| 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store   |
| 7360|New|Nor|2002-03-22|res-sharing-scope not supported   |
| 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output|
| 7571|New|Nor|2002-03-28|DataInputStream readLong() Problem|
| 7676|New|Enh|2002-04-02|Allow name property to use match experssions in  without className in server.xml produces N|
|10982|New|Min|2002-07-19|JNDI URL Handler class is missing in naming-resour|
|11008|New|Blk|2002-07-20|Win32/cygwin compile report + patch (gcc 3.1.1 com|
|11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN|
|11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques|
|11158|New|Maj|2002-07-25|WebappClassLoader does'nt find any class in an ext|
|11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header|
|11364|Opn|Maj|2002-08-01|jk2 appears to forward all virtual host requests t|
|11489|New|Enh|2002-08-06|Scanning JAR files in WEB-INF/lib without temp dir|
|11561|New|Maj|2002-08-08|JNDI problem with jdk1.4  |
|11645|New|Nor|2002-08-13|RequestStream and HttpRequestStream throw an IOExc|
|11662|New|Maj|2002-08-13|GlobalResources unavailable in DefaultContext |
|11679|New|Min|2002-08-14|"anonymous bind failed" exceptions occur if connec|
|11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w|
|12016|New|Nor|2002-08-24|[patch] OS/2 scripts  |
|12052|New|Maj|2002-08-26|mod_jk sets wrong port (uses socket port, not user|
|12056|New|Min|2002-08-26|Startup scripts test for invalid permissions. |
|12069|New|Maj|2002-08-27|Creation of more HttpSession objects for one previ|
|12089|New|Maj|2002-08-27|CATALINA_HOME ignored and reset by catalina.sh|
|12183|New|Maj|2002-08-29|Setting unpack WARs flag not recognized after usin|
|12516|New|Nor|2002-09-11|form based auth / documentation   |
|12608|New|Nor|2002-09-13|underline ('_') in name of sub-directory of webapp|
|12643|Opn|Min|2002-09-14|Undeploy any application fails (Undeploy an Existi|
|12658|New|Enh|2002-09-15|a proxy host and port at the  element level |
|12682|Unc|Nor|2002-09-16|Problem when recompiling servlets with JDBC connec|
|12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers|
|12917|New|Nor|2002-09-23|The request dumper valve Error|
|12946|Unc|Nor|2002-09-24|parameter serverRoot fro

Bug report for Tomcat 3 [2004/02/22]

2004-02-22 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle|
| 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/|
| 4980|New|Min|2001-11-20|Startup message indicates incorrect log file  |
| 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu|
| 5064|New|Cri|2001-11-25|Socket write error when include files is more than|
| 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 |
| 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r|
| 5160|Unc|Maj|2001-11-28|'IllegalStateException'   |
| 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv|
| 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL  |
| 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin|
| 6027|New|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6168|New|Blk|2002-02-01|IllegalStateException |
| 6451|New|Cri|2002-02-14|Stackoverflow |
| 6478|New|Enh|2002-02-14|Default Tomcat Encoding   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err|
| 6702|New|Cri|2002-02-27|win 2k services not working   |
| 6796|New|Cri|2002-03-01|Tomcat dies periodically  |
| 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil|
| 7008|Opn|Maj|2002-03-10|facade.HttpServletRequestFacade.getParameter(HttpS|
| 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact|
| 7227|New|Nor|2002-03-19| directive don't work |
| 7236|New|Blk|2002-03-19|Permission denied to do thread.stop   |
| 7626|New|Nor|2002-03-29|classloader not working properly  |
| 7652|New|Cri|2002-04-01|Tomcat stalls periodically|
| 7762|New|Enh|2002-04-05|stdout logfile handling   |
| 7785|New|Blk|2002-04-06|tomcat bug in context reloading   |
| 7789|New|Maj|2002-04-06|JSP Cookie Read/Write Fails With DNS Names|
| 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8154|New|Nor|2002-04-16|logrotate script in RPM rotates non-existing file |
| 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 8239|New|Cri|2002-04-18|Resource temporary unavailable|
| 8263|New|Cri|2002-04-18|url-pattern easy to circumvent|
| 8992|New|Blk|2002-05-10|IE6/XP: Limitation of POST Area within HTTP reques|
| 9086|New|Enh|2002-05-14|NPE org.apache.tomcat.core.ServerSession.setAttrib|
| 9250|New|Maj|2002-05-20|outOfMemoryError  |
| 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession|
| 9390|New|Nor|2002-05-24|jasper compilation error in tomcat|
| 9480|New|Nor|2002-05-29|Data connection pooling   |
| 9607|New|Maj|2002-06-04|precompile JSP|
| 9737|New|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|1|New|Cri|2002-06-19|IOException Broken Pipe when authenticating JDBCRe|
|10047|New|Cri|2002-06-20|IllegalStateException |
|10202|New|Maj|2002-06-25|Tomcat is not responding in time  |
|10357|Unc|Blk|2002-06-30|java.lang.IllegalArgumentException: Short Read|
|10406|New|Cri|2002-07-02|IllegalStateException |
|11087|New|Blk|2002-07-23|IllegalStateException |
|11105|New|Nor|2002-07-23|Get "Http10: Parse error, empty line" error while |
|11286|New|Maj|2002

DO NOT REPLY [Bug 26275] - Problems extracting WAR file when file names are latin 1 encoded

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26275

Problems extracting WAR file when file names are latin 1 encoded





--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 13:40 ---
Created an attachment (id=10482)
Ant build script for reproducing the problem

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 26275] - Problems extracting WAR file when file names are latin 1 encoded

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26275

Problems extracting WAR file when file names are latin 1 encoded





--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 13:39 ---
* Create a new, empty directory.
* Store the attached build script as build.xml into the directory.
* Create a subdirectory src.
* Copy the catalina sources from tomcat.home/src/catalina/src/share
  into the src directory. For example, we will have a file
  src/org/apache/catalina/startup/ExpandWar.java.
* Create a subdirectory lib.
* Copy the following files into the lib directory:
activation.jar"
ant.jar
commons-beanutils.jar
commons-collections.jar
commons-daemon.jar
commons-digester.jar
commons-fileupload-1.0.jar
commons-logging.jar
commons-modeler.jar
jta.jar
mail.jar
mx4j-jmx.jar
servlet.jar
tomcat-util.jar
tyrex-1.0.1.jar
* Add a main method to the ExpandWar class:

public static void main(String[] args) throws IOException {
Host host = new StandardHost();
host.setAppBase(new File(args[0]).getAbsolutePath());
host.setAutoDeploy(true);
host.setLogger(new SystemErrLogger());
((ContainerBase) host).setDebug(9);
String path = new File(args[1]).getAbsoluteFile().toURL().toString();
expand(host, new URL("jar:" + path + "!/"));
}

* Run "ant test"

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 27143] New: - provide a "low in memory" concept

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27143

provide a "low in memory" concept

   Summary: provide a "low in memory" concept
   Product: Tomcat 4
   Version: 4.1.27
  Platform: Other
   URL: http://jakarta.apache.org/tomcat/faq/memory.html
OS/Version: Other
Status: NEW
  Severity: Enhancement
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


reading the FAQ, tomcat users appear to be quite "blind flying" when it comes to
memory management. In my web application, I am trying to move really large files
through to mysql (45MB and alike - see http://bugs.mysql.com/?id=2916 for more).

Under such circumstances, it is not so surprising that out-of-memory situations
can occur. In order to make such an application more predictable, it would be
great to be able to manage this more proactively.

Suggestion:
===
it would be great if there was a call-back from tomcat warning me if remaining
space gets below a configurable level. This way, the application could iterate
through the current sessions and for example kick-out the ones with the longest
idle time until a traget free memory level is available again or it could throw
out objects hanging in such sessions that are larger than say 4 MB, etc...

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 6028] - tomcats shutdowns automtically

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6028

tomcats shutdowns automtically





--- Additional Comments From [EMAIL PROTECTED]  2004-02-22 12:56 ---
see also Bug 27141

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 27141] New: - spontaneous clean tomcat shutdown

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27141

spontaneous clean tomcat shutdown

   Summary: spontaneous clean tomcat shutdown
   Product: Tomcat 4
   Version: 4.1.27
  Platform: Other
   URL: http://marc.theaimsgroup.com/?l=tomcat-
user&m=102680354726732&w=2
OS/Version: Linux
Status: NEW
  Severity: Critical
  Priority: Other
 Component: Catalina
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED],[EMAIL PROTECTED]


My tomcat spontaneously shuts down. Sometimes after a week or even a month,
sometimes after a few hours:
<> in non of the logs, I see a reason why.

Sometimes, it happens minutes up to an hour after an out-of-memory event.

Is there any way to find out why a shutdown was initiated?


A long time ago, others appear to have had similar problems with no reported
resolution: Bug 6028 or
http://marc.theaimsgroup.com/?l=tomcat-user&m=102680354726732&w=2, ...

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



DO NOT REPLY [Bug 27139] New: - when i want to show midi ringtones in html page this error appeare (Not an ISO 8859_1 character)

2004-02-22 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27139

when i want to show midi ringtones in html page this error appeare (Not an ISO 8859_1 
character)

   Summary: when i want to show midi ringtones in html page this
error appeare (Not an ISO 8859_1 character)
   Product: Tomcat 3
   Version: 3.2.3 Final
  Platform: PC
   URL: http://217.66.226.28/midi/
OS/Version: Windows XP
Status: NEW
  Severity: Normal
  Priority: Other
 Component: Servlet
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


when i want to show midi ringtones in html page this error appeare (Not an ISO 
8859_1 character)

Internal Servlet Error:

java.io.IOException: Not an ISO 8859_1 character


so i tried t osend ring tones wich is in tomecat server
i recive them in wrong format

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]