You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2019/04/02 03:09:32 UTC
[incubator-dubbo] branch 2.6.x updated: Add ASF header #3721 (#3783)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 4785a27 Add ASF header #3721 (#3783)
4785a27 is described below
commit 4785a27fb4f1e662b793aea08abbb5f974ec8d00
Author: wanghbxxxx <wa...@gmail.com>
AuthorDate: Tue Apr 2 11:09:20 2019 +0800
Add ASF header #3721 (#3783)
---
bom/pom.xml | 20 +++++++++++++++++++-
dependencies-bom/pom.xml | 17 ++++++++++++++++-
.../src/main/resources/META-INF/assembly/bin/dump.sh | 16 ++++++++++++++++
.../main/resources/META-INF/assembly/bin/restart.sh | 16 ++++++++++++++++
.../main/resources/META-INF/assembly/bin/server.sh | 16 ++++++++++++++++
.../main/resources/META-INF/assembly/bin/start.bat | 15 +++++++++++++++
.../main/resources/META-INF/assembly/bin/start.sh | 16 ++++++++++++++++
.../src/main/resources/META-INF/assembly/bin/stop.sh | 16 ++++++++++++++++
.../dubbo-test-benchmark/src/main/resources/run.bat | 17 +++++++++++++++++
.../dubbo-test-benchmark/src/main/resources/run.sh | 17 +++++++++++++++++
.../src/test/resources/server/dubborpcserver.sh | 17 +++++++++++++++++
.../src/test/resources/server/dubboserver.sh | 17 +++++++++++++++++
.../src/test/resources/server/servercommon.sh | 17 +++++++++++++++++
13 files changed, 215 insertions(+), 2 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 6af9e49..3fee9d1 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1,5 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+ 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.
+ -->
+
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 37e95cf..2bb4178 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -1,4 +1,19 @@
-<?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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
index d63098b..8c3a916 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh
@@ -1,4 +1,20 @@
#!/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.
+
cd `dirname $0`
BIN_DIR=`pwd`
cd ..
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/restart.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/restart.sh
index 647ec19..afa7bc1 100644
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/restart.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/restart.sh
@@ -1,4 +1,20 @@
#!/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.
+
cd `dirname $0`
./stop.sh
./start.sh
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/server.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/server.sh
index 90947a5..bd9f712 100644
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/server.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/server.sh
@@ -1,4 +1,20 @@
#!/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.
+
cd `dirname $0`
if [ "$1" = "start" ]; then
./start.sh
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat
index f91d023..a08fb38 100644
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat
@@ -1,5 +1,20 @@
@echo off & setlocal enabledelayedexpansion
+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.
+
set LIB_JARS=""
cd ..\lib
for %%i in (*) do set LIB_JARS=!LIB_JARS!;..\lib\%%i
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
index 3b491f0..ddbc8dd 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
@@ -1,4 +1,20 @@
#!/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.
+
cd `dirname $0`
BIN_DIR=`pwd`
cd ..
diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
index 8fca15e..04ac4a8 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh
@@ -1,4 +1,20 @@
#!/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.
+
cd `dirname $0`
BIN_DIR=`pwd`
cd ..
diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat
index dad1879..e54164e 100644
--- a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat
+++ b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat
@@ -1 +1,18 @@
+@echo off
+
+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.
+
java -Xms512m -Xmx512m -Xmn128m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Dwrite.statistics=true -Djava.ext.dirs="./lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkClient" > "benchmark.log"
\ No newline at end of file
diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh
index 05f52bb..b0d257e 100644
--- a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh
+++ b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh
@@ -1 +1,18 @@
+#!/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.
+
java -Xms512m -Xmx512m -Xmn128m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Dwrite.statistics=true -Djava.ext.dirs="./lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkClient" > "benchmark.log" 2>&1 &
\ No newline at end of file
diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh
index 1cc54b7..9fe721f 100644
--- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh
+++ b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh
@@ -1 +1,18 @@
+#!/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.
+
sh servercommon.sh "../lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkServer" "rpcserver.log.dubbo"
diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh
index 33e6522..ef6d2ab 100644
--- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh
+++ b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh
@@ -1 +1,18 @@
+#!/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.
+
sh servercommon.sh "../lib" "com.alibaba.dubbo.rpc.benchmark.BenchmarkServer" "server.log.dubbo"
diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh
index 68e4ef8..ec3cb8a 100644
--- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh
+++ b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh
@@ -1 +1,18 @@
+#!/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.
+
java -Xms2g -Xmx2g -Xmn500m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Djava.ext.dirs=$1 $2 [listenport] [maxthreads] [responsesize] [transporter] [serialization]> $3 2>&1 &