Author: ptahchiev
Date: Wed Oct 1 12:50:26 2008
New Revision: 700896
URL: http://svn.apache.org/viewvc?rev=700896&view=rev
Log:
last changes on the ejb sample to be run with Ant.
Modified:
jakarta/cactus/trunk/samples/build.properties
jakarta/cactus/trunk/samples/ejb/build.xml
jakarta/cactus/trunk/samples/ejb/ivy.xml
Modified: jakarta/cactus/trunk/samples/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/build.properties?rev=700896&r1=700895&r2=700896&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/build.properties (original)
+++ jakarta/cactus/trunk/samples/build.properties Wed Oct 1 12:50:26 2008
@@ -30,15 +30,16 @@
cactus.build.dir=${target.dir}/cactus/
cactus.src.dir=${basedir}/src/main/cactus/
src.dir=${basedir}/src/main/java/
+src.test.dir=${basedir}/src/test/java/
src.application.dir=${basedir}/src/main/app
meta.inf.dir=${basedir}/src/main/resources
src.webapp.dir=${basedir}/src/main/webapp
src.conf.dir=${basedir}/src/main/resources/conf/
-servlet.project.name=samples-servlet-${cactus.version}
-ejb.project.name=samples-ejb-${cactus.version}
-ejb3.project.name=samples-ejb3-${cactus.version}
+servlet.project.name=cactus.samples.servlet-${cactus.version}
+ejb.project.name=cactus.samples.ejb-${cactus.version}
+ejb3.project.name=cactus.samples.ejb3-${cactus.version}
servlet.archive.name=${target.dir}/${servlet.project.name}.${cactus.sample.archive.type}
ejb.archive.name=${target.dir}/${ejb.project.name}.${cactus.sample.archive.type}
Modified: jakarta/cactus/trunk/samples/ejb/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/build.xml?rev=700896&r1=700895&r2=700896&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/build.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/build.xml Wed Oct 1 12:50:26 2008
@@ -119,7 +119,10 @@
<javac srcdir="${src.dir}"
destdir="${build.dir}"
classpathref="cactus.classpath"/>
-
+
+ <javac srcdir="${src.test.dir}"
+ destdir="${build.dir}"
+ classpathref="cactus.classpath"/>
</target>
@@ -198,15 +201,12 @@
<classpath>
<path refid="cactus.classpath"/>
<pathelement location="${build.dir}"/>
- <pathelement location="${cactus.build.dir}"/>
- <pathelement location="${basedir}/cactus"/>
- <path refid="jboss.client"/>
</classpath>
<containerset>
- <cargo containerId="${jboss.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log"
home="${jboss.home}">
- <!--zipUrlInstaller
-
installUrl="http://heanet.dl.sourceforge.net/sourceforge/jboss/jboss-4.0.2.zip";
- installDir="target/${jboss.container.id}"/-->
+ <cargo containerId="${jboss.container.id}"
output="${logs.dir}/output.log" log="${logs.dir}/cargo.log">
+ <zipUrlInstaller
+
installUrl="http://heanet.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA.zip";
+ installDir="install"/>
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
<property name="cargo.logging"
value="${cargo.logging}"/>
@@ -217,10 +217,19 @@
<formatter type="${cactus.formatter.type}"/>
<batchtest todir="${reports.dir}">
- <fileset dir="${src.dir}">
+ <fileset dir="${src.test.dir}">
<include name="**/Test*.java"/>
</fileset>
</batchtest>
</cactus>
</target>
+
+ <!--
+ ========================================================================
+ Clean the build directory.
+ ========================================================================
+ -->
+ <target name="clean" depends="init">
+ <delete dir="${target.dir}"/>
+ </target>
</project>
Modified: jakarta/cactus/trunk/samples/ejb/ivy.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ejb/ivy.xml?rev=700896&r1=700895&r2=700896&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ejb/ivy.xml (original)
+++ jakarta/cactus/trunk/samples/ejb/ivy.xml Wed Oct 1 12:50:26 2008
@@ -31,8 +31,8 @@
<dependency org="aspectj" name="aspectjrt" rev="1.5.3"/>
<dependency org="xerces" name="xercesImpl" rev="2.6.2"/>
- <dependency org="org.codehaus.cargo" name="cargo-core-uberjar"
rev="1.0-alpha-4"/>
- <dependency org="org.codehaus.cargo" name="cargo-ant"
rev="1.0-alpha-4"/>
+ <dependency org="org.codehaus.cargo" name="cargo-core-uberjar"
rev="1.0-SNAPSHOT"/>
+ <dependency org="org.codehaus.cargo" name="cargo-ant"
rev="1.0-SNAPSHOT"/>
<dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
<dependency org="javax.servlet" name="servlet-api" rev="2.5"/>
@@ -43,6 +43,7 @@
<dependency org="jdom" name="jdom" rev="1.0"/>
<dependency org="jaxen" name="jaxen" rev="1.1.1"/>
+ <dependency org="junit" name="junit" rev="3.8.2"/>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
