4:43 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2012-07-20 05:43:23 -0400 (Fri, 20 Jul 2012)
New Revision: 443
Removed:
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties
Modified:
core/trunk/distribution/main/resouces/samples/ant/build.xml
core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml
Log:
[WISE-177] Fixing helloWorldServlet distribution sample
Modified: core/trunk/distribution/main/resouces/samples/ant/build.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-20 09:42:01 UTC
(rev 442)
+++ core/trunk/distribution/main/resouces/samples/ant/build.xml 2012-07-20 09:43:23 UTC
(rev 443)
@@ -98,6 +98,9 @@
<metainf dir="./resources/META-INF">
</metainf>
</jar>
+ </target>
+
+ <target name="war" depends="compile">
<war webxml="./resources/WEB-INF/web.xml"
jarfile="${build.server.dir}/${ant.project.name}.war">
<classes dir="${classes.java.server.dir}" />
<webinf dir="./resources/WEB-INF">
@@ -106,11 +109,11 @@
</war>
</target>
- <target name="deployTestWS" depends="jar"
description="Deploys the server side archive of the current test">
+ <target name="deployTestWS" depends="war"
description="Deploys the server side archive of the current test">
<copy todir="${JBossHome}/${ServerConfig}/deployments/"
file="${build.server.dir}/${ant.project.name}.war" />
</target>
- <target name="undeployTestWS" depends="jar"
description="Undeploys the server side archive of the current test">
+ <target name="undeployTestWS" description="Undeploys the server
side archive of the current test">
<delete
file="${JBossHome}/${ServerConfig}/deployments/${ant.project.name}.war"/>
</target>
Modified: core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt 2012-07-20
09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/helloWorldServlet/README.txt 2012-07-20
09:43:23 UTC (rev 443)
@@ -1,13 +1,14 @@
-This example is little different from others since it demonstrate the use of wise in a
web application.
+This example is little different from others since it demonstrates the use of Wise in a
web application.
-This sample needs a jboss-4.x application server or at least a servlet container.
+This sample needs JBoss Application Server 7.
-To run this sample you have simply to call ant deployTestWS which will deploy a war with
the "server side" webservice.
+To run this sample you have simply to call "ant deployTestWS" which will deploy
a war with the "server side" webservice.
Then call "ant deployServlet" to deploy a war containing the "client"
servlet and all needed libraries. To call the servlet point your browser to
http://localhost:8080/HelloWorld-servlet/HelloWorldServlet?NAME=superman
Then change the name of you preferred super hero ;)
-Please note that Wise client servlet can't stay on the same war of the "server
side" webserver due to a conflict in library used by jbossws to provide webservice
facilities and ones used to invoke tools.
+You can undeploy the "client" servlet using "ant undeployServlet".
+
Have fun.
Deleted: core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties
===================================================================
---
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties 2012-07-20
09:42:01 UTC (rev 442)
+++
core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.properties 2012-07-20
09:43:23 UTC (rev 443)
@@ -1,3 +0,0 @@
-JBossHome=/dati/jboss-4.2.3.GA/
-ServerConfig=default
-JavaHome=/usr/lib/jvm/java-1.5.0-sun
Modified: core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml
===================================================================
--- core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml 2012-07-20
09:42:01 UTC (rev 442)
+++ core/trunk/distribution/main/resouces/samples/helloWorldServlet/build.xml 2012-07-20
09:43:23 UTC (rev 443)
@@ -6,7 +6,6 @@
<project name="HelloWorld" default="compile"
basedir=".">
<property name="server.classes.additional.dir"
value="classes/client" />
- <property name="includeWiseInWar" value="true" />
<property file="${basedir}/build.properties" />
@@ -20,18 +19,21 @@
<include name="*"/>
</webinf>
<lib dir="${lib.dir}">
- <include name="commons-io-*.jar"
if="includeWiseInWar"/>
- <include name="commons-lang-*.jar"
if="includeWiseInWar"/>
- <include name="milyn*.jar"
if="includeWiseInWar"/>
- <include name="jaxws-tools*.jar"
if="includeWiseInWar"/>
- <include name="*.jar" if="includeWiseInWar"/>
+ <include name="wise-*.jar"/>
+ <include name="milyn-*.jar"/>
</lib>
-
+ <manifest>
+ <attribute name="Dependencies"
value="org.jboss.ws.cxf.jbossws-cxf-client,org.apache.cxf.impl
optional,org.apache.commons.io,org.apache.commons.lang"/>
+ </manifest>
</war>
</target>
- <target name="deployServlet" depends="servletWar"
description="Deploys the server side archive of the current test">
- <copy todir="${JBossHome}/server/${ServerConfig}/deploy/"
file="${build.server.dir}/${ant.project.name}-servlet.war" />
+ <target name="deployServlet" depends="servletWar"
description="Deploys the client side archive of the current test">
+ <copy todir="${JBossHome}/${ServerConfig}/deployments/"
file="${build.server.dir}/${ant.project.name}-servlet.war" />
</target>
+ <target name="undeployServlet" description="Undeploys the client side
archive of the current test">
+ <delete
file="${JBossHome}/${ServerConfig}/deployments/${ant.project.name}-servlet.war"
/>
+ </target>
+
</project>