Skip to content

Commit 726ed69

Browse files
Update comments on current status of xalan-test integration.
1 parent 58d2a42 commit 726ed69

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

integration-tests/pom.xml

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,43 @@
6161
</configuration>
6262
</plugin>
6363

64-
<!-- Invoke sibling xalan-test project for conformance tests.
65-
66-
Warning: Some of the tasks and tools written for xalan-test
64+
<!-- Invoke sibling xalan-test project for conformance tests?
65+
Ideally we want that done before packaging, so a current
66+
conformance run (at least the essential targets) is run
67+
befroe the tests and results are bundled into the
68+
source distribution archive file.
69+
70+
Unfortunately there are a number of complications.
71+
72+
1) The right time to run this would be just before the package
73+
phase, to ensure the most current results are included in
74+
that package. Unfortunately as currently written the tests
75+
are taking advantage of packaging to avoid having to
76+
specify the version number as part of the jarfile
77+
names. Simplest fix may be to change the xalan-test
78+
classpaths for xalan to reference our target/*
79+
(the only form of wildcard permitted in classpaths,
80+
acceptable here since it's only be the xalan products),
81+
or to have the copy-dependencies run in pre-package.
82+
83+
2) Some of the tasks and tools written for xalan-test
6784
assumed they were being executed from the xalan-test/
6885
directory, and the maven-antrun-plugin does not seem to
6986
offer a good way to change "current directory" before
7087
running, no matter whether <ant> or <subant> is used.
7188
Similarly, some of the classpath setup for xalan-test was
7289
being done in the front-end build.* scripts rather than in
73-
the actual ant build.xml.
90+
the actual ant build.xml.
7491
7592
We could/should at some point rationalize the test driver
76-
But exec:exec does appear to allow setting <workingdirectory>,
77-
and adding to the classpath via -lib.
78-
79-
It isn't as pretty as using the <antrun> task would be.
80-
But it appears to do the job.
93+
But exec:exec does appear to allow setting
94+
<workingdirectory>, and adding to the classpath via
95+
-lib. It isn't as pretty as using the <antrun> task would
96+
be. But it appears to do the job.
8197
82-
NOTE TOO: If we want to include the results of this test in
83-
the source distribution archives, this needs to run before
84-
"package". THAT IS NOT WHAT IS CURRENTLY HAPPENING.
85-
Maven only supports dependencies at the module level,
86-
with phase ordering only guaranteed within each module,
87-
so the fix appears to be to break this out into
88-
another module and make distribution depend upon it
98+
It is actually unclear that this automatic xalan-test run
99+
was being done by the ant build. If it wasn't, we could
100+
defer this... but it's desirable for source packaging if/when.
89101
-->
90102
<plugin>
91103
<groupId>org.codehaus.mojo</groupId>
@@ -94,7 +106,7 @@
94106
<executions>
95107
<execution>
96108
<id>xalan-test attempt</id>
97-
<phase>test</phase>
109+
<phase>pre-</phase>
98110
<goals>
99111
<goal>exec</goal>
100112
</goals>

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,11 @@
533533
<artifactId>xalansamples</artifactId>
534534
<version>${project.version}</version>
535535
</dependency>
536+
<dependency>
537+
<groupId>xalan</groupId>
538+
<artifactId>integration-test</artifactId>
539+
<version>${project.version}</version>
540+
</dependency>
536541

537542
<!-- For javadoc generation only. Which of the two 'xalan2jtaglet*'
538543
artifacts is used, is determined automatically by Maven profiles

0 commit comments

Comments
 (0)