use comparator to fine tune delivered bundles

2 files changed, 49 insertions, 1 deletions

diff --git a/releng/maps/comparatorfilter.properties b/releng/maps/comparatorfilter.properties
new file mode 100644
index 000000000..02dab4cda
--- /dev/null
+++ b/releng/maps/comparatorfilter.properties
@@ -0,0 +1,48 @@
+
+
+! Comparitor log messages start with a line identifing comparitor used, and date ran, and then a 
+! sequence of 3 (sometimes 4) lines describing the differences found by comparator. 
+
+! line 1      summary             type (canonical, archive, etc), bundle, and version info 
+! line 2      comparison          exact repositories being compared
+! line 3      reason              brief description of the differnce found (or errors or exceptions in processing)
+! line 4      extraDetail         a bit more details about errors found (variable, only a few messages have 4 lines)
+!
+! Rules on which messages are significant, or unexpected, are specified as three regex expresssions, 
+! one for each of 
+! the (first) three lines above (the forth, "extra detail" is not considered). All three rules, must 
+! "match" all three 
+! lines. By carefully crafting the rules, you can get some rule to apply too all comparator messages, 
+! (e.g. ignore any message 
+! stating the about.mappings files are different) or ignore only a certain message for a a certain 
+! bundle/version (e.g. 
+! ignore differences in build.xml file, but only in the org.eclipse.jst.jsf.doc.user bundle). 
+! Note that the three parts of a comparator message must match all three parts of an exclude rule, 
+! but for simplicity, if a rule part is empty or null, it is interpreted to mean "match anything" for 
+! that message part. 
+
+comparator.aboutmappings.summary = 
+comparator.aboutmappings.comparison = 
+comparator.aboutmappings.reason = ^In about\\.mappings, the property \"0\" has different values.*$
+
+comparator.testjar.summary = .*org.eclipse.jst.j2ee.tests.*
+comparator.testjar.comparison = 
+comparator.testjar.reason = ^IOException comparing.*sourceartifactTestData_ClasspathDependencyTests_Test1_jar.*$
+
+comparator.testcorruptjar.summary = .*org.eclipse.wst.jsdt.core.tests.model.*
+comparator.testcorruptjar.comparison = 
+comparator.testcorruptjar.reason = ^IOException comparing.*sourceartifactworkspace_JavaSearch_corrupt_jar.*$
+
+comparator.docbuildxml.summary = .*(\
+org.eclipse.wst.xsl.sdk.documentation|\
+org.eclipse.wst.xsl.doc|\
+org.eclipse.wst.server.ui.doc.user|\
+org.eclipse.jst.server.ui.doc.user|\
+org.eclipse.jst.ws.jaxws.doc.user|\
+osgi.bundle,org.eclipse.jst.jsf.doc.user\
+).*$
+comparator.docbuildxml.comparison = 
+comparator.docbuildxml.reason = ^Binary file build\\.xml: sizes differ by.*$
+
+
+
diff --git a/releng/maps/wtp-releng.map b/releng/maps/wtp-releng.map
index 3765b4ed3..c7dfee5fc 100644
--- a/releng/maps/wtp-releng.map
+++ b/releng/maps/wtp-releng.map
@@ -4,7 +4,7 @@
 !* used in our releng tests, when JUnits run
 feature@org.eclipse.wtp.releng.tests.feature=v201005241530,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/features/org.eclipse.wtp.releng.tests.feature
 plugin@org.eclipse.wtp.releng.versionchecker=v201005261451,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/org.eclipse.wtp.releng.versionchecker
-plugin@org.eclipse.wtp.releng.tests=v201006070045,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
+plugin@org.eclipse.wtp.releng.tests=v201009190408,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/tests/org.eclipse.wtp.releng.tests
 
 !* what's this do?
 plugin@org.eclipse.wtp.releng.wtpbuilder=v201004092124,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,webtools.releng/releng.wtptools/api/org.eclipse.wtp.releng.wtpbuilder