Add RootProvider for Root selection without custom Application (#8159)

4 files changed, 117 insertions, 0 deletions

diff --git a/server/src/com/vaadin/terminal/AbstractRootProvider.java b/server/src/com/vaadin/terminal/AbstractRootProvider.java
new file mode 100644
index 0000000000..0b63003440
--- /dev/null
+++ b/server/src/com/vaadin/terminal/AbstractRootProvider.java
@@ -0,0 +1,35 @@
+/*

+ * Copyright 2011 Vaadin Ltd.

+ * 

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not

+ * use this file except in compliance with the License. You may obtain a copy of

+ * the License at

+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

+ * License for the specific language governing permissions and limitations under

+ * the License.

+ */

+

+package com.vaadin.terminal;

+

+import com.vaadin.Application;

+import com.vaadin.ui.Root;

+

+public abstract class AbstractRootProvider implements RootProvider {

+

+    @Override

+    public Root instantiateRoot(Application application,

+            Class<? extends Root> type, WrappedRequest request) {

+        try {

+            return type.newInstance();

+        } catch (InstantiationException e) {

+            throw new RuntimeException("Could not instantiate root class", e);

+        } catch (IllegalAccessException e) {

+            throw new RuntimeException("Could not access root class", e);

+        }

+    }

+}

diff --git a/server/src/com/vaadin/terminal/DefaultRootProvider.java b/server/src/com/vaadin/terminal/DefaultRootProvider.java
new file mode 100644
index 0000000000..cbf8c98828
--- /dev/null
+++ b/server/src/com/vaadin/terminal/DefaultRootProvider.java
@@ -0,0 +1,51 @@
+/*

+ * Copyright 2011 Vaadin Ltd.

+ * 

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not

+ * use this file except in compliance with the License. You may obtain a copy of

+ * the License at

+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

+ * License for the specific language governing permissions and limitations under

+ * the License.

+ */

+

+package com.vaadin.terminal;

+

+import com.vaadin.Application;

+import com.vaadin.RootRequiresMoreInformationException;

+import com.vaadin.ui.Root;

+

+public class DefaultRootProvider extends AbstractRootProvider {

+

+    @Override

+    public Class<? extends Root> getRootClass(Application application,

+            WrappedRequest request) throws RootRequiresMoreInformationException {

+        Object rootClassNameObj = application

+                .getProperty(Application.ROOT_PARAMETER);

+

+        if (rootClassNameObj instanceof String) {

+            String rootClassName = rootClassNameObj.toString();

+

+            ClassLoader classLoader = request.getDeploymentConfiguration()

+                    .getClassLoader();

+            if (classLoader == null) {

+                classLoader = getClass().getClassLoader();

+            }

+            try {

+                Class<? extends Root> rootClass = Class.forName(rootClassName,

+                        true, classLoader).asSubclass(Root.class);

+

+                return rootClass;

+            } catch (ClassNotFoundException e) {

+                throw new RuntimeException("Could not find root class", e);

+            }

+        }

+

+        return null;

+    }

+}

diff --git a/server/src/com/vaadin/terminal/RootProvider.java b/server/src/com/vaadin/terminal/RootProvider.java
new file mode 100644
index 0000000000..476cf1bd78
--- /dev/null
+++ b/server/src/com/vaadin/terminal/RootProvider.java
@@ -0,0 +1,29 @@
+/*

+ * Copyright 2011 Vaadin Ltd.

+ * 

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not

+ * use this file except in compliance with the License. You may obtain a copy of

+ * the License at

+ * 

+ * http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

+ * License for the specific language governing permissions and limitations under

+ * the License.

+ */

+

+package com.vaadin.terminal;

+

+import com.vaadin.Application;

+import com.vaadin.RootRequiresMoreInformationException;

+import com.vaadin.ui.Root;

+

+public interface RootProvider {

+    public Class<? extends Root> getRootClass(Application application,

+            WrappedRequest request) throws RootRequiresMoreInformationException;

+

+    public Root instantiateRoot(Application application,

+            Class<? extends Root> type, WrappedRequest request);

+}

diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
index 06bc70872d..52885f3fbb 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
@@ -20,6 +20,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 import com.vaadin.Application;
+import com.vaadin.terminal.DefaultRootProvider;
 import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
 
 /**
@@ -69,6 +70,7 @@ public class ApplicationServlet extends AbstractApplicationServlet {
         // Creates a new application instance
         try {
             final Application application = getApplicationClass().newInstance();
+            application.addRootProvider(new DefaultRootProvider());
 
             return application;
         } catch (final IllegalAccessException e) {