cvs commit: jakarta-jetspeed/build build.properties build.xml
taylor 02/03/22 10:20:21
Modified:buildbuild.properties build.xml
Log:
Log:
o Add - unittest target for basic tests
o Add - removed generation of castor-generated PSML
Revision ChangesPath
1.10 +1 -1 jakarta-jetspeed/build/build.properties
Index: build.properties
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties 20 Jan 2002 16:18:51 - 1.9
+++ build.properties 22 Mar 2002 18:20:21 - 1.10
@@ -17,7 +17,7 @@
# resin.home.12=c:\resin-1.2.5
# resin.home.13=c:\resin-1.3
tomcat.home.32=d:/server/tomcat
-tomcat.home.40=g:/server/catalina
+tomcat.home.40=/apache/catalina
# orion.home.14=c:\orion-1.4.5
# weblogic.home.51=c:\weblogic-5.1
#install.war=/apache/catalina/webapps
1.127 +29 -27jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build.xml 4 Mar 2002 14:39:44 - 1.126
+++ build.xml 22 Mar 2002 18:20:21 - 1.127
@@ -386,26 +386,6 @@
target name=apis depends=prepare_apis unless=apis.uptodate
-!-- regen psml --
-
-delete quiet=true
-fileset dir=${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup
-exclude name=CVS/
-exclude name=package.html/
-/fileset
-/delete
-
-java classname=org.exolab.castor.builder.SourceGenerator fork=yes
-classpath refid=classpath/
-arg value=-i /
-arg value=${src.xml.dir}/psml.xsd /
-arg value=-f /
-arg value=-dest /
-arg value=${src.java.dir} /
-arg value=-package /
-arg value=org.apache.jetspeed.xml.api.portletmarkup /
- /java
-
!-- regen jcm --
delete quiet=true
@@ -649,10 +629,10 @@
formatter type=plain usefile=false/
-!-- Cactus unit tests --
test name=org.apache.jetspeed.modules.actions.TestJLoginUser/
test
name=org.apache.jetspeed.services.portletcache.TestTurbineCache/
+
/junit
/target
@@ -676,9 +656,10 @@
formatter type=plain usefile=false/
-!-- Cactus unit tests --
+!-- Cactus unit tests --
test name=org.apache.jetspeed.modules.actions.TestJLoginUser/
test
name=org.apache.jetspeed.services.portletcache.TestTurbineCache/
+
/junit
/target
@@ -785,6 +766,32 @@
/target
!-- === --
+!-- Run the client JUnit test cases (non-cactus)--
+!-- === --
+target name=unittest
+
+junit printsummary=yes haltonfailure=yes haltonerror=yes fork=yes
+
+classpath
+pathelement location=${build.dest.dir}/
+path refid=classpath/
+
+pathelement location=${junit.jar}/
+pathelement location=${cactus-23.jar}/
+
+/classpath
+
+formatter type=plain usefile=false/
+
+!-- JUnit unit tests --
+ test
name=org.apache.jetspeed.services.psmlmanager.TestMarshalPsml/
+
+/junit
+/target
+
+
+
+!-- === --
!-- Rebuilds everything --
!-- This is a little quicker than clean; build because there is no--
!-- second JVM bootup. --
@@ -802,11 +809,6 @@
fileset dir=${build.dir}
!-- Everything in the build lib dir --
exclude name=CVS/
-/fileset
-fileset dir=${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup
-exclude name=CVS/
-exclude name=**.html/
-include name=**.java/
/fileset
fileset dir=${src.java.dir}/org/apache/jetspeed/xml/api/jcm
exclude name=CVS/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-jetspeed/build build.properties build.xml
Hi, -#install.war=/apache/catalina/webapps +install.war=/apache/catalina/webapps ...but what if you don't work this way... Can I suggest that we put the default install.war setting back into the build.xml (I believe it gets overridden by anything in build.properties). We could then move the build.properties file to something like build.properties.sample - and remove the actual build.properties file from CVS - people can then have their local overrides? I am not 100% on the best use of ant - so I maybe way off target here - but the current settings in CVS mean that the install target is useless for me... and I am selfish ;-) Just my one euro worth... Chris = Need somewhere to Live in London? - Then go to http://freeflats.com __ Do You Yahoo!? Buy the perfect holiday gifts at Yahoo! Shopping. http://shopping.yahoo.com -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-jetspeed/build build.properties build.xml
-#install.war=/apache/catalina/webapps +install.war=/apache/catalina/webapps Okay, I seem to have the unique need for a hot deploy of the class files. So I will change my 'deploy' target to use another property, and follow your suggestions below for the install target. Although I really don't understand what you are doing, copying files to bin/webapp. But hell, if that works for you then Im happy as long as you dont break my stuff. Can I suggest that we put the default install.war setting back into the build.xml (I believe it gets overridden by anything in build.properties). We could then move the build.properties file to something like build.properties.sample - and remove the actual build.properties file from CVS - people can then have their local overrides? I am not 100% on the best use of ant - so I maybe way off target here - but the current settings in CVS mean that the install target is useless for me... and I am selfish ;-) Just my one euro worth... Chris = Need somewhere to Live in London? - Then go to http://freeflats.com __ Do You Yahoo!? Buy the perfect holiday gifts at Yahoo! Shopping. http://shopping.yahoo.com -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/build build.properties build.xml
taylor 01/12/03 08:49:38
Modified:buildbuild.properties build.xml
Log:
- gave 'deploy' target its own property for deploy.dir, restored 'install' target
for CK
Revision ChangesPath
1.6 +2 -2 jakarta-jetspeed/build/build.properties
Index: build.properties
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 2001/12/03 03:03:08 1.5
+++ build.properties 2001/12/03 16:49:37 1.6
@@ -20,5 +20,5 @@
tomcat.home.40=g:/server/catalina
# orion.home.14=c:\orion-1.4.5
# weblogic.home.51=c:\weblogic-5.1
-install.war=/apache/catalina/webapps
-
+#install.war=/apache/catalina/webapps
+deploy.war=/apache/catalina/webapps
1.116 +3 -2 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- build.xml 2001/12/03 03:03:08 1.115
+++ build.xml 2001/12/03 16:49:37 1.116
@@ -53,7 +53,7 @@
property name=project.fullname value=Jetspeed Portal Implementation/
property name=project.name value=jetspeed/
-property name=project.version value=1.3a2-dev/
+property name=project.version value=1.3a2-release/
!-- === --
!-- Set the properties related to the source tree --
@@ -80,6 +80,7 @@
property name=build.dest.dir value=${build.dir}/classes/
property name=javadocs.destdir value=docs/api/
property name=release.dir value=${project.name}-${project.version}//
+ property name=install.war value=${build.dir}/webapp/
!-- Miscellaneous settings --
@@ -477,7 +478,7 @@
!-- Installs JetSpeed on a local server --
!-- === --
target name=deploy depends=compile description=Hot deploys Jetspeed
classes on a local server
-copy todir=${install.war}/jetspeed/WEB-INF/classes
+copy todir=${deploy.war}/jetspeed/WEB-INF/classes
fileset dir=${build.dest.dir}
!-- Do not include test files in the runtime jar --
exclude name=**/Test*.*/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
RE: cvs commit: jakarta-jetspeed/build build.properties build.xml
Hi, Okay, I seem to have the unique need for a hot deploy of the class files. So I will change my 'deploy' target to use another property, and follow your suggestions below for the install target. I guess you copy your webapp into tomcats webapps/jetspeed directory or similar. Then tomcat auto-creates a context for it Although I really don't understand what you are doing, copying files to bin/webapp. Whereas I like to give myself more work to do ... and create a context for jetspeed in tomcat, which then points at my jetspeed workarea. I get the same hot deploy on classes etc, but all the jetspeed files are in one area... Chris = Need somewhere to Live in London? - Then go to http://freeflats.com __ Do You Yahoo!? Buy the perfect holiday gifts at Yahoo! Shopping. http://shopping.yahoo.com -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-jetspeed/build build.properties build.xml
1) Should the property install.war use the environment variable
TOMCAT_HOME or CATALINA_HOME, i.e. install.war=${CATALINA_HOME}/webapps
2) Should the property tomcat.home.40 use the environment variable
CATALINA_HOME, i.e. tomcat.home.40=${CATALINA_HOME}
Paul Spencer
[EMAIL PROTECTED] wrote:
taylor 01/11/01 20:05:39
Modified:buildbuild.properties build.xml
Log:
added 'install' target patch from Ignacio Ortega
Revision ChangesPath
1.3 +2 -0 jakarta-jetspeed/build/build.properties
Index: build.properties
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 2001/09/20 13:49:57 1.2
+++ build.properties 2001/11/02 04:05:39 1.3
@@ -20,3 +20,5 @@
tomcat.home.40=g:/server/catalina
# orion.home.14=c:\orion-1.4.5
# weblogic.home.51=c:\weblogic-5.1
+install.war=/apache/catalina/webapps
+
1.106 +26 -0 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- build.xml 2001/10/08 17:54:02 1.105
+++ build.xml 2001/11/02 04:05:39 1.106
@@ -434,6 +434,32 @@
/war
/target
+
+
+!-- === --
+!-- Installs JetSpeed on a local server --
+!-- === --
+target name=install depends=jar description=installs Jetspeed on a
local server
+copy todir=${install.war}/jetspeed
+fileset dir=${webapp.dir}/
+/copy
+copy todir=${install.war}/jetspeed/WEB-INF/lib
+fileset dir=${lib.dir}
+include name=*.jar/
+exclude name=servlet*.jar/
+/fileset
+/copy
+copy todir=${install.war}/jetspeed/WEB-INF/classes
+fileset dir=${build.dest.dir}
+!-- Do not include test files in the runtime jar --
+ exclude name=**/Test*.*/
+ exclude name=**/test*.*/
+
+!-- Also exclude the test cactus.properties file --
+exclude name=cactus.properties/
+/fileset
+/copy
+/target
!-- === --
!-- Creates a binary release war file with javadocs API --
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-jetspeed/build build.properties build.xml
sgala 01/09/20 06:49:57
Modified:buildbuild.properties build.xml
Log:
Making changes for cactus tests. Patch from Sam Ruby
Revision ChangesPath
1.2 +3 -3 jakarta-jetspeed/build/build.properties
Index: build.properties
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 2001/05/25 20:03:35 1.1
+++ build.properties 2001/09/20 13:49:57 1.2
@@ -3,9 +3,9 @@
# the command line when starting Ant with the -D switch
servlet.jar = lib/servlet_2_2.jar
-cactus-22.jar = build/lib/commons-cactus-22.jar
-cactus-23.jar = build/lib/commons-cactus-23.jar
-cactus.ant.jar = build/lib/commons-cactus-ant.jar
+cactus-22.jar = build/lib/cactus-22.jar
+cactus-23.jar = build/lib/cactus-23.jar
+cactus.ant.jar = build/lib/cactus-ant.jar
junit.jar=build/lib/junit.jar
# Servlet engine locations for the tests
1.104 +1 -1 jakarta-jetspeed/build/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- build.xml 2001/09/08 15:02:56 1.103
+++ build.xml 2001/09/20 13:49:57 1.104
@@ -140,7 +140,7 @@
echo message=junit.jar = ${junit.jar}/
!-- Initialize custom Ant task needed for running the server tests --
-taskdef name=runservertests
classname=org.apache.commons.cactus.ant.RunServerTestsTask
+taskdef name=runservertests
classname=org.apache.cactus.ant.RunServerTestsTask
classpath
pathelement location=${cactus.ant.jar}/
/classpath
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
