Changed Sampler and Calc back to using ApplicationPortlet so they work without portal...

svn changeset:13855/svn branch:6.4

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 8edf8dc0c668016a4038c6c0782f8bd8d4424194..5a3c3da145112b8b8ec38c0c034ab9b997085954 100644 (file)
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -43,7 +43,7 @@
        <portlet>
                <portlet-name>CalcPortlet</portlet-name>
                <display-name>Calc</display-name>
-               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                <init-param>
                        <name>application</name>
                        <value>com.vaadin.demo.Calc</value>
@@ -78,7 +78,7 @@
        <portlet>
                <portlet-name>SamplerPortlet</portlet-name>
                <display-name>Sampler</display-name>
-               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                <init-param>
                        <name>application</name>
                        <value>com.vaadin.demo.sampler.SamplerApplication</value>