rocketmq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] incubator-rocketmq git commit: Added the rat plugin and fixed the issues that rat found
Date Thu, 22 Dec 2016 01:56:53 GMT
Added the rat plugin and fixed the issues that rat found


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/61bd4ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/61bd4ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/61bd4ec1

Branch: refs/heads/master
Commit: 61bd4ec17c2420247d6e009fa90e3e2b09876731
Parents: 3d28613
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Thu Dec 22 09:54:34 2016 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Thu Dec 22 09:56:15 2016 +0800

----------------------------------------------------------------------
 benchmark/consumer.sh                             | 15 +++++++++++++++
 benchmark/producer.sh                             | 14 ++++++++++++++
 benchmark/runclass.sh                             | 14 ++++++++++++++
 benchmark/tproducer.sh                            | 14 ++++++++++++++
 checkstyle/checkstyle.xml                         |  6 +++---
 pom.xml                                           | 12 ++++++++++++
 .../src/main/resources/transaction.sql            | 18 ++++++++++++++++++
 rocketmq-client/deploy.bat                        | 17 ++++++++++++++++-
 rocketmq-client/install.bat                       | 15 +++++++++++++++
 .../remoting/protocol/protocol.sevialize.txt      | 17 ++++++++++++++++-
 .../rocketmq/remoting/protocol/protocol.txt       | 15 +++++++++++++++
 11 files changed, 152 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/benchmark/consumer.sh
----------------------------------------------------------------------
diff --git a/benchmark/consumer.sh b/benchmark/consumer.sh
index e516439..0ba054e 100644
--- a/benchmark/consumer.sh
+++ b/benchmark/consumer.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
 
+# 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.
+
 #
 # $Id: consumer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
 #

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/benchmark/producer.sh
----------------------------------------------------------------------
diff --git a/benchmark/producer.sh b/benchmark/producer.sh
index 1462257..16552fd 100644
--- a/benchmark/producer.sh
+++ b/benchmark/producer.sh
@@ -1,4 +1,18 @@
 #!/bin/sh
+# 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.
 
 #
 # $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/benchmark/runclass.sh
----------------------------------------------------------------------
diff --git a/benchmark/runclass.sh b/benchmark/runclass.sh
index afe6b6e..14e712f 100644
--- a/benchmark/runclass.sh
+++ b/benchmark/runclass.sh
@@ -1,4 +1,18 @@
 #!/bin/sh
+# 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.
 
 #
 # $Id: runserver.sh 1831 2013-05-16 01:39:51Z shijia.wxr $

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/benchmark/tproducer.sh
----------------------------------------------------------------------
diff --git a/benchmark/tproducer.sh b/benchmark/tproducer.sh
index f19d2c6..4aca55c 100644
--- a/benchmark/tproducer.sh
+++ b/benchmark/tproducer.sh
@@ -1,4 +1,18 @@
 #!/bin/sh
+# 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.
 
 #
 # $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/checkstyle/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index ac562fa..c2d9782 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -28,7 +28,7 @@
 
     <!-- header -->
     <module name="RegexpHeader">
-        <property name="header" value="/\*\*\nLicensed to the Apache.*"/>
+        <property name="header" value="/\*\*\nLicensed to the Apache Software Foundation*"/>
     </module>
 
     <module name="RegexpSingleline">
@@ -95,7 +95,7 @@
         <!--Validates identifiers for non-static fields-->
         <module name="MemberName"/>
         <!--Validates identifiers for class type parameters-->
-        <module name="ClassTypeParameterName">
+        <module name="ClassTypeParameter:Name">
             <property name="format" value="^[A-Z0-9]*$"/>
         </module>
         <!--Validates identifiers for method type parameters-->
@@ -125,4 +125,4 @@
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
     </module>
-</module>
\ No newline at end of file
+</module>

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 381cdb1..8c20a23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,6 +333,18 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <version>0.12</version>
+                <configuration>
+                    <excludes>
+                        <exclude>.travis.yml</exclude>
+                        <exclude>CONTRIBUTING.md</exclude>
+                        <exclude>bin/README.md</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.0.2</version>
                 <configuration>

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/rocketmq-broker/src/main/resources/transaction.sql
----------------------------------------------------------------------
diff --git a/rocketmq-broker/src/main/resources/transaction.sql b/rocketmq-broker/src/main/resources/transaction.sql
index aaefe43..881714c 100644
--- a/rocketmq-broker/src/main/resources/transaction.sql
+++ b/rocketmq-broker/src/main/resources/transaction.sql
@@ -1,3 +1,21 @@
+--
+-- 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.
+--
 CREATE TABLE t_transaction(
 	offset				NUMERIC(20) PRIMARY KEY,
 	producerGroup		VARCHAR(64)

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/rocketmq-client/deploy.bat
----------------------------------------------------------------------
diff --git a/rocketmq-client/deploy.bat b/rocketmq-client/deploy.bat
index f778070..ffc2144 100644
--- a/rocketmq-client/deploy.bat
+++ b/rocketmq-client/deploy.bat
@@ -1 +1,16 @@
-mvn -Dmaven.test.skip=true deploy -Pclient-shade
\ No newline at end of file
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
+REM
+REM     http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+mvn -Dmaven.test.skip=true deploy -Pclient-shade

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/rocketmq-client/install.bat
----------------------------------------------------------------------
diff --git a/rocketmq-client/install.bat b/rocketmq-client/install.bat
index 87bf456..31efffd 100644
--- a/rocketmq-client/install.bat
+++ b/rocketmq-client/install.bat
@@ -1,2 +1,17 @@
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
+REM
+REM     http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
 mvn -Dmaven.test.skip=true clean package install -Pclient-shade -U
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
----------------------------------------------------------------------
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
index 976cdf2..3dc5ba5 100644
--- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
+++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
@@ -1,6 +1,21 @@
+# 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.
+
 //
 // Remoting protocol V0.1 draft
 //
 // protocol <length> <header length> <header data> <body data>
 //            1        2               3             4
-//
\ No newline at end of file
+//

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/61bd4ec1/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
----------------------------------------------------------------------
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
index 7444cbb..3dc5ba5 100644
--- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
+++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
@@ -1,3 +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.
+
 //
 // Remoting protocol V0.1 draft
 //


Mime
View raw message