Author: rooneg
Date: Fri Nov 17 21:41:19 2006
New Revision: 476449
URL: http://svn.apache.org/viewvc?view=rev&rev=476449
Log:
Merge r476448 from trunk to the 0.2.0-incubating branch.
Modified:
incubator/abdera/java/branches/0.2.0-incubating/core/src/main/java/org/apache/abdera/util/io/ReadWriteByteChannel.java
incubator/abdera/java/branches/0.2.0-incubating/server/src/main/java/org/apache/abdera/protocol/server/util/AbstractSingletonProviderManager.java
Modified: incubator/abdera/java/branches/0.2.0-incubating/core/src/main/java/org/apache/abdera/util/io/ReadWriteByteChannel.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.2.0-incubating/core/src/main/java/org/apache/abdera/util/io/ReadWriteByteChannel.java?view=diff&rev=476449&r1=476448&r2=476449
==============================================================================
--- incubator/abdera/java/branches/0.2.0-incubating/core/src/main/java/org/apache/abdera/util/io/ReadWriteByteChannel.java
(original)
+++ incubator/abdera/java/branches/0.2.0-incubating/core/src/main/java/org/apache/abdera/util/io/ReadWriteByteChannel.java
Fri Nov 17 21:41:19 2006
@@ -1,4 +1,22 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. 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. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
package org.apache.abdera.util.io;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Modified: incubator/abdera/java/branches/0.2.0-incubating/server/src/main/java/org/apache/abdera/protocol/server/util/AbstractSingletonProviderManager.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/0.2.0-incubating/server/src/main/java/org/apache/abdera/protocol/server/util/AbstractSingletonProviderManager.java?view=diff&rev=476449&r1=476448&r2=476449
==============================================================================
--- incubator/abdera/java/branches/0.2.0-incubating/server/src/main/java/org/apache/abdera/protocol/server/util/AbstractSingletonProviderManager.java
(original)
+++ incubator/abdera/java/branches/0.2.0-incubating/server/src/main/java/org/apache/abdera/protocol/server/util/AbstractSingletonProviderManager.java
Fri Nov 17 21:41:19 2006
@@ -1,3 +1,20 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. 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. For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
package org.apache.abdera.protocol.server.util;
import org.apache.abdera.protocol.server.provider.Provider;