Resolve conflicts of merging #1820

apache · Jul 26, 2018 · 89017ce · 89017ce
1 parent ee21cea
commit 89017ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 42 deletions.
diff --git a/...main/java/com/alibaba/dubbo/config/spring/initializer/DubboWebApplicationInitializer.java b/...main/java/com/alibaba/dubbo/config/spring/initializer/DubboWebApplicationInitializer.java
diff --git a/...initializer/DubboApplicationListener.java → ...initializer/DubboApplicationListener.java b/...initializer/DubboApplicationListener.java → ...initializer/DubboApplicationListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.config.spring.initializer;
+package org.apache.dubbo.config.spring.initializer;
 
 import org.apache.dubbo.bootstrap.DubboBootstrap;
 import org.springframework.context.ApplicationEvent;

diff --git a/...c/test/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListenerTest.java b/...c/test/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListenerTest.java
@@ -17,7 +17,9 @@
 package com.alibaba.dubbo.config.spring.initializer;
 
 import com.alibaba.dubbo.config.DubboShutdownHook;
+
 import org.apache.dubbo.bootstrap.DubboBootstrap;
+import org.apache.dubbo.config.spring.initializer.DubboApplicationListener;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

diff --git a/...bo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java b/...bo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java
@@ -19,9 +19,9 @@
 import com.alibaba.dubbo.common.logger.Logger;
 import com.alibaba.dubbo.common.logger.LoggerFactory;
 import com.alibaba.dubbo.common.utils.ConfigUtils;
-import com.alibaba.dubbo.config.spring.initializer.DubboApplicationListener;
 import com.alibaba.dubbo.container.Container;
 
+import org.apache.dubbo.config.spring.initializer.DubboApplicationListener;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**