#8105 toolkit-package -> vaadin-package for clarity

svn changeset:22574/svn branch:6.7

diff --git a/build/build.xml b/build/build.xml
index 3a3b94daa939f4e1407b23fbdc40166ef5675f91..039501d4fb700420e2997a8d9a8cea8b8c78762f 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -199,8 +199,8 @@
         <echo>Adding test class files and resources and launcher configuration.</echo>
         <copy todir="${output-dir}/WebContent/WEB-INF/classes">
             <fileset dir="${result-classes-testbench}">
-                <include name="${toolkit-package}/tests/**/*" />
-                <include name="${toolkit-package}/launcher/**" />
+                <include name="${vaadin-package}/tests/**/*" />
+                <include name="${vaadin-package}/launcher/**" />
             </fileset>
             <!-- test resources -->
             <fileset dir="tests/testbench">
@@ -703,9 +703,7 @@
         <property name="javadoc.destdir" value="${output-dir}/WebContent/docs/api"/>
         
         <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client-side">
-            <packageset dir="${result-src-core}">
-                <include name="${toolkit-package}/**" />
-            </packageset>
+            <packageset dir="${result-src-core}"/>
             <doctitle>${javadoc.doctitle}</doctitle>
             <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
             <bottom>${javadoc.bottom}</bottom>