tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r941955 - in /tomcat/trunk: ./ java/org/apache/tomcat/util/bcel/classfile/ res/META-INF/
Date Thu, 06 May 2010 22:19:18 GMT
Author: markt
Date: Thu May  6 22:19:17 2010
New Revision: 941955

URL: http://svn.apache.org/viewvc?rev=941955&view=rev
Log:
IBM has agreed to re-license the affected files.
A patch was provided by an IBM employee with a CLA on file under https://issues.apache.org/bugzilla/show_bug.cgi?id=49259
The files can now therefore be treated the same way as the other BCEL files.
The updated files have been applied to BCEL and I have copied them across to Tomcat 7 and
made the same set of changes as I made previously.
The various LICENSE and NOTICE changes made in r934220 have been reverted.
Thanks to Kevan Miller and his IBM colleagues for working to resolve this so quickly.

Removed:
    tomcat/trunk/res/META-INF/tomcat-coyote.jar.license
    tomcat/trunk/res/META-INF/tomcat-coyote.jar.notice
    tomcat/trunk/res/META-INF/tomcat-embed-core.jar.license
    tomcat/trunk/res/META-INF/tomcat-embed-core.jar.notice
Modified:
    tomcat/trunk/LICENSE
    tomcat/trunk/NOTICE
    tomcat/trunk/build.xml
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java

Modified: tomcat/trunk/LICENSE
URL: http://svn.apache.org/viewvc/tomcat/trunk/LICENSE?rev=941955&r1=941954&r2=941955&view=diff
==============================================================================
--- tomcat/trunk/LICENSE (original)
+++ tomcat/trunk/LICENSE Thu May  6 22:19:17 2010
@@ -210,9 +210,7 @@ and license terms. Your use of these sub
 conditions of the following licenses. 
 
 
-For the ecj-x.x.x.jar component and the EnclosingMethod and
-LocalVariableTypeTable classes in the org.apache.tomcat.util.bcel.classfile
-package:
+For the ecj-x.x.x.jar component:
 
 Eclipse Public License - v 1.0
 

Modified: tomcat/trunk/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=941955&r1=941954&r2=941955&view=diff
==============================================================================
--- tomcat/trunk/NOTICE (original)
+++ tomcat/trunk/NOTICE Thu May  6 22:19:17 2010
@@ -33,7 +33,4 @@ The original XML Schemas for Java EE Dep
  - web-common_3_0.xsd
  - web-fragment_3_0.xsd
  - jsp_2_2.xsd
-may be obtained from http://java.sun.com/xml/ns/javaee/
-
-Annotation scanning is provide by Apache Jakarta BCEL which includes open source
-software developed by IBM.
\ No newline at end of file
+may be obtained from http://java.sun.com/xml/ns/javaee/
\ No newline at end of file

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=941955&r1=941954&r2=941955&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu May  6 22:19:17 2010
@@ -535,9 +535,7 @@
     <!-- Protocol handlers - Coyote -->
     <jarIt jarfile="${tomcat-coyote.jar}"
       filesDir="${tomcat.classes}"
-      filesId="files.tomcat-coyote"
-      notice="${tomcat.manifests}/tomcat-coyote.jar.notice"
-      license="${tomcat.manifests}/tomcat-coyote.license" />
+      filesId="files.tomcat-coyote" />
 
     <!-- Jasper Implementation JAR File -->
     <jarIt jarfile="${jasper.jar}"
@@ -856,9 +854,7 @@
 
     <jarIt jarfile="${tomcat-embed-core.jar}"
            filesDir="${tomcat.classes}"
-           filesId="files.tomcat-embed-core"
-           notice="${tomcat.manifests}/tomcat-embed-core.jar.notice"
-           license="${tomcat.manifests}/tomcat-embed-core.jar.license"/>
+           filesId="files.tomcat-embed-core"/>
     <jarIt jarfile="${tomcat-embed-jasper.jar}"
            filesDir="${tomcat.classes}"
            filesId="files.tomcat-embed-jasper"/>

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java?rev=941955&r1=941954&r2=941955&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java Thu May 
6 22:19:17 2010
@@ -1,25 +1,22 @@
-/* *******************************************************************
- * Copyright (c) 2004 IBM Corporation
- * 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- * 
- * Contributors: 
- *    Andy Clement     initial implementation 
- * ******************************************************************/
-
-/*
- * Under the terms of the CPL v1.0, the ASF has elected to distribute this
- * file under the Eclipse Public License (EPL) 1.0 which has been designated
- * as the follow-on version of the CPL by the Agreement Steward.
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-
 package org.apache.tomcat.util.bcel.classfile;
 
-import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
@@ -46,7 +43,7 @@ public class EnclosingMethod extends Att
 	private int methodIndex;
 
 	// Ctors - and code to read an attribute in.
-	public EnclosingMethod(int nameIndex, int len, DataInput dis, ConstantPool cpool) throws
IOException {
+	public EnclosingMethod(int nameIndex, int len, DataInputStream dis, ConstantPool cpool)
throws IOException {
 		this(nameIndex, len, dis.readUnsignedShort(), dis.readUnsignedShort(), cpool);
 	}
 
@@ -62,16 +59,6 @@ public class EnclosingMethod extends Att
 		// return (EnclosingMethod)clone();
 	}
 	
-	  
-	
-	
-	
-	
-
-	
-	
-	
-
     public final void dump(DataOutputStream file) throws IOException {
 	    super.dump(file);
 	    file.writeShort(classIndex);

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=941955&r1=941954&r2=941955&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Thu
May  6 22:19:17 2010
@@ -1,26 +1,21 @@
-/* *******************************************************************
- * Copyright (c) 2004 IBM Corporation
- * 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- *  
- * Contributors: 
- *    Andy Clement     initial implementation 
- *    Heavily based on LocalVariableTable
- * ******************************************************************/
-
-/*
- * Under the terms of the CPL v1.0, the ASF has elected to distribute this
- * file under the Eclipse Public License (EPL) 1.0 which has been designated
- * as the follow-on version of the CPL by the Agreement Steward.
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-
 package org.apache.tomcat.util.bcel.classfile;
 
-
 import  org.apache.tomcat.util.bcel.Constants;
 import  java.io.*;
 
@@ -55,8 +50,6 @@ public class LocalVariableTypeTable exte
   private int             local_variable_type_table_length; // Table of local
   private LocalVariable[] local_variable_type_table;        // variables
 
-  
-
   public LocalVariableTypeTable(int name_index, int length,
 			    LocalVariable[] local_variable_table,
 			    ConstantPool    constant_pool)
@@ -83,10 +76,6 @@ public class LocalVariableTypeTable exte
       local_variable_type_table[i].dump(file);
   }
 
-      
-
-  
-
   public final void setLocalVariableTable(LocalVariable[] local_variable_table)
   {
     this.local_variable_type_table = local_variable_table;
@@ -98,7 +87,7 @@ public class LocalVariableTypeTable exte
    * @return String representation.
    */ 
   public final String toString() {
-    StringBuffer buf = new StringBuffer();
+    StringBuffer buf = new StringBuffer("");
 
     for(int i=0; i < local_variable_type_table_length; i++) {
       buf.append(local_variable_type_table[i].toString());
@@ -122,6 +111,4 @@ public class LocalVariableTypeTable exte
     c.constant_pool = constant_pool;
     return c;
   }
-
-  
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message