summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.xml9
-rw-r--r--build/package/WebContent/WEB-INF/web.xml18
2 files changed, 0 insertions, 27 deletions
diff --git a/build/build.xml b/build/build.xml
index 26951271ae..7090e3a198 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -698,12 +698,6 @@
</antcall>
</target>
- <target name="compile-widgetset-sampler" unless="compile.only.default-widgetset">
- <antcall target="compile-widgetset">
- <param name="widgetset" value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet"/>
- </antcall>
- </target>
-
<target name="compile-widgetset-optimized" unless="compile.only.default-widgetset">
<antcall target="compile-widgetset">
<param name="widgetset" value="com.vaadin.demo.gwt.OptimizedWidgetSet"/>
@@ -723,7 +717,6 @@
<!-- We can't call these with 'depends' because of the 'unless' specifier. -->
<antcall target="compile-widgetset-default"/>
<antcall target="compile-widgetset-portal-default"/>
- <antcall target="compile-widgetset-sampler"/>
<antcall target="compile-widgetset-optimized"/>
<antcall target="compile-widgetset-colorpicker"/>
</target>
@@ -735,7 +728,6 @@
<parallel threadsperprocessor="1">
<antcall target="compile-widgetset-default"/>
<antcall target="compile-widgetset-portal-default"/>
- <antcall target="compile-widgetset-sampler"/>
<antcall target="compile-widgetset-optimized"/>
<antcall target="compile-widgetset-colorpicker"/>
</parallel>
@@ -771,7 +763,6 @@
<!-- Build each widgetset locally, i.e., not for an installation package. -->
<target name="widgetset-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-default"/>
<target name="widgetset-portal-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-portal-default"/>
- <target name="widgetset-sampler" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-sampler"/>
<target name="widgetset-colorpicker" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-colorpicker"/>
<!-- ================================================================== -->
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 4657968591..2824ca57ff 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -40,20 +40,6 @@
</init-param>
</servlet>
- <!-- Sampler demo application -->
- <servlet>
- <servlet-name>Sampler</servlet-name>
- <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
- <init-param>
- <param-name>application</param-name>
- <param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
- </init-param>
- <init-param>
- <param-name>widgetset</param-name>
- <param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
- </init-param>
- </servlet>
-
<!-- AddressBook demo application -->
<servlet>
<servlet-name>AddressBook</servlet-name>
@@ -171,10 +157,6 @@
<url-pattern>/FeatureBrowser/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>Sampler</servlet-name>
- <url-pattern>/sampler/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
<servlet-name>AddressBook</servlet-name>
<url-pattern>/AddressBook/*</url-pattern>
</servlet-mapping>