diff --git a/.artifacts b/.artifacts index 5a8fb62cfc0..d0e292d3a83 100644 --- a/.artifacts +++ b/.artifacts @@ -34,9 +34,6 @@ dubbo-configcenter-file dubbo-configcenter-apollo dubbo-configcenter-nacos dubbo-configcenter-zookeeper -dubbo-container -dubbo-container-api -dubbo-container-spring dubbo-core-spi dubbo-dependencies dubbo-dependencies-all diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/Container.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/Container.java deleted file mode 100644 index 51c50fd36b1..00000000000 --- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/Container.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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 com.alibaba.dubbo.container; - -@Deprecated -public interface Container extends org.apache.dubbo.container.Container {} diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml deleted file mode 100644 index 709aa14dd45..00000000000 --- a/dubbo-container/dubbo-container-api/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-container - ${revision} - ../pom.xml - - dubbo-container-api - jar - ${project.artifactId} - The container module of dubbo project - - false - - - - org.apache.dubbo - dubbo-common - ${project.parent.version} - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - true - - org.apache.dubbo.container.Main - - - - - - - diff --git a/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java deleted file mode 100644 index 00e3daee7d2..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.dubbo.container; - -import org.apache.dubbo.common.extension.SPI; - -/** - * Container. (SPI, Singleton, ThreadSafe) - */ -@SPI("spring") -public interface Container { - - /** - * start method to load the container. - */ - void start(); - - /** - * stop method to unload the container. - */ - void stop(); -} diff --git a/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java deleted file mode 100644 index d80e7147d12..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * 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.dubbo.container; - -import org.apache.dubbo.common.extension.ExtensionLoader; -import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; -import org.apache.dubbo.common.logger.LoggerFactory; -import org.apache.dubbo.common.utils.ArrayUtils; -import org.apache.dubbo.common.utils.SystemPropertyConfigUtils; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; - -import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SPLIT_PATTERN; -import static org.apache.dubbo.common.constants.CommonConstants.DubboProperty.DUBBO_CONTAINER_KEY; -import static org.apache.dubbo.common.constants.CommonConstants.DubboProperty.DUBBO_SHUTDOWN_HOOK_KEY; -import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_THREAD_INTERRUPTED_EXCEPTION; -import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_START_DUBBO_ERROR; -import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_STOP_DUBBO_ERROR; - -/** - * Main. (API, Static, ThreadSafe) - *

- * This class is entry point loading containers. - */ -public class Main { - - private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(Main.class); - - private static final ExtensionLoader LOADER = ExtensionLoader.getExtensionLoader(Container.class); - - private static final ReentrantLock LOCK = new ReentrantLock(); - - private static final Condition STOP = LOCK.newCondition(); - - public static void main(String[] args) { - try { - if (ArrayUtils.isEmpty(args)) { - String config = SystemPropertyConfigUtils.getSystemProperty( - DUBBO_CONTAINER_KEY, LOADER.getDefaultExtensionName()); - args = COMMA_SPLIT_PATTERN.split(config); - } - - final List containers = new ArrayList(); - for (int i = 0; i < args.length; i++) { - containers.add(LOADER.getExtension(args[i])); - } - logger.info("Use container type(" + Arrays.toString(args) + ") to run dubbo serivce."); - - if ("true".equals(SystemPropertyConfigUtils.getSystemProperty(DUBBO_SHUTDOWN_HOOK_KEY))) { - Runtime.getRuntime().addShutdownHook(new Thread("dubbo-container-shutdown-hook") { - @Override - public void run() { - for (Container container : containers) { - try { - container.stop(); - logger.info("Dubbo " + container.getClass().getSimpleName() + " stopped!"); - } catch (Throwable t) { - logger.error(CONFIG_STOP_DUBBO_ERROR, "", "", t.getMessage(), t); - } - try { - LOCK.lock(); - STOP.signal(); - } finally { - LOCK.unlock(); - } - } - } - }); - } - - for (Container container : containers) { - container.start(); - logger.info("Dubbo " + container.getClass().getSimpleName() + " started!"); - } - System.out.println(new SimpleDateFormat("[yyyy-MM-dd HH:mm:ss]").format(new Date()) - + " Dubbo service server started!"); - } catch (RuntimeException e) { - logger.error(CONFIG_START_DUBBO_ERROR, "", "", e.getMessage(), e); - System.exit(1); - } - try { - LOCK.lock(); - STOP.await(); - } catch (InterruptedException e) { - logger.warn( - COMMON_THREAD_INTERRUPTED_EXCEPTION, - "", - "", - "Dubbo service server stopped, interrupted by other thread!", - e); - } finally { - LOCK.unlock(); - } - } -} 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 deleted file mode 100755 index 1f578e7d9ae..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/dump.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/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 .. -DEPLOY_DIR=`pwd` -CONF_DIR=$DEPLOY_DIR/conf - -SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` - -if [ -z "$SERVER_NAME" ]; then - SERVER_NAME=`hostname` -fi - -PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'` -if [ -z "$PIDS" ]; then - echo "ERROR: The $SERVER_NAME does not started!" - exit 1 -fi - -LOGS_DIR="" -if [ -n "$LOGS_FILE" ]; then - LOGS_DIR=`dirname $LOGS_FILE` -else - LOGS_DIR=$DEPLOY_DIR/logs -fi -if [ ! -d $LOGS_DIR ]; then - mkdir $LOGS_DIR -fi -DUMP_DIR=$LOGS_DIR/dump -if [ ! -d $DUMP_DIR ]; then - mkdir $DUMP_DIR -fi -DUMP_DATE=`date +%Y%m%d%H%M%S` -DATE_DIR=$DUMP_DIR/$DUMP_DATE -if [ ! -d $DATE_DIR ]; then - mkdir $DATE_DIR -fi - -echo -e "Dumping the $SERVER_NAME ...\c" -for PID in $PIDS ; do - jstack $PID > $DATE_DIR/jstack-$PID.dump 2>&1 - echo -e ".\c" - jinfo $PID > $DATE_DIR/jinfo-$PID.dump 2>&1 - echo -e ".\c" - jstat -gcutil $PID > $DATE_DIR/jstat-gcutil-$PID.dump 2>&1 - echo -e ".\c" - jstat -gccapacity $PID > $DATE_DIR/jstat-gccapacity-$PID.dump 2>&1 - echo -e ".\c" - jmap $PID > $DATE_DIR/jmap-$PID.dump 2>&1 - echo -e ".\c" - jmap -heap $PID > $DATE_DIR/jmap-heap-$PID.dump 2>&1 - echo -e ".\c" - jmap -histo $PID > $DATE_DIR/jmap-histo-$PID.dump 2>&1 - echo -e ".\c" - if [ -r /usr/sbin/lsof ]; then - /usr/sbin/lsof -p $PID > $DATE_DIR/lsof-$PID.dump - echo -e ".\c" - fi -done - -if [ -r /bin/netstat ]; then -/bin/netstat -an > $DATE_DIR/netstat.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/iostat ]; then -/usr/bin/iostat > $DATE_DIR/iostat.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/mpstat ]; then -/usr/bin/mpstat > $DATE_DIR/mpstat.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/vmstat ]; then -/usr/bin/vmstat > $DATE_DIR/vmstat.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/free ]; then -/usr/bin/free -t > $DATE_DIR/free.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/sar ]; then -/usr/bin/sar > $DATE_DIR/sar.dump 2>&1 -echo -e ".\c" -fi -if [ -r /usr/bin/uptime ]; then -/usr/bin/uptime > $DATE_DIR/uptime.dump 2>&1 -echo -e ".\c" -fi - -echo "OK!" -echo "DUMP: $DATE_DIR" 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 deleted file mode 100644 index b05f61eb3b1..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/restart.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 deleted file mode 100644 index d93c07e4138..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/server.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/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 -else - if [ "$1" = "stop" ]; then - ./stop.sh - else - if [ "$1" = "debug" ]; then - ./start.sh debug - else - if [ "$1" = "restart" ]; then - ./restart.sh - else - if [ "$1" = "dump" ]; then - ./dump.sh - else - echo "ERROR: Please input argument: start or stop or debug or restart or dump" - exit 1 - fi - fi - fi - fi -fi 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 deleted file mode 100644 index f14d2e8b1e0..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat +++ /dev/null @@ -1,44 +0,0 @@ -@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="" -set VM_ARGS_PERM_SIZE="MaxPermSize" -set VM_ARGS_METASPACE_SIZE="MaxMetaspaceSize" -set JAVA_8_VERSION="180" -cd ..\lib -for %%i in (*) do set LIB_JARS=!LIB_JARS!;..\lib\%%i -cd ..\bin - -@REM set jvm args by different java version -for /f tokens^=2-4^ delims^=.-_+^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k%%l" -set VM_ARGS=%VM_ARGS_PERM_SIZE% -if "%JAVA_VERSION%" GEQ %JAVA_8_VERSION% set VM_ARGS=%VM_ARGS_METASPACE_SIZE% -if ""%1"" == ""debug"" goto debug -if ""%1"" == ""jmx"" goto jmx - -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main -goto end - -:debug -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main -goto end - -:jmx -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main - -:end -pause \ No newline at end of file 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 deleted file mode 100755 index b87ac79e8fd..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh +++ /dev/null @@ -1,132 +0,0 @@ -#!/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 .. -DEPLOY_DIR=`pwd` -CONF_DIR=$DEPLOY_DIR/conf - -SERVER_NAME=`sed '/^dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -SERVER_PROTOCOL=`sed '/^dubbo.protocol.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -SERVER_HOST=`sed '/^dubbo.protocol.host/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -SERVER_PORT=`sed '/^dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -LOGS_FILE=`sed '/^dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` -VM_ARGS_PERM_SIZE='PermSize' -VM_ARGS_METASPACE_SIZE='MetaspaceSize' -JAVA_8_VERSION="180" - -if [ -z "$SERVER_HOST" ]; then - SERVER_HOST='127.0.0.1' -fi - -if [ -z "$SERVER_NAME" ]; then - SERVER_NAME=`hostname` -fi - -PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'` -if [ -n "$PIDS" ]; then - echo "ERROR: The $SERVER_NAME already started!" - echo "PID: $PIDS" - exit 1 -fi - -if [ -n "$SERVER_PORT" ]; then - SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l` - if [ $SERVER_PORT_COUNT -gt 0 ]; then - echo "ERROR: The $SERVER_NAME port $SERVER_PORT already used!" - exit 1 - fi -fi - -LOGS_DIR="" -if [ -n "$LOGS_FILE" ]; then - LOGS_DIR=`dirname $LOGS_FILE` -else - LOGS_DIR=$DEPLOY_DIR/logs -fi -if [ ! -d $LOGS_DIR ]; then - mkdir $LOGS_DIR -fi -STDOUT_FILE=$LOGS_DIR/stdout.log - -LIB_DIR=$DEPLOY_DIR/lib -LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"` - -JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " -JAVA_DEBUG_OPTS="" -if [ "$1" = "debug" ]; then - JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n " -fi -JAVA_JMX_OPTS="" -if [ "$1" = "jmx" ]; then - JAVA_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false " -fi -JAVA_MEM_OPTS="" -# set jvm args by different java version -JAVA_VERSION=`java -fullversion 2>&1 | awk -F[\"\.] '{print $2$3$4}' |awk -F"_" '{print $1}'` -echo $JAVA_VERSION -VM_ARGS=${VM_ARGS_PERM_SIZE} -# if you use dubbo in java 9 -TEMP_VERSION=$(echo ${JAVA_VERSION} | grep "+") -if [[ "$TEMP_VERSION" != "" ]]; then - JAVA_VERSION=$(echo ${JAVA_VERSION} | awk -F"+" '{print $1}') -fi -# compare java version -if [ "${JAVA_VERSION}" -ge ${JAVA_8_VERSION} ]; then - VM_ARGS=${VM_ARGS_METASPACE_SIZE} -fi - -# MaxInlineLevel=15 is the default since JDK 14 and can be removed once older JDKs are no longer supported -BITS=`java -version 2>&1 | grep -i 64-bit` -JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 " - -if [ -n "$BITS" ]; then - JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*} - JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }') - if [ $JAVA_MAJOR_VERSION -ge 9 ] || ([ $JAVA_MAJOR_VERSION -ge 1 ] && [ $JAVA_MINOR_VERSION -ge 8 ]); then - JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss512k -XX:LargePageSizeInBytes=128m -XX:+DisableExplicitGC -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8 -XX:G1ReservePercent=15 " - fi -else - JAVA_MEM_OPTS=" -server -Xms1g -Xmx1g -XX:${VM_ARGS}=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC " -fi - -echo -e "Starting the $SERVER_NAME ...\c" -nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS org.apache.dubbo.container.Main > $STDOUT_FILE 2>&1 & - -COUNT=0 -while [ $COUNT -lt 1 ]; do - echo -e ".\c" - sleep 1 - if [ -n "$SERVER_PORT" ]; then - if [ "$SERVER_PROTOCOL" == "dubbo" ]; then - COUNT=`(sleep 1; echo -e '\n'; sleep 1; echo status; sleep 1)| telnet $SERVER_HOST $SERVER_PORT | grep -c OK` - else - COUNT=`netstat -an | grep $SERVER_PORT | wc -l` - fi - else - COUNT=`ps -ef | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}' | wc -l` - fi - if [ $COUNT -gt 0 ]; then - break - fi -done - -echo "OK!" -PIDS=`ps -ef | grep java | grep -v grep | grep "$DEPLOY_DIR" | awk '{print $2}'` -echo "PID: $PIDS" -echo "STDOUT: $STDOUT_FILE" 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 deleted file mode 100755 index 359f4931afb..00000000000 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/stop.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/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 .. -DEPLOY_DIR=`pwd` -CONF_DIR=$DEPLOY_DIR/conf - -SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | tr -d '\r'` - -if [ -z "$SERVER_NAME" ]; then - SERVER_NAME=`hostname` -fi - -PIDS=`ps -ef | grep java | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'` -if [ -z "$PIDS" ]; then - echo "ERROR: The $SERVER_NAME does not started!" - exit 1 -fi - -if [ "$1" != "skip" ]; then - $BIN_DIR/dump.sh -fi - -echo -e "Stopping the $SERVER_NAME ...\c" -for PID in $PIDS ; do - kill $PID > /dev/null 2>&1 -done - -COUNT=0 -while [ $COUNT -lt 1 ]; do - echo -e ".\c" - sleep 1 - COUNT=1 - for PID in $PIDS ; do - PID_EXIST=`ps -f -p $PID | grep java` - if [ -n "$PID_EXIST" ]; then - COUNT=0 - break - fi - done -done - -echo "OK!" -echo "PID: $PIDS" diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml deleted file mode 100644 index 9b056ef1163..00000000000 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-container - ${revision} - ../pom.xml - - dubbo-container-spring - jar - ${project.artifactId} - The spring container module of dubbo project - - false - - - - org.apache.dubbo - dubbo-container-api - ${project.parent.version} - - - org.springframework - spring-context - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - diff --git a/dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java b/dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java deleted file mode 100644 index 99c1ed4a609..00000000000 --- a/dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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.dubbo.container.spring; - -import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; -import org.apache.dubbo.common.logger.LoggerFactory; -import org.apache.dubbo.common.utils.StringUtils; -import org.apache.dubbo.common.utils.SystemPropertyConfigUtils; -import org.apache.dubbo.container.Container; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import static org.apache.dubbo.common.constants.CommonConstants.DubboProperty.DUBBO_SPRING_CONFIG; -import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_STOP_DUBBO_ERROR; - -/** - * SpringContainer. (SPI, Singleton, ThreadSafe) - *

- * The container class implementation for Spring - */ -public class SpringContainer implements Container { - - public static final String DEFAULT_SPRING_CONFIG = "classpath*:META-INF/spring/*.xml"; - private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(SpringContainer.class); - static ClassPathXmlApplicationContext context; - - public static ClassPathXmlApplicationContext getContext() { - return context; - } - - @Override - public void start() { - String configPath = SystemPropertyConfigUtils.getSystemProperty(DUBBO_SPRING_CONFIG); - if (StringUtils.isEmpty(configPath)) { - configPath = DEFAULT_SPRING_CONFIG; - } - context = new ClassPathXmlApplicationContext(configPath.split("[,\\s]+"), false); - context.refresh(); - context.start(); - } - - @Override - public void stop() { - try { - if (context != null) { - context.stop(); - context.close(); - context = null; - } - } catch (Throwable e) { - logger.error(CONFIG_STOP_DUBBO_ERROR, "", "", e.getMessage(), e); - } - } -} diff --git a/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container b/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container deleted file mode 100644 index 84eed432950..00000000000 --- a/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container +++ /dev/null @@ -1 +0,0 @@ -spring=org.apache.dubbo.container.spring.SpringContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java b/dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java deleted file mode 100644 index b1ea0747c95..00000000000 --- a/dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.dubbo.container.spring; - -import org.apache.dubbo.common.extension.ExtensionLoader; -import org.apache.dubbo.container.Container; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -/** - * StandaloneContainerTest - */ -class SpringContainerTest { - - @Test - void testContainer() { - SpringContainer container = (SpringContainer) - ExtensionLoader.getExtensionLoader(Container.class).getExtension("spring"); - container.start(); - Assertions.assertEquals( - SpringContainer.class, container.context.getBean("container").getClass()); - container.stop(); - } -} diff --git a/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml b/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml deleted file mode 100644 index 2bdf7a14857..00000000000 --- a/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/dubbo-container/dubbo-container-spring/src/test/resources/log4j2-test.xml b/dubbo-container/dubbo-container-spring/src/test/resources/log4j2-test.xml deleted file mode 100644 index ba99f52cc2d..00000000000 --- a/dubbo-container/dubbo-container-spring/src/test/resources/log4j2-test.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml deleted file mode 100644 index a104376e7f6..00000000000 --- a/dubbo-container/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.dubbo - dubbo-parent - ${revision} - ../pom.xml - - dubbo-container - pom - ${project.artifactId} - The container module of dubbo project - - dubbo-container-api - dubbo-container-spring - - - false - - diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml index 2f966a58cb9..54105d5e4f7 100644 --- a/dubbo-distribution/dubbo-all-shaded/pom.xml +++ b/dubbo-distribution/dubbo-all-shaded/pom.xml @@ -97,22 +97,6 @@ true - - - org.apache.dubbo - dubbo-container-api - ${project.version} - compile - true - - - org.apache.dubbo - dubbo-container-spring - ${project.version} - compile - true - - org.apache.dubbo @@ -496,8 +480,6 @@ org.apache.dubbo:dubbo-configcenter-apollo org.apache.dubbo:dubbo-configcenter-nacos org.apache.dubbo:dubbo-configcenter-zookeeper - org.apache.dubbo:dubbo-container-api - org.apache.dubbo:dubbo-container-spring org.apache.dubbo:dubbo-filter-cache org.apache.dubbo:dubbo-filter-validation org.apache.dubbo:dubbo-metadata-api @@ -748,12 +730,6 @@ META-INF/dubbo/internal/org.apache.dubbo.config.spring.extension.SpringExtensionInjector - - - META-INF/dubbo/internal/org.apache.dubbo.container.Container - - diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index c22945a203f..eaf6db3737d 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -104,22 +104,6 @@ true - - - org.apache.dubbo - dubbo-container-api - ${project.version} - compile - true - - - org.apache.dubbo - dubbo-container-spring - ${project.version} - compile - true - - org.apache.dubbo @@ -672,8 +656,6 @@ org.apache.dubbo:dubbo-configcenter-apollo org.apache.dubbo:dubbo-configcenter-nacos org.apache.dubbo:dubbo-configcenter-zookeeper - org.apache.dubbo:dubbo-container-api - org.apache.dubbo:dubbo-container-spring org.apache.dubbo:dubbo-filter-cache org.apache.dubbo:dubbo-filter-validation org.apache.dubbo:dubbo-metadata-api @@ -843,9 +825,6 @@ META-INF/dubbo/internal/org.apache.dubbo.config.spring.extension.SpringExtensionInjector - - META-INF/dubbo/internal/org.apache.dubbo.container.Container - META-INF/dubbo/internal/org.apache.dubbo.metadata.MetadataParamsFilter diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index 50c14ef2fcc..32e40b9a9ea 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -113,24 +113,6 @@ ${project.version} - - - org.apache.dubbo - dubbo-container - ${project.version} - pom - - - org.apache.dubbo - dubbo-container-api - ${project.version} - - - org.apache.dubbo - dubbo-container-spring - ${project.version} - - org.apache.dubbo diff --git a/dubbo-distribution/dubbo-core-spi/pom.xml b/dubbo-distribution/dubbo-core-spi/pom.xml index 06b68c6722e..f65aa0b2586 100644 --- a/dubbo-distribution/dubbo-core-spi/pom.xml +++ b/dubbo-distribution/dubbo-core-spi/pom.xml @@ -348,12 +348,6 @@ META-INF/dubbo/internal/org.apache.dubbo.config.spring.extension.SpringExtensionInjector - - - META-INF/dubbo/internal/org.apache.dubbo.container.Container - - diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index fb06e5958bc..2203a2d9f56 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -43,21 +43,6 @@ dubbo-cluster ${project.parent.version} - - org.apache.dubbo - dubbo-container-api - ${project.parent.version} - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.apache.dubbo diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index a782e9e39d4..251efa12a13 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -99,18 +99,6 @@ ${project.version} - - - org.apache.dubbo - dubbo-container-api - ${project.version} - - - org.apache.dubbo - dubbo-container-spring - ${project.version} - - org.apache.dubbo diff --git a/pom.xml b/pom.xml index 77cd04bdd99..1a05cb1d4ba 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ dubbo-common - dubbo-container dubbo-remoting dubbo-rpc dubbo-cluster