Gary, I fixed the (trunk/.classpath) and (trunk/.project) in the repository.
The (trunk/build.xml) looks like it may have significant issues. * Current Revision = 1587983 (Apr 16, 2014) * Previous Revision = 1383083 (Sep 10, 2012) At the end of this message post is a summary of changes to "build.xml" that were committed to the repository. The previous version can be restored to the repository and specific edits applied to handle the versioning and coping with the new endorsed_dir property. <property name="endorsed_dir" value="$(lib.dir)/endorsed"/> I don't understand the properties of: <property name="compler.target" value="1.3"/> <property name="compiler.source" value="1.3"/> Sincerely, Steven J.Hathaway > Gary, > > I performed the merge back into the trunk so that the security patches > that were tested in the branch have a development presence. > > The security patches were the primary difference between the branch > and the trunk. Documentation updates (esp download) are also > merged back into the trunk. > > Lots of JIRA work still remains as JIRA issues and not committed to > the trunk. > > - Steve > >> Yes, in principle, the branches changes should be merged back to trunk . >> The problem I see is that the state of trunk is not known (yet). For >> example, building it has different Java version requirements and I >> cannot >> tell if this is intentional or not. >> >> Gary >> >> >> On Tue, Apr 15, 2014 at 7:48 PM, <[email protected]> wrote: >> >>> FYI: >>> >>> The [Xalan-J] 2.7.2 seems to be implemented in "branches" and the >>> changes not yet merged or committed back into the "trunk". >>> >>> I just finished reviewing the differences and believe that a >>> merge back into the "trunk" is appropriate. >>> >>> I am starting my review of the website documentation. >>> >>> My sincere thanks goes to all those committers and members >>> for their work on the Java security issue. >>> >>> Sincerely, >>> Steven J. Hathaway >>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> For additional commands, e-mail: [email protected] >>> >>> >> >> >> -- >> E-Mail: [email protected] | [email protected] >> Java Persistence with Hibernate, Second >> Edition<http://www.manning.com/bauer3/> >> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/> >> Spring Batch in Action <http://www.manning.com/templier/> >> Blog: http://garygregory.wordpress.com >> Home: http://garygregory.com/ >> Tweet! http://twitter.com/GaryGregory >> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > The (trunk/build.xml) may need some rollback. Here is a summary of what was changed in "build.xml" ---------------------------------------------------- Current commit = 1587983 Previous commit = 1383083 The latest commit added(+) or replaced(=) the following: = <property name="year" value="2014"/> = <property name="version.DEVELOPER" value=""/> + <property name="compiler.target" value="1.3"/> + <property name="compiler.source" value="1.3"/> + <property name="endorsed_dir" value="$(lib.dir)/endorsed"/> = <property name="xmlapis.jar" value="$(endorsed.dir)/$(xmlapis.jar.name)"/> = <property name="parser.jar" value="$(endorsed.dir)/$(parser.jar.name)"/> + <!-- 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}"/> + <property name="brazil.jar.name" value="brazil-2.1.jar"/> + <property name="brazil.jar" value="${lib.dir}/${brazil.jar.name}"/> ------ Added the new <javac> attributes: target="$(compler.target)" source="(compiler.source" to the following items: <target name="xml.compile" ...> <javac srcdir="$(src.dir)" + target="$(compler.target)" + source="(compiler.source" <target name="Xalan-interpretive.compile" ...> <javac srcdir="$(src.dir)" + target="$(compler.target)" + source="(compiler.source" <target name="xsltc.prepare" ...> <javac srcdir="$(src.dir)" + target="$(compler.target)" + source="(compiler.source" <target name="xsite.compile" ...> <javac srcdir="$(src.dir)" + target="$(compler.target)" + source="(compiler.source" <target name="xsite.fcompile" ...> <javac srcdir="$(src.dir)" + target="$(compler.target)" + source="(compiler.source" Section: Compile the samples (servlet excluded) and jars the class files <javac srcdir="$(samples.dir)/SimpleTransform + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/UseStylesheetPI + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/UseStylesheetParam + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/SAX2SAX + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/DOM2DOM + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/Pipe + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/UseXMLFilters + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/Trace + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/ApplyXPathApplyXPathDOM + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/trax + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/extensions + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/Validate + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/TransformThread + target="$(compler.target)" + source="(compiler.source" <javac srcdir="$(samples.dir)/XPathAPI + target="$(compler.target)" + source="(compiler.source" ----- SOME OF THE FOLLOWING COMMITTED CHANGES MAY NEED ROLLBACK HERE WE CHANGED SOME .nojardepends TO .jardepends = <target name="extra.std.samples.nojardepends" = depends="servlet.jardepends, = xsltc.applet.nodepends, = xsltc.ejb.jardepends, = xsltc.serverlet.jardepends"/> = <target name="extra.nonstd.samples.nojardepends" = depends="xsltc.brazil.jardepends"/> = <target name="servlet" = depends="jar.servlet.jardepends"/> = <target name="servlet.jardepends" description = "Compile and jar the servlet samples in xalanservlet.war" > <javac srcdir="$(samples.dir)/servlet" ... + target="$(compler.target)" + source="(compiler.source"> + <classpath location="$(servlet-api.jar)"/> <javac srcdir="$(samples.dir)/translets" ... + target="$(compler.target)" + source="(compiler.source" /> <javac srcdir="$(samples.dir)/CompiledJAXP" ... + target="$(compler.target)" + source="(compiler.source" /> <javac srcdir=$"(samples.dir)/CompiledApplet" ... + target="$(compler.target)" + source="(compiler.source" /> Section: Compiles the XSLTC brazil example and jars the class files. = <target name="xsltc.brazil" = depends="jar.xsltc.brazil.jardepends"/> = <target name="xsltc.brazil.jardepends"> <javac srcdir="$(samples.dir)/CompiledBrazil" ... + target="$(compler.target)" + source="(compiler.source"> + <classpath location="$(servlet-api.jar)"/> Section: EJB 2.0 can be found at http://java.sun.com/products/ejb/docs.html = <target name="xsltc.ejb" = depends="jar.xltc.ejb.jardepends"/> = <target name="xsltc.ejb.jardepends"> <javac srcdir="$(samples.dir)/CompiledEJB" ... + target="$(compler.target)" + source="(compiler.source"> + <classpath location="$(servlet-api.jar)"/> Section: Compiles the XSLTC servlet example and jars from class files. = <target name="xsltc.servlet" = depends="jar.xsltc.servlet.jardepends"/> = <target name="xsltc.servlet.jardepends"> <javac srcdir="$(samples.dir)/Compiled Servlet" + target="$(compler.target)" + source="(compiler.source"> + <classpath location="$(servlet-api.jar)"/> Section: Various targets to clean the build tree <target name="clean" ... > ... + <delete file="$(src.dir)/$(xalan.reldir)/processor/XSLProcessorVersion.java"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
