From 37a642cc12730873f505dcc4130aa73be4df3999 Mon Sep 17 00:00:00 2001 From: duheng <39583243+duhengforever@users.noreply.github.com> Date: Wed, 29 Aug 2018 10:24:19 +0800 Subject: [PATCH] [ISSUE430]Remove scripts releate to filtersrv (#431) --- .../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(-) delete mode 100644 distribution/bin/mqfiltersrv delete mode 100644 distribution/bin/mqfiltersrv.cmd delete mode 100644 distribution/bin/mqfiltersrv.xml delete mode 100644 distribution/conf/logback_filtersrv.xml 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 96a2329c..6c2712d6 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 2fd0cbea..00000000 --- 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 0503026a..00000000 --- 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 dc36a8d8..00000000 --- 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 71b9a939..00000000 --- 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 - - - - - - - - - - - - - - - - - - - - - - - -- GitLab