Index: build-common.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/build-common.xml,v
retrieving revision 1.49
diff -u -r1.49 build-common.xml
--- build-common.xml	21 Jul 2005 03:39:59 -0000	1.49
+++ build-common.xml	22 Jul 2005 22:29:47 -0000
@@ -45,13 +45,16 @@
   	   plugins as plugin versions can only include numbers in the format 
   	   major.minor.patch -->
 
+         <!-- cactus.j2ee.version.minor is define in the build.xml dist task -->
+  <property name="cactus.j2ee.version" value="${cactus.j2ee.version.major}${cactus.j2ee.version.minor}"/>
   <property name="project.version.major" value="1"/>
   <property name="project.version.minor" value="8"/>
   <property name="project.version.suffix" value="dev"/>
   <property name="project.version.suffix.timestamp" value=""/>
 
   <property name="project.version"
-    value="${project.version.major}.${project.version.minor}${project.version.suffix}${project.version.suffix.timestamp}"/>
+    value="${cactus.j2ee.version}-${project.version.major}.${project.version.minor}${project.version.suffix}${project.version.suffix.timestamp}"/>
+
 
   <!-- Used for the web site. Note: The property must not be ${project.version}
   	   as ${project.version.suffix.timestamp} is overriden by the nightly build
Index: build.properties.default
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/build.properties.default,v
retrieving revision 1.9
diff -u -r1.9 build.properties.default
--- build.properties.default	21 Jul 2005 03:39:59 -0000	1.9
+++ build.properties.default	23 Jul 2005 20:56:27 -0000
@@ -58,6 +58,12 @@
 # redistributable. You can download it manually here:
 #   http://java.sun.com/j2ee/sdk_1.2.1/
 
+# J2EE major and minor version to include in the dist version number
+# default is 13 for j2ee-1.3
+
+cactus.j2ee.version.major=1
+cactus.j2ee.version.minor=3
+
 # The J2EE API version to use
 j2ee.jar = ${j2ee.13.jar}
 
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-cactus/build.xml,v
retrieving revision 1.77
diff -u -r1.77 build.xml
--- build.xml	21 Jul 2005 03:39:59 -0000	1.77
+++ build.xml	22 Jul 2005 22:43:18 -0000
@@ -95,7 +95,7 @@
     </ant>
     <ant antfile="integration/ant/build.xml" inheritAll="false" 
         target="dist">
-      <property name="j2ee.jar" value="${j2ee.13.jar}"/>
+        <property name="j2ee.jar" value="${j2ee.13.jar}"/>
       <property name="servlet.jar" value="${servlet.23.jar}"/>
       <property name="clover.enable" value="true"/>
       <property name="env" value="${env}"/>
@@ -110,7 +110,7 @@
     </ant>
     <ant antfile="samples/servlet/build.xml" inheritAll="false" 
         target="dist">
-      <property name="servlet.jar" value="${servlet.23.jar}"/>
+       <property name="servlet.jar" value="${servlet.23.jar}"/>
       <property name="j2ee.jar" value=""/>
       <property name="clover.enable" value="true"/>
       <property name="env" value="${env}"/>