Author: costin
Date: Thu Mar 29 17:54:51 2012
New Revision: 1307019
URL: http://svn.apache.org/viewvc?rev=1307019&view=rev
Log:
Fix imports/licence.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java?rev=1307019&r1=1307018&r2=1307019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java Thu Mar 29
17:54:51 2012
@@ -1,5 +1,20 @@
/*
+ * 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.coyote.http11;
import org.apache.coyote.Adapter;
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java?rev=1307019&r1=1307018&r2=1307019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java Thu Mar 29
17:54:51 2012
@@ -1,15 +1,25 @@
/*
+ * 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.spdy;
import java.io.IOException;
-import java.net.Socket;
-import java.nio.channels.ByteChannel;
import java.util.Arrays;
import java.util.List;
-import javax.net.ssl.SSLEngine;
-
import org.apache.tomcat.jni.SSLExt;
import org.apache.tomcat.jni.Status;
import org.apache.tomcat.jni.socket.AprSocket;
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java?rev=1307019&r1=1307018&r2=1307019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java Thu Mar 29
17:54:51 2012
@@ -1,4 +1,18 @@
/*
+ * 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.spdy;
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java?rev=1307019&r1=1307018&r2=1307019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java Thu Mar 29
17:54:51 2012
@@ -23,13 +23,9 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.tomcat.util.net.NioSelectorPool;
-
/**
* Main class implementing SPDY protocol. Works with both blocking and
* non-blocking sockets. To simplify integration in various endpoints there is
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
