Merge branch 'master' into layoutgraph

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/DeploymentConfiguration.java b/src/com/vaadin/terminal/DeploymentConfiguration.java
index ddb42349d8..160350ca24 100644
--- a/src/com/vaadin/terminal/DeploymentConfiguration.java
+++ b/src/com/vaadin/terminal/DeploymentConfiguration.java
@@ -5,11 +5,15 @@
 package com.vaadin.terminal;
 
 import java.io.Serializable;
+import java.util.Iterator;
 import java.util.Properties;
 
 import javax.portlet.PortletContext;
 import javax.servlet.ServletContext;
 
+import com.vaadin.terminal.gwt.server.VaadinContext;
+import com.vaadin.terminal.gwt.server.VaadinContextListener;
+
 /**
  * Provide deployment specific settings that are required outside terminal
  * specific code.
@@ -110,4 +114,10 @@ public interface DeploymentConfiguration extends Serializable {
      * @return properties for the application.
      */
     public Properties getInitParameters();
+
+    public Iterator<VaadinContextListener> getContextListeners();
+
+    public VaadinContext getVaadinContext();
+
+    public void setVaadinContext(VaadinContext vaadinContext);
 }