[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xalan-cvs
Subject:    svn commit: r1581689 - in /xalan/java/branches/xalan-j_2_7_1_maint: build.xml lib/javaee-api-5.0-2.j
From:       ggregory () apache ! org
Date:       2014-03-26 4:14:18
Message-ID: 20140326041418.93691238883D () eris ! apache ! org
[Download RAW message or body]

Author: ggregory
Date: Wed Mar 26 04:14:18 2014
New Revision: 1581689

URL: http://svn.apache.org/r1581689
Log:
Do not make the build rely on an external classpath. Add jar from Apache OpenEJB.

Added:
    xalan/java/branches/xalan-j_2_7_1_maint/lib/javaee-api-5.0-2.jar   (with props)
Modified:
    xalan/java/branches/xalan-j_2_7_1_maint/build.xml

Modified: xalan/java/branches/xalan-j_2_7_1_maint/build.xml
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/build.xml?rev=1581689&r1=1581688&r2=1581689&view=diff
 ==============================================================================
--- xalan/java/branches/xalan-j_2_7_1_maint/build.xml (original)
+++ xalan/java/branches/xalan-j_2_7_1_maint/build.xml Wed Mar 26 04:14:18 2014
@@ -124,6 +124,8 @@ $Id$
   <!-- Jars to build Xalan Java samples -->
   <property name="servlet-api.jar.name"   value="servlet-api-2.5.jar"/>
   <property name="servlet-api.jar"        \
value="${lib.dir}/${servlet-api.jar.name}"/> +  <property name="javaee-api.jar.name"  \
value="javaee-api-5.0-2.jar"/> +  <property name="javaee-api.jar"         \
value="${lib.dir}/${javaee-api.jar.name}"/>  
   <!-- Relative locations of source directories -->
   <property name="manifest.mf"            value="./src/MANIFEST.MF"/>
@@ -834,7 +836,7 @@ $Id$
           
   <target name="extra.std.samples.nojardepends"
           depends="servlet.jardepends,xsltc.applet.nojardepends,
-                   xsltc.ejb.nojardepends,xsltc.servlet.nojardepends"/>
+                   xsltc.ejb.jardepends,xsltc.servlet.nojardepends"/>
 
   <!-- =================================================================== -->
   <!-- Compiles all samples that require extra non-standard components in  -->
@@ -947,14 +949,16 @@ $Id$
   <!-- ejb.jar must be on the classpath to compile this sample.            -->
   <!-- EJB 2.0 can be found at http://java.sun.com/products/ejb/docs.html  -->
   <!-- =================================================================== -->
-  <target name="xsltc.ejb" depends="jar,xsltc.ejb.nojardepends"/>
+  <target name="xsltc.ejb" depends="jar,xsltc.ejb.jardepends"/>
 
-  <target name="xsltc.ejb.nojardepends">
+  <target name="xsltc.ejb.jardepends">
     <mkdir dir="${build.samples}/CompiledEJB"/>
     <javac srcdir="${samples.dir}/CompiledEJB"
            destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-    	   target="${compiler.target}" source="${compiler.source}"/>
+    	   target="${compiler.target}" source="${compiler.source}">
+    	<classpath location="${javaee-api.jar}"/>
+    </javac>
     <jar jarfile="${build.xsltc.ejb.jar}"
          basedir="${build.samples}/CompiledEJB"
          includes="*.class"/>

Added: xalan/java/branches/xalan-j_2_7_1_maint/lib/javaee-api-5.0-2.jar
URL: http://svn.apache.org/viewvc/xalan/java/branches/xalan-j_2_7_1_maint/lib/javaee-api-5.0-2.jar?rev=1581689&view=auto
 ==============================================================================
Binary file - no diff available.

Propchange: xalan/java/branches/xalan-j_2_7_1_maint/lib/javaee-api-5.0-2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]