You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2013/06/18 21:53:34 UTC
[2/3] git commit: make mvn apache-rat:check pass
make mvn apache-rat:check pass
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a3a8bccc
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a3a8bccc
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a3a8bccc
Branch: refs/heads/trunk
Commit: a3a8bccc2514cdc8c8d96cfb79e2c9edf4eef753
Parents: ee3a4c3
Author: jvermillard <jv...@apache.org>
Authored: Tue Jun 18 21:52:17 2013 +0200
Committer: jvermillard <jv...@apache.org>
Committed: Tue Jun 18 21:52:17 2013 +0200
----------------------------------------------------------------------
ImprovedJavaConventions.xml | 21 ++++++++++++++++++
.../mina/util/ByteBufferInputStreamTest.java | 20 +++++++++++++++++
.../mina/util/ByteBufferOutputStreamTest.java | 20 +++++++++++++++++
.../mina/service/executor/HandlerCaller.java | 20 +++++++++++++++++
.../mina/service/executor/package-info.java | 20 +++++++++++++++++
core/src/test/resources/log4j2-test.xml | 22 +++++++++++++++++++
.../java/org/apache/mina/http/DateUtilTest.java | 20 +++++++++++++++++
pom.xml | 23 +++++++-------------
protobuf/prepare.sh | 19 ++++++++++++++++
.../generated/protoc/AddressBookProtos.java | 20 +++++++++++++++++
.../org/apache/mina/generated/protoc/Calc.java | 20 +++++++++++++++++
protobuf/src/test/protobuf/addressbook.proto | 19 ++++++++++++++++
protobuf/src/test/protobuf/calc.proto | 20 +++++++++++++++++
thrift/prepare.sh | 18 +++++++++++++++
.../mina/generated/thrift/UserProfile.java | 20 +++++++++++++++++
.../mina/generated/thrift/UserStorage.java | 21 ++++++++++++++++++
16 files changed, 308 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/ImprovedJavaConventions.xml
----------------------------------------------------------------------
diff --git a/ImprovedJavaConventions.xml b/ImprovedJavaConventions.xml
index 7e3d8b8..675beef 100644
--- a/ImprovedJavaConventions.xml
+++ b/ImprovedJavaConventions.xml
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<!--
+ 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.
+-->
+
<profiles version="10">
<profile name="Improved Java Conventions" version="10">
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/codec/src/test/java/org/apache/mina/util/ByteBufferInputStreamTest.java
----------------------------------------------------------------------
diff --git a/codec/src/test/java/org/apache/mina/util/ByteBufferInputStreamTest.java b/codec/src/test/java/org/apache/mina/util/ByteBufferInputStreamTest.java
index 5152c52..2f505be 100644
--- a/codec/src/test/java/org/apache/mina/util/ByteBufferInputStreamTest.java
+++ b/codec/src/test/java/org/apache/mina/util/ByteBufferInputStreamTest.java
@@ -1,3 +1,23 @@
+/*
+ * 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.mina.util;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/codec/src/test/java/org/apache/mina/util/ByteBufferOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/codec/src/test/java/org/apache/mina/util/ByteBufferOutputStreamTest.java b/codec/src/test/java/org/apache/mina/util/ByteBufferOutputStreamTest.java
index cf3b019..7957125 100644
--- a/codec/src/test/java/org/apache/mina/util/ByteBufferOutputStreamTest.java
+++ b/codec/src/test/java/org/apache/mina/util/ByteBufferOutputStreamTest.java
@@ -1,3 +1,23 @@
+/*
+ * 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.mina.util;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/core/src/main/java/org/apache/mina/service/executor/HandlerCaller.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/service/executor/HandlerCaller.java b/core/src/main/java/org/apache/mina/service/executor/HandlerCaller.java
index d2f5d4c..47fdb42 100644
--- a/core/src/main/java/org/apache/mina/service/executor/HandlerCaller.java
+++ b/core/src/main/java/org/apache/mina/service/executor/HandlerCaller.java
@@ -1,3 +1,23 @@
+/*
+ * 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.mina.service.executor;
import org.apache.mina.api.IoHandler;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/core/src/main/java/org/apache/mina/service/executor/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/service/executor/package-info.java b/core/src/main/java/org/apache/mina/service/executor/package-info.java
index 42128ce..920cd45 100644
--- a/core/src/main/java/org/apache/mina/service/executor/package-info.java
+++ b/core/src/main/java/org/apache/mina/service/executor/package-info.java
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ *
+ */
+
/**
* <p>
* Classes in charge of decoupling IoHandler event of the low level read/write/accept I/O threads ( {@link org.apache.mina.transport.nio.SelectorLoop} ).
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/core/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/log4j2-test.xml b/core/src/test/resources/log4j2-test.xml
index f7c3d40..bbc59ca 100644
--- a/core/src/test/resources/log4j2-test.xml
+++ b/core/src/test/resources/log4j2-test.xml
@@ -1,4 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--
+ 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.
+-->
+
+
<configuration>
<appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/http/src/test/java/org/apache/mina/http/DateUtilTest.java
----------------------------------------------------------------------
diff --git a/http/src/test/java/org/apache/mina/http/DateUtilTest.java b/http/src/test/java/org/apache/mina/http/DateUtilTest.java
index cb7ba22..d82248a 100644
--- a/http/src/test/java/org/apache/mina/http/DateUtilTest.java
+++ b/http/src/test/java/org/apache/mina/http/DateUtilTest.java
@@ -1,3 +1,23 @@
+/*
+ * 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.mina.http;
import java.text.DateFormat;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 61cd1d9..5bd8159 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,6 +432,14 @@
<!-- project excludes -->
<exclude>**/resources/svn_ignore.txt</exclude>
<exclude>**/resources/Reveal in Finder.launch</exclude>
+ <exclude>.git/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/LICENSE.*</exclude>
+ <exclude>**/NOTICE-bin.txt</exclude>
</excludes>
</configuration>
</plugin>
@@ -626,21 +634,6 @@
<docTitle>Apache MINA ${project.version} Cross Reference</docTitle>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>**/target/**/*</exclude>
- <exclude>**/.*</exclude>
- <exclude>**/NOTICE.txt</exclude>
- <exclude>**/LICENSE*.txt</exclude>
- </excludes>
- <excludeSubProjects>false</excludeSubProjects>
- </configuration>
- </plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/protobuf/prepare.sh
----------------------------------------------------------------------
diff --git a/protobuf/prepare.sh b/protobuf/prepare.sh
index 84fd1fc..688709c 100644
--- a/protobuf/prepare.sh
+++ b/protobuf/prepare.sh
@@ -1,4 +1,23 @@
#!/bin/bash
+#
+# 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.
+#
+
if hash protoc 2>/dev/null; then
VERSION=`protoc --version`
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/protobuf/src/test/java/org/apache/mina/generated/protoc/AddressBookProtos.java
----------------------------------------------------------------------
diff --git a/protobuf/src/test/java/org/apache/mina/generated/protoc/AddressBookProtos.java b/protobuf/src/test/java/org/apache/mina/generated/protoc/AddressBookProtos.java
index 07ca8b5..0461b1a 100644
--- a/protobuf/src/test/java/org/apache/mina/generated/protoc/AddressBookProtos.java
+++ b/protobuf/src/test/java/org/apache/mina/generated/protoc/AddressBookProtos.java
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ *
+ */
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: src/test/protobuf/addressbook.proto
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/protobuf/src/test/java/org/apache/mina/generated/protoc/Calc.java
----------------------------------------------------------------------
diff --git a/protobuf/src/test/java/org/apache/mina/generated/protoc/Calc.java b/protobuf/src/test/java/org/apache/mina/generated/protoc/Calc.java
index 222b928..29644a7 100644
--- a/protobuf/src/test/java/org/apache/mina/generated/protoc/Calc.java
+++ b/protobuf/src/test/java/org/apache/mina/generated/protoc/Calc.java
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ *
+ */
+
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: src/test/protobuf/calc.proto
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/protobuf/src/test/protobuf/addressbook.proto
----------------------------------------------------------------------
diff --git a/protobuf/src/test/protobuf/addressbook.proto b/protobuf/src/test/protobuf/addressbook.proto
index 6bf919d..999074a 100644
--- a/protobuf/src/test/protobuf/addressbook.proto
+++ b/protobuf/src/test/protobuf/addressbook.proto
@@ -1,3 +1,22 @@
+//
+// 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.
+//
+
// See README.txt for information and build instructions.
package tutorial;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/protobuf/src/test/protobuf/calc.proto
----------------------------------------------------------------------
diff --git a/protobuf/src/test/protobuf/calc.proto b/protobuf/src/test/protobuf/calc.proto
index 44faf25..62b71c5 100644
--- a/protobuf/src/test/protobuf/calc.proto
+++ b/protobuf/src/test/protobuf/calc.proto
@@ -1,3 +1,23 @@
+//
+// 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.
+//
+
+
// See README.txt for information and build instructions.
package tutorial;
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/thrift/prepare.sh
----------------------------------------------------------------------
diff --git a/thrift/prepare.sh b/thrift/prepare.sh
index 8820aef..0cb09fe 100644
--- a/thrift/prepare.sh
+++ b/thrift/prepare.sh
@@ -1,4 +1,22 @@
#!/bin/bash
+#
+# 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.
+#
if hash thrift 2>/dev/null; then
VERSION=`thrift --version`
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/thrift/src/test/java/org/apache/mina/generated/thrift/UserProfile.java
----------------------------------------------------------------------
diff --git a/thrift/src/test/java/org/apache/mina/generated/thrift/UserProfile.java b/thrift/src/test/java/org/apache/mina/generated/thrift/UserProfile.java
index 6aebd59..7417fff 100644
--- a/thrift/src/test/java/org/apache/mina/generated/thrift/UserProfile.java
+++ b/thrift/src/test/java/org/apache/mina/generated/thrift/UserProfile.java
@@ -1,3 +1,23 @@
+/*
+ * 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.
+ *
+ */
+
/**
* Autogenerated by Thrift Compiler (0.9.0)
*
http://git-wip-us.apache.org/repos/asf/mina/blob/a3a8bccc/thrift/src/test/java/org/apache/mina/generated/thrift/UserStorage.java
----------------------------------------------------------------------
diff --git a/thrift/src/test/java/org/apache/mina/generated/thrift/UserStorage.java b/thrift/src/test/java/org/apache/mina/generated/thrift/UserStorage.java
index 51e1271..a0dde4c 100644
--- a/thrift/src/test/java/org/apache/mina/generated/thrift/UserStorage.java
+++ b/thrift/src/test/java/org/apache/mina/generated/thrift/UserStorage.java
@@ -1,3 +1,24 @@
+/*
+ * 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.
+ *
+ */
+
+
/**
* Autogenerated by Thrift Compiler (0.9.0)
*