Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 35 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/VerticalLayout.java b/server/src/com/vaadin/ui/VerticalLayout.java
new file mode 100644
index 0000000000..0a13ca9a36
--- /dev/null
+++ b/server/src/com/vaadin/ui/VerticalLayout.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.ui;
+
+/**
+ * Vertical layout
+ * 
+ * <code>VerticalLayout</code> is a component container, which shows the
+ * subcomponents in the order of their addition (vertically). A vertical layout
+ * is by default 100% wide.
+ * 
+ * @author Vaadin Ltd.
+ * @since 5.3
+ */
+@SuppressWarnings("serial")
+public class VerticalLayout extends AbstractOrderedLayout {
+
+    public VerticalLayout() {
+        setWidth("100%");
+    }
+
+}