去掉兼容代码

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@132 1a56cb94-b969-4eaa-88fa-be21384802f2

dubbo-container/src/main/java/com/alibaba/dubbo/container/jetty/JettyContainer.java

@@ -35,16 +35,16 @@ import com.alibaba.dubbo.container.page.PageServlet;
 @Extension("jetty")
 public class JettyContainer implements Container {
 
-    private static final Logger logger             = LoggerFactory.getLogger(JettyContainer.class);
+    private static final Logger logger = LoggerFactory.getLogger(JettyContainer.class);
 
-    public static final String JETTY_PORT_KEY     = "jetty.port";
+    public static final String JETTY_PORT_KEY = "jetty.port";
 
-    public static final int    DEFAULT_JETTY_PORT = 8080;
+    public static final int DEFAULT_JETTY_PORT = 8080;
 
     private SelectChannelConnector connector;
 
     public void start() {
-        String serverPort = System.getProperty(JETTY_PORT_KEY, System.getProperty("dubbo.service.console.port")); // compatible
+        String serverPort = System.getProperty(JETTY_PORT_KEY);
         int port;
         if (serverPort == null || serverPort.length() == 0) {
             port = DEFAULT_JETTY_PORT;

dubbo-container/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java

@@ -36,25 +36,25 @@ import com.alibaba.dubbo.container.Container;
 @Extension("log4j")
 public class Log4jContainer implements Container {
 
-    private static final Logger logger              = LoggerFactory.getLogger(Log4jContainer.class);
+    private static final Logger logger = LoggerFactory.getLogger(Log4jContainer.class);
 
-    public static final String LOG4J_FILE          = "log4j.file";
+    public static final String LOG4J_FILE = "log4j.file";
 
-    public static final String LOG4J_LEVEL         = "log4j.level";
+    public static final String LOG4J_LEVEL = "log4j.level";
 
-    public static final String LOG4J_SUBDIRECTORY  = "log4j.subdirectory";
+    public static final String LOG4J_SUBDIRECTORY = "log4j.subdirectory";
 
-    public static final String DEFAULT_LOG4J_FILE  = System.getProperty("user.home") + "/dubbo.log";
+    public static final String DEFAULT_LOG4J_FILE = System.getProperty("user.home") + "/dubbo.log";
 
     public static final String DEFAULT_LOG4J_LEVEL = "ERROR";
 
     @SuppressWarnings("unchecked")
     public void start() {
-        String file = System.getProperty(LOG4J_FILE, System.getProperty("dubbo.logging.root")); // compatible
+        String file = System.getProperty(LOG4J_FILE);
         if (file == null || file.length() == 0) {
             file = DEFAULT_LOG4J_FILE;
         }
-        String level = System.getProperty(LOG4J_LEVEL, System.getProperty("dubbo.logging.level")); // compatible
+        String level = System.getProperty(LOG4J_LEVEL);
         if (level == null || level.length() == 0) {
             level = DEFAULT_LOG4J_LEVEL;
         }
@@ -67,7 +67,7 @@ public class Log4jContainer implements Container {
         properties.setProperty("log4j.appender.application.layout", "org.apache.log4j.PatternLayout");
         properties.setProperty("log4j.appender.application.layout.ConversionPattern", "%d [%t] %-5p %C{6} (%F:%L) - %m%n");
         PropertyConfigurator.configure(properties);
-        String subdirectory = System.getProperty(LOG4J_SUBDIRECTORY, System.getProperty("dubbo.service.server.port")); // compatible
+        String subdirectory = System.getProperty(LOG4J_SUBDIRECTORY);
         if (subdirectory != null && subdirectory.length() > 0) {
             Enumeration<org.apache.log4j.Logger> ls = LogManager.getCurrentLoggers();
             while (ls.hasMoreElements()) {

dubbo-container/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java

@@ -31,9 +31,9 @@ import com.alibaba.dubbo.container.Container;
 @Extension("spring")
 public class SpringContainer implements Container {
 
-    private static final Logger logger                = LoggerFactory.getLogger(SpringContainer.class);
+    private static final Logger logger = LoggerFactory.getLogger(SpringContainer.class);
 
-    public static final String SPRING_CONFIG_KEY     = "spring.config";
+    public static final String SPRING_CONFIG_KEY = "spring.config";
     
     public static final String DEFAULT_SPRING_CONFIG = "classpath*:META-INF/spring/*.xml";
 
@@ -44,7 +44,7 @@ public class SpringContainer implements Container {
     }
     
     public void start() {
-        String configPath = System.getProperty(SPRING_CONFIG_KEY, System.getProperty("dubbo.spring.config")); // compatible
+        String configPath = System.getProperty(SPRING_CONFIG_KEY);
         if (configPath == null || configPath.length() == 0) {
             configPath = DEFAULT_SPRING_CONFIG;
         }