You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2012/07/09 07:14:49 UTC
svn commit: r1358919 - in /flume/branches/branch-1.2.0: ./
flume-ng-sdk/src/main/java/org/apache/flume/api/
flume-ng-sdk/src/test/java/org/apache/flume/api/
Author: mpercy
Date: Mon Jul 9 05:14:48 2012
New Revision: 1358919
URL: http://svn.apache.org/viewvc?rev=1358919&view=rev
Log:
FLUME-1353. Ensure license headers are consistent.
(Mike Percy)
Modified:
flume/branches/branch-1.2.0/ (props changed)
flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClient.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientFactory.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestFailoverRpcClient.java
flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestRpcClientFactory.java
Propchange: flume/branches/branch-1.2.0/
------------------------------------------------------------------------------
Merged /flume/trunk:r1358906
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/AbstractRpcClient.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/FailoverRpcClient.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 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
+ * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/HostInfo.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 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
+ * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClient.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClient.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClient.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClient.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientFactory.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientFactory.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientFactory.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/main/java/org/apache/flume/api/RpcClientFactory.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/RpcTestUtils.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestFailoverRpcClient.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestFailoverRpcClient.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestFailoverRpcClient.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestFailoverRpcClient.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 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
+ * 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.
+ * 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.flume.api;
Modified: flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestRpcClientFactory.java
URL: http://svn.apache.org/viewvc/flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestRpcClientFactory.java?rev=1358919&r1=1358918&r2=1358919&view=diff
==============================================================================
--- flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestRpcClientFactory.java (original)
+++ flume/branches/branch-1.2.0/flume-ng-sdk/src/test/java/org/apache/flume/api/TestRpcClientFactory.java Mon Jul 9 05:14:48 2012
@@ -1,17 +1,20 @@
/*
- * Copyright 2012 Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.flume.api;