From commits-return-2366-apmail-rocketmq-commits-archive=rocketmq.apache.org@rocketmq.apache.org Wed Aug 29 02:24:25 2018 Return-Path: X-Original-To: apmail-rocketmq-commits-archive@minotaur.apache.org Delivered-To: apmail-rocketmq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99D841DB07 for ; Wed, 29 Aug 2018 02:24:25 +0000 (UTC) Received: (qmail 8296 invoked by uid 500); 29 Aug 2018 02:24:25 -0000 Delivered-To: apmail-rocketmq-commits-archive@rocketmq.apache.org Received: (qmail 8258 invoked by uid 500); 29 Aug 2018 02:24:25 -0000 Mailing-List: contact commits-help@rocketmq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@rocketmq.apache.org Delivered-To: mailing list commits@rocketmq.apache.org Received: (qmail 8249 invoked by uid 99); 29 Aug 2018 02:24:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2018 02:24:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BC6A880801; Wed, 29 Aug 2018 02:24:24 +0000 (UTC) Date: Wed, 29 Aug 2018 02:24:24 +0000 To: "commits@rocketmq.apache.org" Subject: [rocketmq] branch develop updated: [ISSUE430]Remove scripts releate to filtersrv (#431) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153550946469.16388.16476775683012671322@gitbox.apache.org> From: vongosling@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: rocketmq X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: 901e06afa259ed16be53b1d812c38c48f0f347dc X-Git-Newrev: 37a642cc12730873f505dcc4130aa73be4df3999 X-Git-Rev: 37a642cc12730873f505dcc4130aa73be4df3999 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. vongosling pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/rocketmq.git The following commit(s) were added to refs/heads/develop by this push: new 37a642c [ISSUE430]Remove scripts releate to filtersrv (#431) 37a642c is described below commit 37a642cc12730873f505dcc4130aa73be4df3999 Author: duheng <39583243+duhengforever@users.noreply.github.com> AuthorDate: Wed Aug 29 10:24:19 2018 +0800 [ISSUE430]Remove scripts releate to filtersrv (#431) --- .../java/org/apache/rocketmq/common/MQVersion.java | 2 +- distribution/bin/mqfiltersrv | 45 ----------- distribution/bin/mqfiltersrv.cmd | 23 ------ distribution/bin/mqfiltersrv.xml | 45 ----------- distribution/conf/logback_filtersrv.xml | 87 ---------------------- 5 files changed, 1 insertion(+), 201 deletions(-) diff --git a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java index 96a2329..6c2712d 100644 --- a/common/src/main/java/org/apache/rocketmq/common/MQVersion.java +++ b/common/src/main/java/org/apache/rocketmq/common/MQVersion.java @@ -18,7 +18,7 @@ package org.apache.rocketmq.common; public class MQVersion { - public static final int CURRENT_VERSION = Version.V4_3_0.ordinal(); + public static final int CURRENT_VERSION = Version.V4_3_1.ordinal(); public static String getVersionDesc(int value) { int length = Version.values().length; diff --git a/distribution/bin/mqfiltersrv b/distribution/bin/mqfiltersrv deleted file mode 100644 index 2fd0cbe..0000000 --- a/distribution/bin/mqfiltersrv +++ /dev/null @@ -1,45 +0,0 @@ -#!/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. - -if [ -z "$ROCKETMQ_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - ROCKETMQ_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - ROCKETMQ_HOME=`cd "$ROCKETMQ_HOME" && pwd` - - cd "$saveddir" -fi - -export ROCKETMQ_HOME - -sh ${ROCKETMQ_HOME}/bin/runserver.sh org.apache.rocketmq.filtersrv.FiltersrvStartup $@ diff --git a/distribution/bin/mqfiltersrv.cmd b/distribution/bin/mqfiltersrv.cmd deleted file mode 100644 index 0503026..0000000 --- a/distribution/bin/mqfiltersrv.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@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. - -if not exist "%ROCKETMQ_HOME%\bin\runbroker.cmd" echo Please set the ROCKETMQ_HOME variable in your environment! & EXIT /B 1 - -call "%ROCKETMQ_HOME%\bin\runserver.cmd" org.apache.rocketmq.filtersrv.FiltersrvStartup %* - -IF %ERRORLEVEL% EQU 0 ( - ECHO "Filtersrv starts OK" -) \ No newline at end of file diff --git a/distribution/bin/mqfiltersrv.xml b/distribution/bin/mqfiltersrv.xml deleted file mode 100644 index dc36a8d..0000000 --- a/distribution/bin/mqfiltersrv.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - false - - ${JAVA_HOME} - - server - - org.apache.rocketmq.filtersrv.FiltersrvStartup - - - ${cpd}/../lib - ${cpd}/.. - - - - - - - <-Xms512m> - - <-Xmx1g> - -<-XX:NewSize>256M -<-XX:MaxNewSize>512M -<-XX:PermSize>128M -<-XX:MaxPermSize>128M - - diff --git a/distribution/conf/logback_filtersrv.xml b/distribution/conf/logback_filtersrv.xml deleted file mode 100644 index 71b9a93..0000000 --- a/distribution/conf/logback_filtersrv.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - ${user.home}/logs/rocketmqlogs/filtersrv_default.log - true - - ${user.home}/logs/rocketmqlogs/otherdays/filtersrv_default.%i.log.gz - 1 - 5 - - - 100MB - - - %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n - UTF-8 - - - - - ${user.home}/logs/rocketmqlogs/filtersrv.log - true - - ${user.home}/logs/rocketmqlogs/otherdays/filtersrv.%i.log.gz - 1 - 5 - - - 100MB - - - %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n - UTF-8 - - - - - 0 - - - - true - - %d{yyy-MM-dd HH\:mm\:ss,SSS} %p %t - %m%n - UTF-8 - - - - - - - - - - - - - - - - - - - - - - -