rename package sonia.scm.boot to sonia.scm.lifecycle

scm-core/src/main/java/sonia/scm/lifecycle/RestartEvent.java

@@ -29,7 +29,7 @@
 
 
 
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 //~--- non-JDK imports --------------------------------------------------------
 

scm-webapp/src/main/java/sonia/scm/lifecycle/ApplicationModuleProvider.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.base.Throwables;
 import com.google.inject.Module;

scm-webapp/src/main/java/sonia/scm/lifecycle/BootstrapClassLoader.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 /**
  * This ClassLoader is mainly a wrapper around the web application class loader and its goal is to make it easier to

scm-webapp/src/main/java/sonia/scm/lifecycle/BootstrapContextFilter.java

@@ -29,7 +29,7 @@
 
 
 
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 //~--- non-JDK imports --------------------------------------------------------
 

scm-webapp/src/main/java/sonia/scm/lifecycle/BootstrapContextListener.java

@@ -27,7 +27,7 @@
  */
 
 
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Guice;

scm-webapp/src/main/java/sonia/scm/lifecycle/BootstrapModule.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.throwingproviders.ThrowingProviderBinder;

scm-webapp/src/main/java/sonia/scm/lifecycle/ClassLoaderLifeCycle.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;

scm-webapp/src/main/java/sonia/scm/lifecycle/InjectionContextRestartStrategy.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;

scm-webapp/src/main/java/sonia/scm/lifecycle/InjectionLifeCycle.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.Binding;
 import com.google.inject.Injector;

scm-webapp/src/main/java/sonia/scm/lifecycle/LoggingAdapter.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

scm-webapp/src/main/java/sonia/scm/lifecycle/ModuleProvider.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.Module;
 

scm-webapp/src/main/java/sonia/scm/lifecycle/PluginBootstrap.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;

scm-webapp/src/main/java/sonia/scm/lifecycle/RestartServlet.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;

scm-webapp/src/main/java/sonia/scm/lifecycle/RestartStrategy.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 /**
  * Strategy for restarting SCM-Manager.

scm-webapp/src/main/java/sonia/scm/lifecycle/ServletContextCleaner.java

@@ -1,12 +1,10 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.collect.ImmutableSet;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletContext;
-import javax.ws.rs.ext.RuntimeDelegate;
 import java.util.Enumeration;
 import java.util.Set;
 

scm-webapp/src/main/java/sonia/scm/lifecycle/ServletContextModule.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.servlet.ServletModule;
 import sonia.scm.Default;

scm-webapp/src/main/java/sonia/scm/lifecycle/SetupContextListener.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.apache.shiro.authc.credential.PasswordService;

scm-webapp/src/main/java/sonia/scm/lifecycle/SingleView.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;

scm-webapp/src/main/java/sonia/scm/lifecycle/SingleViewServlet.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

scm-webapp/src/main/java/sonia/scm/lifecycle/StaticResourceServlet.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.github.sdorra.webresources.CacheControl;
 import com.github.sdorra.webresources.WebResourceSender;

scm-webapp/src/main/java/sonia/scm/lifecycle/UpdateStepModule.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.multibindings.Multibinder;

scm-webapp/src/main/java/sonia/scm/lifecycle/Versions.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;

scm-webapp/src/main/java/sonia/scm/lifecycle/View.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 class View {
 

scm-webapp/src/main/java/sonia/scm/lifecycle/ViewController.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import javax.servlet.http.HttpServletRequest;
 

scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java

@@ -41,7 +41,7 @@ import com.google.common.collect.Sets;
 import com.google.common.hash.Hashing;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.boot.ClassLoaderLifeCycle;
+import sonia.scm.lifecycle.ClassLoaderLifeCycle;
 import sonia.scm.plugin.ExplodedSmp.PathTransformer;
 
 import javax.xml.bind.JAXBContext;

scm-webapp/src/main/java/sonia/scm/plugin/PluginsInternal.java

@@ -41,7 +41,7 @@ import com.google.common.io.Files;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sonia.scm.boot.ClassLoaderLifeCycle;
+import sonia.scm.lifecycle.ClassLoaderLifeCycle;
 import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------

scm-webapp/src/main/java/sonia/scm/update/MigrationWizardModuleProvider.java

@@ -2,7 +2,7 @@ package sonia.scm.update;
 
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import sonia.scm.boot.ModuleProvider;
+import sonia.scm.lifecycle.ModuleProvider;
 import sonia.scm.update.repository.XmlRepositoryV1UpdateStep;
 
 import java.util.Collection;

scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java

@@ -7,7 +7,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.boot.RestartEvent;
+import sonia.scm.lifecycle.RestartEvent;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.update.repository.MigrationStrategy;
 import sonia.scm.update.repository.MigrationStrategyDao;

scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java

@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import sonia.scm.NotFoundException;
 import sonia.scm.SCMContext;
 import sonia.scm.Stage;
-import sonia.scm.boot.RestartEvent;
+import sonia.scm.lifecycle.RestartEvent;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.filter.WebElement;

scm-webapp/src/main/resources/logback.default.xml

@@ -93,7 +93,7 @@
   
   <logger name="org.jboss.resteasy" level="INFO" />
 
-  <logger name="sonia.scm.boot.RestartServlet" level="TRACE" />
+  <logger name="sonia.scm.lifecycle.RestartServlet" level="TRACE" />
 
   <root level="WARN">
     <appender-ref ref="STDOUT" />

scm-webapp/src/main/webapp/WEB-INF/web.xml

@@ -43,7 +43,7 @@
 
   <filter>
     <filter-name>BootstrapFilter</filter-name>
-    <filter-class>sonia.scm.boot.BootstrapContextFilter</filter-class>
+    <filter-class>sonia.scm.lifecycle.BootstrapContextFilter</filter-class>
   </filter>
 
   <filter-mapping>

scm-webapp/src/test/java/sonia/scm/lifecycle/ClassLoaderLifeCycleTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -11,7 +11,6 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;

scm-webapp/src/test/java/sonia/scm/lifecycle/InjectionContextRestartStrategyTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.github.legman.Subscribe;
 import org.junit.jupiter.api.BeforeEach;

scm-webapp/src/test/java/sonia/scm/lifecycle/InjectionLifeCycleTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.base.Strings;
 import com.google.inject.AbstractModule;

scm-webapp/src/test/java/sonia/scm/lifecycle/RestartServletTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.github.legman.Subscribe;
 import com.google.common.base.Charsets;

scm-webapp/src/test/java/sonia/scm/lifecycle/ServletContextCleanerTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.collect.ImmutableSet;
 import org.junit.Test;

scm-webapp/src/test/java/sonia/scm/lifecycle/ServletContextModuleTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;

scm-webapp/src/test/java/sonia/scm/lifecycle/SetupContextListenerTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.collect.Lists;
 import org.apache.shiro.authc.credential.PasswordService;

scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewServletTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

scm-webapp/src/test/java/sonia/scm/lifecycle/SingleViewTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;

scm-webapp/src/test/java/sonia/scm/lifecycle/StaticResourceServletTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import com.google.common.io.Resources;
 import org.junit.jupiter.api.Test;

scm-webapp/src/test/java/sonia/scm/lifecycle/VersionsTest.java

@@ -1,4 +1,4 @@
-package sonia.scm.boot;
+package sonia.scm.lifecycle;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

scm-webapp/src/test/java/sonia/scm/plugin/PluginProcessorTest.java

@@ -42,7 +42,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import sonia.scm.boot.ClassLoaderLifeCycle;
+import sonia.scm.lifecycle.ClassLoaderLifeCycle;
 
 import static org.hamcrest.Matchers.*;
 

scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java

@@ -16,7 +16,7 @@ import org.mockito.MockSettings;
 import org.mockito.internal.creation.MockSettingsImpl;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.MockitoJUnitRunner;
-import sonia.scm.boot.RestartEvent;
+import sonia.scm.lifecycle.RestartEvent;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.event.ScmEventBus;