First pass on changing Lifecycle to LifeCycle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/sandbox/trunk@1045 7e9141cc-0065-0410-87d8-b60c137991c4
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycle.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java
similarity index 95%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycle.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java
index df7178b..7b01b06 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycle.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycle.java
@@ -22,14 +22,14 @@
/**
* The lifecycle of an App in the {@link DeploymentManager}.
* <p>
- * <img src="doc-files/AppLifecycle.png">
+ * <img src="doc-files/AppLifeCycle.png">
*/
-public class AppLifecycle
+public class AppLifeCycle
{
/**
- * State that an {@link App} can be in, as a result of traversal via the {@link AppLifecycle}
+ * State that an {@link App} can be in, as a result of traversal via the {@link AppLifeCycle}
* <p>
- * <img src="doc-files/AppLifecycle.png">
+ * <img src="doc-files/AppLifeCycle.png">
*/
public enum State
{
@@ -140,7 +140,7 @@
public static void main(String[] args)
{
// Dump All Paths
- AppLifecycle lifecycle = new AppLifecycle();
+ AppLifeCycle lifecycle = new AppLifeCycle();
for (State from : State.values())
{
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleEvent.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleEvent.java
similarity index 84%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleEvent.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleEvent.java
index fb67281..b3bf3ee 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleEvent.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleEvent.java
@@ -16,14 +16,14 @@
package org.eclipse.jetty.deploy;
/**
- * Event passed into the {@link AppLifecycleListener}
+ * Event passed into the {@link AppLifeCycleListener}
*/
-public class AppLifecycleEvent
+public class AppLifeCycleEvent
{
private App app;
private DeploymentManager deploymentManager;
- private AppLifecycle.Phase lifecyclePhase;
- private AppLifecycle.State lifecycleState;
+ private AppLifeCycle.Phase lifecyclePhase;
+ private AppLifeCycle.State lifecycleState;
private Throwable throwable;
public App getApp()
@@ -36,12 +36,12 @@
return deploymentManager;
}
- public AppLifecycle.Phase getLifecyclePhase()
+ public AppLifeCycle.Phase getLifecyclePhase()
{
return lifecyclePhase;
}
- public AppLifecycle.State getLifecycleState()
+ public AppLifeCycle.State getLifecycleState()
{
return lifecycleState;
}
@@ -61,12 +61,12 @@
this.deploymentManager = deploymentManager;
}
- public void setLifecyclePhase(AppLifecycle.Phase lifecyclePhase)
+ public void setLifecyclePhase(AppLifeCycle.Phase lifecyclePhase)
{
this.lifecyclePhase = lifecyclePhase;
}
- public void setLifecycleState(AppLifecycle.State lifecycleState)
+ public void setLifecycleState(AppLifeCycle.State lifecycleState)
{
this.lifecycleState = lifecycleState;
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleListener.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleListener.java
similarity index 87%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleListener.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleListener.java
index 85b5dd2..b53b079 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifecycleListener.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/AppLifeCycleListener.java
@@ -16,9 +16,9 @@
package org.eclipse.jetty.deploy;
/**
- * {@link AppLifecycle} Listener.
+ * {@link AppLifeCycle} Listener.
*/
-public interface AppLifecycleListener
+public interface AppLifeCycleListener
{
/**
* Before Phase execution.
@@ -33,7 +33,7 @@
* @throws Exception
* thrown to fail the lifecycle at this point.
*/
- void onLifecycleBeforePhase(AppLifecycleEvent event) throws Exception;
+ void onLifecycleBeforePhase(AppLifeCycleEvent event) throws Exception;
/**
* Phase execution.
@@ -48,7 +48,7 @@
* @throws Exception
* thrown to fail the lifecycle at this point.
*/
- void onLifecyclePhase(AppLifecycleEvent event) throws Exception;
+ void onLifecyclePhase(AppLifeCycleEvent event) throws Exception;
/**
* Phase failure.
@@ -58,7 +58,7 @@
* @param event
* the lifecycle event details.
*/
- void onLifecyclePhaseFailure(AppLifecycleEvent event);
+ void onLifecyclePhaseFailure(AppLifeCycleEvent event);
/**
* State reached event.
@@ -71,5 +71,5 @@
* @param event
* the lifecycle event details.
*/
- void onLifecycleState(AppLifecycleEvent event);
+ void onLifecycleState(AppLifeCycleEvent event);
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
index 86a8b8c..6f0fa6f 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import org.eclipse.jetty.deploy.AppLifecycle.Step;
-import org.eclipse.jetty.deploy.AppLifecycle.State;
+import org.eclipse.jetty.deploy.AppLifeCycle.Step;
+import org.eclipse.jetty.deploy.AppLifeCycle.State;
import org.eclipse.jetty.deploy.support.ConfigurationManager;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -42,8 +42,8 @@
* <ol>
* <li>Tracking Apps and their AppStates</li>
* <li>Managing AppProviders and the Apps that they provide.</li>
- * <li>Managing AppLifecycle bindings of implementations of various AppPhases.</li>
- * <li>Executing AppLifecycle on App based on current and desired AppState.</li>
+ * <li>Managing AppLifeCycle bindings of implementations of various AppPhases.</li>
+ * <li>Executing AppLifeCycle on App based on current and desired AppState.</li>
* </ol>
* <p>
* <img src="doc-files/DeploymentManager.png">
@@ -70,24 +70,24 @@
/**
* The state of the app.
*/
- private AppLifecycle.State state;
+ private AppLifeCycle.State state;
/**
* Tracking the various AppState timestamps (in system milliseconds)
*/
- private Map<AppLifecycle.State, Long> stateTimestamps = new HashMap<AppLifecycle.State, Long>();
+ private Map<AppLifeCycle.State, Long> stateTimestamps = new HashMap<AppLifeCycle.State, Long>();
public App getApp()
{
return app;
}
- public AppLifecycle.State getState()
+ public AppLifeCycle.State getState()
{
return state;
}
- public Map<AppLifecycle.State, Long> getStateTimestamps()
+ public Map<AppLifeCycle.State, Long> getStateTimestamps()
{
return stateTimestamps;
}
@@ -97,7 +97,7 @@
return version;
}
- void updateState(AppLifecycle.State state)
+ void updateState(AppLifeCycle.State state)
{
this.state = state;
this.stateTimestamps.put(state,Long.valueOf(System.currentTimeMillis()));
@@ -105,13 +105,13 @@
}
private List<AppProvider> providers = new ArrayList<AppProvider>();
- private AppLifecycle lifecycle = new AppLifecycle();
- private List<AppLifecycleListener> lifecycleListeners = new ArrayList<AppLifecycleListener>();
+ private AppLifeCycle lifecycle = new AppLifeCycle();
+ private List<AppLifeCycleListener> lifecycleListeners = new ArrayList<AppLifeCycleListener>();
private LinkedList<AppEntry> apps = new LinkedList<AppEntry>();
private AttributesMap contextAttributes = new AttributesMap();
private ConfigurationManager configurationManager;
private ContextHandlerCollection contexts;
- private AppLifecycle.State defaultLifecycleState = State.STARTED;
+ private AppLifeCycle.State defaultLifeCycleState = State.STARTED;
/**
* Receive an app for processing.
@@ -123,13 +123,13 @@
Log.info("App Added: " + app.getOriginId());
AppEntry entry = new AppEntry();
entry.app = app;
- entry.updateState(AppLifecycle.State.UNAVAILABLE);
+ entry.updateState(AppLifeCycle.State.UNAVAILABLE);
apps.add(entry);
- if (defaultLifecycleState != null)
+ if (defaultLifeCycleState != null)
{
// Immediately attempt to go to default lifecycle state
- this.walkLifecycle(entry,defaultLifecycleState);
+ this.walkLifecycle(entry,defaultLifeCycleState);
}
}
@@ -219,7 +219,7 @@
return ret;
}
- public void addAppLifecycleListener(AppLifecycleListener listener)
+ public void addAppLifeCycleListener(AppLifeCycleListener listener)
{
this.lifecycleListeners.add(listener);
}
@@ -279,34 +279,34 @@
super.doStop();
}
- private void fireLifecycleFailure(AppLifecycleEvent event)
+ private void fireLifeCycleFailure(AppLifeCycleEvent event)
{
- for (AppLifecycleListener listener : this.lifecycleListeners)
+ for (AppLifeCycleListener listener : this.lifecycleListeners)
{
listener.onLifecyclePhaseFailure(event);
}
}
- private void fireLifecyclePhase(AppLifecycleEvent event) throws Exception
+ private void fireLifeCyclePhase(AppLifeCycleEvent event) throws Exception
{
// Notify Before Phase Interested Parties
- for (AppLifecycleListener listener : this.lifecycleListeners)
+ for (AppLifeCycleListener listener : this.lifecycleListeners)
{
// Let Exceptions flow out of this method and prevent the main phase execution occur.
listener.onLifecycleBeforePhase(event);
}
// If the Before Phase passes, notify the phase itself
- for (AppLifecycleListener listener : this.lifecycleListeners)
+ for (AppLifeCycleListener listener : this.lifecycleListeners)
{
// Let Exceptions flow out of this method and prevent the state from being reached
listener.onLifecyclePhase(event);
}
}
- private void fireLifecycleState(AppLifecycleEvent event)
+ private void fireLifeCycleState(AppLifeCycleEvent event)
{
- for (AppLifecycleListener listener : this.lifecycleListeners)
+ for (AppLifeCycleListener listener : this.lifecycleListeners)
{
listener.onLifecycleState(event);
}
@@ -322,7 +322,7 @@
*
* @return Set of Object(s) for all lifecycle bindings. never null.
*/
- public Collection<AppLifecycleListener> getAppLifecycleListeners()
+ public Collection<AppLifeCycleListener> getAppLifeCycleListeners()
{
return Collections.unmodifiableList(this.lifecycleListeners);
}
@@ -349,7 +349,7 @@
* the state to look for.
* @return
*/
- public Collection<App> getApps(AppLifecycle.State state)
+ public Collection<App> getApps(AppLifeCycle.State state)
{
List<App> ret = new ArrayList<App>();
for (AppEntry entry : apps)
@@ -388,9 +388,9 @@
return contexts;
}
- public AppLifecycle.State getDefaultLifecycleState()
+ public AppLifeCycle.State getDefaultLifeCycleState()
{
- return defaultLifecycleState;
+ return defaultLifeCycleState;
}
public Server getServer()
@@ -402,7 +402,7 @@
return contexts.getServer();
}
- public void removeAppLifecycleListener(AppLifecycleListener listener)
+ public void removeAppLifeCycleListener(AppLifeCycleListener listener)
{
this.lifecycleListeners.remove(listener);
}
@@ -456,9 +456,9 @@
this.contexts = contexts;
}
- public void setDefaultLifecycleState(AppLifecycle.State defaultLifecycleState)
+ public void setDefaultLifeCycleState(AppLifeCycle.State defaultLifecycleState)
{
- this.defaultLifecycleState = defaultLifecycleState;
+ this.defaultLifeCycleState = defaultLifecycleState;
}
/**
@@ -493,7 +493,7 @@
}
/**
- * Move an {@link App} through the {@link AppLifecycle.Step} to the desired {@link AppLifecycle.State}, executing
+ * Move an {@link App} through the {@link AppLifeCycle.Step} to the desired {@link AppLifeCycle.State}, executing
* each lifecycle step in the process to reach the desired state.
*
* @param app
@@ -501,7 +501,7 @@
* @param desiredState
* the desired state to reach.
*/
- public void walkLifecycle(App app, AppLifecycle.State desiredState)
+ public void walkLifecycle(App app, AppLifeCycle.State desiredState)
{
AppEntry appentry = findAppByContextId(app.getContextId());
if (appentry == null)
@@ -516,7 +516,7 @@
}
/**
- * Move an {@link App} through the {@link AppLifecycle.Step} to the desired {@link AppLifecycle.State}, executing
+ * Move an {@link App} through the {@link AppLifeCycle.Step} to the desired {@link AppLifeCycle.State}, executing
* each lifecycle step in the process to reach the desired state.
*
* @param appentry
@@ -524,7 +524,7 @@
* @param desiredState
* the desired state to reach.
*/
- private void walkLifecycle(AppEntry appentry, AppLifecycle.State desiredState)
+ private void walkLifecycle(AppEntry appentry, AppLifeCycle.State desiredState)
{
// Compute lifecycle steps
List<Step> steps = lifecycle.getSteps(appentry.state,desiredState);
@@ -547,27 +547,27 @@
.format("Walking Lifecycle: %s to %s (Phase: %s) - %s",currentStep.getFrom(),currentStep.getTo(),currentStep.getPhase(),appentry));
// Fire off the Phase Events
- AppLifecycleEvent phaseEvent = new AppLifecycleEvent();
+ AppLifeCycleEvent phaseEvent = new AppLifeCycleEvent();
phaseEvent.setApp(appentry.app);
phaseEvent.setDeploymentManager(this);
phaseEvent.setLifecyclePhase(currentStep.getPhase());
- fireLifecyclePhase(phaseEvent);
+ fireLifeCyclePhase(phaseEvent);
Log.info("Reached Lifecycle State: " + currentStep.getTo() + " - " + appentry);
// Fire off the State Events
- AppLifecycleEvent event = new AppLifecycleEvent();
+ AppLifeCycleEvent event = new AppLifeCycleEvent();
event.setApp(appentry.app);
event.setDeploymentManager(this);
event.setLifecycleState(currentStep.getTo());
- fireLifecycleState(event);
+ fireLifeCycleState(event);
appentry.state = currentStep.getTo();
}
}
catch (Throwable t)
{
Log.warn("Unable to reach goal state: " + desiredState,t);
- AppLifecycleEvent event = new AppLifecycleEvent();
+ AppLifeCycleEvent event = new AppLifeCycleEvent();
event.setApp(appentry.app);
event.setDeploymentManager(this);
event.setThrowable(t);
@@ -575,7 +575,7 @@
{
event.setLifecyclePhase(currentStep.getPhase());
}
- fireLifecycleFailure(event);
+ fireLifeCycleFailure(event);
}
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultAppLifecycleAdapter.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultAppLifeCycleAdapter.java
similarity index 62%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultAppLifecycleAdapter.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultAppLifeCycleAdapter.java
index ef283e4..93ac92b 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultAppLifecycleAdapter.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultAppLifeCycleAdapter.java
@@ -13,32 +13,32 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
-package org.eclipse.jetty.deploy.impl;
+package org.eclipse.jetty.deploy.standard;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
-import org.eclipse.jetty.deploy.AppLifecycleListener;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycleListener;
/**
- * Abstract AppLifecycleListener Adapter to aid in building lifecycle listeners.
+ * Abstract AppLifeCycleListener Adapter to aid in building lifecycle listeners.
*/
-public abstract class DefaultAppLifecycleAdapter implements AppLifecycleListener
+public abstract class DefaultAppLifeCycleAdapter implements AppLifeCycleListener
{
- public void onLifecycleBeforePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecycleBeforePhase(AppLifeCycleEvent event) throws Exception
{
/* ignore */
}
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
/* ignore */
}
- public void onLifecyclePhaseFailure(AppLifecycleEvent event)
+ public void onLifecyclePhaseFailure(AppLifeCycleEvent event)
{
/* ignore */
}
- public void onLifecycleState(AppLifecycleEvent event)
+ public void onLifecycleState(AppLifeCycleEvent event)
{
/* ignore */
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultDeployer.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultDeployer.java
similarity index 76%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultDeployer.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultDeployer.java
index e84b7cd..9d3f0a1 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultDeployer.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultDeployer.java
@@ -13,22 +13,22 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
-package org.eclipse.jetty.deploy.impl;
+package org.eclipse.jetty.deploy.standard;
import org.eclipse.jetty.deploy.App;
-import org.eclipse.jetty.deploy.AppLifecycle;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycle;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
import org.eclipse.jetty.server.handler.ContextHandler;
/**
- * Default {@link AppLifecycle.Phase#DEPLOY} implementation.
+ * Default {@link AppLifeCycle.Phase#DEPLOY} implementation.
*/
-public class DefaultDeployer extends DefaultAppLifecycleAdapter
+public class DefaultDeployer extends DefaultAppLifeCycleAdapter
{
@Override
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
if (event.getLifecyclePhase() == Phase.DEPLOY)
{
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStarter.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStarter.java
similarity index 77%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStarter.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStarter.java
index 8969f66..f9681e0 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStarter.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStarter.java
@@ -13,23 +13,23 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
-package org.eclipse.jetty.deploy.impl;
+package org.eclipse.jetty.deploy.standard;
import org.eclipse.jetty.deploy.App;
-import org.eclipse.jetty.deploy.AppLifecycle;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycle;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.log.Log;
/**
- * Default {@link AppLifecycle.Phase#START} implementation.
+ * Default {@link AppLifeCycle.Phase#START} implementation.
*/
-public class DefaultStarter extends DefaultAppLifecycleAdapter
+public class DefaultStarter extends DefaultAppLifeCycleAdapter
{
@Override
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
if (event.getLifecyclePhase() == Phase.START)
{
@@ -46,7 +46,7 @@
for (App other : deployMan.getAppsWithSameContext(app))
{
Log.info("Removing apps with same context: " + other);
- deployMan.walkLifecycle(other,AppLifecycle.State.UNAVAILABLE);
+ deployMan.walkLifecycle(other,AppLifeCycle.State.UNAVAILABLE);
}
}
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStopper.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStopper.java
similarity index 74%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStopper.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStopper.java
index bc32fae..480fa4c 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultStopper.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultStopper.java
@@ -13,20 +13,20 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
-package org.eclipse.jetty.deploy.impl;
+package org.eclipse.jetty.deploy.standard;
-import org.eclipse.jetty.deploy.AppLifecycle;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
import org.eclipse.jetty.server.handler.ContextHandler;
/**
- * Default {@link AppLifecycle.Phase#STOP} implementation.
+ * Default {@link AppLifeCycle.Phase#STOP} implementation.
*/
-public class DefaultStopper extends DefaultAppLifecycleAdapter
+public class DefaultStopper extends DefaultAppLifeCycleAdapter
{
@Override
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
if (event.getLifecyclePhase() == Phase.STOP)
{
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultUndeployer.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultUndeployer.java
similarity index 85%
rename from jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultUndeployer.java
rename to jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultUndeployer.java
index 5bc63b9..0aaa1af 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/impl/DefaultUndeployer.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/deploy/standard/DefaultUndeployer.java
@@ -13,12 +13,12 @@
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
-package org.eclipse.jetty.deploy.impl;
+package org.eclipse.jetty.deploy.standard;
-import org.eclipse.jetty.deploy.AppLifecycle;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycle;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
import org.eclipse.jetty.deploy.DeploymentManager;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -26,12 +26,12 @@
import org.eclipse.jetty.util.log.Log;
/**
- * Default {@link AppLifecycle.Phase#UNDEPLOY} implementation.
+ * Default {@link AppLifeCycle.Phase#UNDEPLOY} implementation.
*/
-public class DefaultUndeployer extends DefaultAppLifecycleAdapter
+public class DefaultUndeployer extends DefaultAppLifeCycleAdapter
{
@Override
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
if (event.getLifecyclePhase() == Phase.UNDEPLOY)
{
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/DeployAuditLogBinding.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/DeployAuditLogBinding.java
index d37f026..9e9debd 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/DeployAuditLogBinding.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/DeployAuditLogBinding.java
@@ -3,33 +3,33 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
-import org.eclipse.jetty.deploy.impl.DefaultAppLifecycleAdapter;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
+import org.eclipse.jetty.deploy.standard.DefaultAppLifeCycleAdapter;
-public class DeployAuditLogBinding extends DefaultAppLifecycleAdapter
+public class DeployAuditLogBinding extends DefaultAppLifeCycleAdapter
{
private Logger logger = Logger.getLogger("audit.deploy");
@Override
- public void onLifecycleBeforePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecycleBeforePhase(AppLifeCycleEvent event) throws Exception
{
logger.info("Before Phase " + event.getLifecyclePhase() + " on app " + event.getApp().getOriginId());
}
@Override
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
logger.info("Phase " + event.getLifecyclePhase() + " on app " + event.getApp().getOriginId());
}
@Override
- public void onLifecyclePhaseFailure(AppLifecycleEvent event)
+ public void onLifecyclePhaseFailure(AppLifeCycleEvent event)
{
logger.log(Level.SEVERE,"Phase Failure" + event.getLifecyclePhase() + " on app " + event.getApp().getOriginId(),event.getThrowable());
}
@Override
- public void onLifecycleState(AppLifecycleEvent event)
+ public void onLifecycleState(AppLifeCycleEvent event)
{
logger.info("Reached State " + event.getLifecyclePhase() + " on app " + event.getApp().getOriginId());
}
diff --git a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/WebappVerifierBinding.java b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/WebappVerifierBinding.java
index 000a532..14e2f74 100644
--- a/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/WebappVerifierBinding.java
+++ b/jetty-deploy-manager/src/main/java/org/eclipse/jetty/webapp/deploy/WebappVerifierBinding.java
@@ -4,16 +4,16 @@
import java.net.URI;
import java.util.Collection;
-import org.eclipse.jetty.deploy.AppLifecycleEvent;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
-import org.eclipse.jetty.deploy.impl.DefaultAppLifecycleAdapter;
+import org.eclipse.jetty.deploy.AppLifeCycleEvent;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
+import org.eclipse.jetty.deploy.standard.DefaultAppLifeCycleAdapter;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.webapp.verifier.RuleSet;
import org.eclipse.jetty.webapp.verifier.Severity;
import org.eclipse.jetty.webapp.verifier.Violation;
import org.eclipse.jetty.webapp.verifier.WebappVerifier;
-public class WebappVerifierBinding extends DefaultAppLifecycleAdapter
+public class WebappVerifierBinding extends DefaultAppLifeCycleAdapter
{
private String rulesetPath;
@@ -28,7 +28,7 @@
}
@Override
- public void onLifecycleBeforePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecycleBeforePhase(AppLifeCycleEvent event) throws Exception
{
if (event.getLifecyclePhase() == Phase.DEPLOY)
{
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventCollector.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventCollector.java
index 286cbef..08f93c5 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventCollector.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventCollector.java
@@ -23,7 +23,7 @@
/**
* AppLifecycleEventCollector
*/
-public class AppLifecycleEventCollector implements AppLifecycleListener
+public class AppLifecycleEventCollector implements AppLifeCycleListener
{
private List<TrackedEvent> events = new ArrayList<TrackedEvent>();
@@ -37,22 +37,22 @@
return events;
}
- public void onLifecycleBeforePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecycleBeforePhase(AppLifeCycleEvent event) throws Exception
{
events.add(new TrackedEvent(Call.BEFORE_PHASE,event));
}
- public void onLifecyclePhase(AppLifecycleEvent event) throws Exception
+ public void onLifecyclePhase(AppLifeCycleEvent event) throws Exception
{
events.add(new TrackedEvent(Call.PHASE,event));
}
- public void onLifecyclePhaseFailure(AppLifecycleEvent event)
+ public void onLifecyclePhaseFailure(AppLifeCycleEvent event)
{
events.add(new TrackedEvent(Call.PHASE_FAILURE,event));
}
- public void onLifecycleState(AppLifecycleEvent event)
+ public void onLifecycleState(AppLifeCycleEvent event)
{
events.add(new TrackedEvent(Call.STATE,event));
}
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventsAssert.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventsAssert.java
index 5b4e79b..3d5534c 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventsAssert.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleEventsAssert.java
@@ -18,8 +18,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
-import org.eclipse.jetty.deploy.AppLifecycle.State;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.State;
import org.eclipse.jetty.deploy.TrackedEvent.Call;
import org.junit.Assert;
@@ -32,12 +32,12 @@
public void addSuccessfulStep(Phase phase, State state)
{
- AppLifecycleEvent phaseEvent = new AppLifecycleEvent();
+ AppLifeCycleEvent phaseEvent = new AppLifeCycleEvent();
phaseEvent.setLifecyclePhase(phase);
events.add(new TrackedEvent(Call.BEFORE_PHASE,phaseEvent));
events.add(new TrackedEvent(Call.PHASE,phaseEvent));
- AppLifecycleEvent stateEvent = new AppLifecycleEvent();
+ AppLifeCycleEvent stateEvent = new AppLifeCycleEvent();
stateEvent.setLifecycleState(state);
events.add(new TrackedEvent(Call.STATE,stateEvent));
}
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleTest.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleTest.java
index 35adad7..7a6ba8b 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleTest.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/AppLifecycleTest.java
@@ -18,9 +18,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
-import org.eclipse.jetty.deploy.AppLifecycle.State;
-import org.eclipse.jetty.deploy.AppLifecycle.Step;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.State;
+import org.eclipse.jetty.deploy.AppLifeCycle.Step;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +34,7 @@
assertPhases(from,to,new ArrayList<Phase>());
}
- private void assertPhases(AppLifecycle lifecycle, State from, State to, List<Phase> expected)
+ private void assertPhases(AppLifeCycle lifecycle, State from, State to, List<Phase> expected)
{
List<Step> actual = lifecycle.getSteps(from,to);
String msg = "Lifecycle.phases from " + from + " to " + to;
@@ -64,7 +64,7 @@
private void assertPhases(State from, State to, List<Phase> expected)
{
- AppLifecycle lifecycle = new AppLifecycle();
+ AppLifeCycle lifecycle = new AppLifeCycle();
assertPhases(lifecycle,from,to,expected);
}
@@ -138,12 +138,12 @@
/**
* Request multiple lifecycle phases with a single lifecycle instance. Just to ensure that there is no state
- * maintained between {@link AppLifecycle#getPhases(State, State)} requests.
+ * maintained between {@link AppLifeCycle#getPhases(State, State)} requests.
*/
@Test
public void testGetPhasesMultiple()
{
- AppLifecycle lifecycle = new AppLifecycle();
+ AppLifeCycle lifecycle = new AppLifeCycle();
List<Phase> expected = new ArrayList<Phase>();
// Deployed -> Deployed
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerStateTransitionTest.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerStateTransitionTest.java
index bf77b47..b5e30fa 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerStateTransitionTest.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerStateTransitionTest.java
@@ -16,8 +16,8 @@
package org.eclipse.jetty.deploy;
import java.util.Collection;
-import org.eclipse.jetty.deploy.AppLifecycle.Phase;
-import org.eclipse.jetty.deploy.AppLifecycle.State;
+import org.eclipse.jetty.deploy.AppLifeCycle.Phase;
+import org.eclipse.jetty.deploy.AppLifeCycle.State;
import org.junit.Assert;
import org.junit.Test;
@@ -28,9 +28,9 @@
{
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
DeploymentManager depman = new DeploymentManager();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
- Collection<AppLifecycleListener> allbindings = depman.getAppLifecycleListeners();
+ Collection<AppLifeCycleListener> allbindings = depman.getAppLifeCycleListeners();
Assert.assertNotNull("All Bindings should never be null",allbindings);
Assert.assertEquals("All Bindings.size",1,allbindings.size());
}
@@ -39,11 +39,11 @@
public void testStateTransition_NewToDeployed() throws Exception
{
DeploymentManager depman = new DeploymentManager();
- depman.setDefaultLifecycleState(null); // no default
+ depman.setDefaultLifeCycleState(null); // no default
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
MockAppProvider mockProvider = new MockAppProvider();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
depman.addAppProvider(mockProvider);
// Start DepMan
@@ -68,11 +68,11 @@
public void testStateTransition_NewToStarted() throws Exception
{
DeploymentManager depman = new DeploymentManager();
- depman.setDefaultLifecycleState(null); // no default
+ depman.setDefaultLifeCycleState(null); // no default
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
MockAppProvider mockProvider = new MockAppProvider();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
depman.addAppProvider(mockProvider);
// Start DepMan
@@ -98,11 +98,11 @@
public void testStateTransition_NewToStartedToUnavailable() throws Exception
{
DeploymentManager depman = new DeploymentManager();
- depman.setDefaultLifecycleState(null); // no default
+ depman.setDefaultLifeCycleState(null); // no default
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
MockAppProvider mockProvider = new MockAppProvider();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
depman.addAppProvider(mockProvider);
// Start DepMan
@@ -132,11 +132,11 @@
public void testStateTransition_Receive() throws Exception
{
DeploymentManager depman = new DeploymentManager();
- depman.setDefaultLifecycleState(null); // no default
+ depman.setDefaultLifeCycleState(null); // no default
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
MockAppProvider mockProvider = new MockAppProvider();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
depman.addAppProvider(mockProvider);
// Start DepMan
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerTest.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerTest.java
index 987faad..35645af 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerTest.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/DeploymentManagerTest.java
@@ -15,7 +15,7 @@
AppLifecycleEventCollector eventCollector = new AppLifecycleEventCollector();
MockAppProvider mockProvider = new MockAppProvider();
- depman.addAppLifecycleListener(eventCollector);
+ depman.addAppLifeCycleListener(eventCollector);
depman.addAppProvider(mockProvider);
// Start DepMan
diff --git a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/TrackedEvent.java b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/TrackedEvent.java
index fa94954..b233473 100644
--- a/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/TrackedEvent.java
+++ b/jetty-deploy-manager/src/test/java/org/eclipse/jetty/deploy/TrackedEvent.java
@@ -26,9 +26,9 @@
}
private TrackedEvent.Call call;
- private AppLifecycleEvent event;
+ private AppLifeCycleEvent event;
- public TrackedEvent(TrackedEvent.Call call, AppLifecycleEvent event)
+ public TrackedEvent(TrackedEvent.Call call, AppLifeCycleEvent event)
{
this.call = call;
this.event = event;
@@ -39,7 +39,7 @@
return call;
}
- public AppLifecycleEvent getEvent()
+ public AppLifeCycleEvent getEvent()
{
return event;
}
diff --git a/jetty-deploy-manager/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-deploy-manager/src/test/resources/jetty-deploymgr-contexts.xml
index 3470454..17b2e07 100644
--- a/jetty-deploy-manager/src/test/resources/jetty-deploymgr-contexts.xml
+++ b/jetty-deploy-manager/src/test/resources/jetty-deploymgr-contexts.xml
@@ -17,25 +17,25 @@
</New>
</Set>
- <!-- Lifecycle Listeners -->
- <Call name="addAppLifecycleListener">
+ <!-- LifeCycle Listeners -->
+ <Call name="addAppLifeCycleListener">
<Arg>
- <New class="org.eclipse.jetty.deploy.impl.DefaultDeployer" />
+ <New class="org.eclipse.jetty.deploy.standard.DefaultDeployer" />
</Arg>
</Call>
- <Call name="addAppLifecycleListener">
+ <Call name="addAppLifeCycleListener">
<Arg>
- <New class="org.eclipse.jetty.deploy.impl.DefaultUndeployer" />
+ <New class="org.eclipse.jetty.deploy.standard.DefaultUndeployer" />
</Arg>
</Call>
- <Call name="addAppLifecycleListener">
+ <Call name="addAppLifeCycleListener">
<Arg>
- <New class="org.eclipse.jetty.deploy.impl.DefaultStarter" />
+ <New class="org.eclipse.jetty.deploy.standard.DefaultStarter" />
</Arg>
</Call>
- <Call name="addAppLifecycleListener">
+ <Call name="addAppLifeCycleListener">
<Arg>
- <New class="org.eclipse.jetty.deploy.impl.DefaultStopper" />
+ <New class="org.eclipse.jetty.deploy.standard.DefaultStopper" />
</Arg>
</Call>
