You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/06/05 15:12:29 UTC
svn commit: r951711 - in /pivot/trunk: build.xml tutorials-server/.classpath
tutorials/web.xml
Author: gbrown
Date: Sat Jun 5 13:12:28 2010
New Revision: 951711
URL: http://svn.apache.org/viewvc?rev=951711&view=rev
Log:
Add tutorials-server project; stub out ExpenseServlet for QueryServlet tutorial.
Modified:
pivot/trunk/build.xml
pivot/trunk/tutorials-server/.classpath
pivot/trunk/tutorials/web.xml
Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=951711&r1=951710&r2=951711&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Sat Jun 5 13:12:28 2010
@@ -58,6 +58,7 @@ limitations under the License.
<property name="jar.demos-server" value="${ant.project.name}-demos-server-${version}.jar" />
<property name="jar.tools" value="${ant.project.name}-tools-${version}.jar" />
<property name="jar.tutorials" value="${ant.project.name}-tutorials-${version}.jar" />
+ <property name="jar.tutorials-server" value="${ant.project.name}-tutorials-server-${version}.jar" />
<property name="jar.web" value="${ant.project.name}-web-${version}.jar" />
<property name="jar.web-server" value="${ant.project.name}-web-server-${version}.jar" />
<property name="jar.wtk" value="${ant.project.name}-wtk-${version}.jar" />
@@ -272,7 +273,7 @@ limitations under the License.
<!-- Compile all classes (tests included) -->
<target name="compile" description="Compiles all projects"
- depends="charts, core, demos, demos-server, tests, tools, tutorials, web, web-server, wtk, wtk-terra"/>
+ depends="charts, core, demos, demos-server, tests, tools, tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
<!-- Package JAR files -->
<target name="package" description="Packages all projects into JAR files" depends="compile">
@@ -282,6 +283,7 @@ limitations under the License.
<package project="demos-server" jarFile="${jar.demos-server}" title="Demos Server"/>
<package project="tools" jarFile="${jar.tools}" title="Tools"/>
<package project="tutorials" jarFile="${jar.tutorials}" title="Tutorials"/>
+ <package project="tutorials-server" jarFile="${jar.tutorials}" title="Tutorials Server"/>
<package project="web" jarFile="${jar.web}" title="Web"/>
<package project="web-server" jarFile="${jar.web-server}" title="Web Server"/>
<package project="wtk" jarFile="${jar.wtk}" title="WTK"/>
@@ -312,6 +314,7 @@ limitations under the License.
<clean project="tests"/>
<clean project="tools"/>
<clean project="tutorials"/>
+ <clean project="tutorials-server"/>
<clean project="web"/>
<clean project="web-server"/>
<clean project="wtk"/>
@@ -376,6 +379,12 @@ limitations under the License.
<compile project="tutorials"/>
</target>
+ <target name="tutorials-server" depends="core, web, web-server">
+ <compile project="tutorials-server">
+ <fileset dir="web-server" includes="lib/**/*.jar"/>
+ </compile>
+ </target>
+
<target name="web" depends="core">
<compile project="web"/>
</target>
@@ -630,6 +639,17 @@ limitations under the License.
<!-- Generate tutorials WAR -->
<war destfile="${folder.lib}/${ant.project.name}-tutorials.war" webxml="tutorials/web.xml">
<fileset dir="tutorials/${folder.deploy}"/>
+
+ <classes dir="tutorials-server/${folder.bin}"/>
+ <classes dir="tutorials-server/src">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
+ </classes>
+ <lib dir="${folder.lib}">
+ <include name="${jar.core}"/>
+ <include name="${jar.web}"/>
+ <include name="${jar.web-server}"/>
+ </lib>
</war>
</target>
Modified: pivot/trunk/tutorials-server/.classpath
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials-server/.classpath?rev=951711&r1=951710&r2=951711&view=diff
==============================================================================
--- pivot/trunk/tutorials-server/.classpath (original)
+++ pivot/trunk/tutorials-server/.classpath Sat Jun 5 13:12:28 2010
@@ -5,5 +5,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
<classpathentry combineaccessrules="false" kind="src" path="/web"/>
<classpathentry combineaccessrules="false" kind="src" path="/web-server"/>
+ <classpathentry kind="lib" path="/web-server/lib/servlet-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: pivot/trunk/tutorials/web.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/web.xml?rev=951711&r1=951710&r2=951711&view=diff
==============================================================================
--- pivot/trunk/tutorials/web.xml (original)
+++ pivot/trunk/tutorials/web.xml Sat Jun 5 13:12:28 2010
@@ -23,14 +23,23 @@ limitations under the License.
<description>Pivot Tutorials</description>
<display-name>Pivot Tutorials</display-name>
+ <servlet>
+ <servlet-name>ExpenseServlet</servlet-name>
+ <servlet-class>org.apache.pivot.tutorials.webqueries.server.ExpenseServlet</servlet-class>
+ </servlet>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<servlet-mapping>
+ <servlet-name>ExpenseServlet</servlet-name>
+ <url-pattern>/expenses/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jnlp</url-pattern>
</servlet-mapping>
-
</web-app>