diff options
| author | dgiormov | 2010-07-07 09:05:49 +0000 |
|---|---|---|
| committer | dgiormov | 2010-07-07 09:05:49 +0000 |
| commit | 1a6654ecaa186bfafa164ce5bb27f524c990bb43 (patch) | |
| tree | 28bf31192cf24bf034d21d849fb3ba21db7fb220 /releng.jeetools | |
| parent | 15da1ed8e04f3733a6e0f6c7bb9fae078762ebe4 (diff) | |
| download | webtools.maps-1a6654ecaa186bfafa164ce5bb27f524c990bb43.tar.gz webtools.maps-1a6654ecaa186bfafa164ce5bb27f524c990bb43.tar.xz webtools.maps-1a6654ecaa186bfafa164ce5bb27f524c990bb43.zip | |
[315423] fixed regression in WebAppMerger
This bug was caused by adapting web merged model to work for Web 3.0 and changes
the behavior of the MergedModel in Web 2.5
Current behavior will ignore certain servlet mappings declarations if they are
defined in Web 1.4 style. where it is possible to have many declarations of
servlet mapping with one and the same servlet name and different url pattern.
Junit tests are added.
Diffstat (limited to 'releng.jeetools')
| -rw-r--r-- | releng.jeetools/maps/jst-j2ee-basic-tests.map | 2 | ||||
| -rw-r--r-- | releng.jeetools/maps/jst-j2ee-basic.map | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/releng.jeetools/maps/jst-j2ee-basic-tests.map b/releng.jeetools/maps/jst-j2ee-basic-tests.map index b0c0c762b..c925f4569 100644 --- a/releng.jeetools/maps/jst-j2ee-basic-tests.map +++ b/releng.jeetools/maps/jst-j2ee-basic-tests.map @@ -6,7 +6,7 @@ ! from the HEAD branch plugin@org.eclipse.jst.j2ee.core.tests=v201004141630,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.core.tests -plugin@org.eclipse.jst.j2ee.tests=v201006030217,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.tests +plugin@org.eclipse.jst.j2ee.tests=v201007070907,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.j2ee.tests plugin@org.eclipse.jst.servlet.tests=v201004110600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.servlet.tests plugin@org.eclipse.jst.validation.sample=v201005270700,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.sample plugin@org.eclipse.jst.validation.test=v20100411,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/tests/org.eclipse.jst.validation.test diff --git a/releng.jeetools/maps/jst-j2ee-basic.map b/releng.jeetools/maps/jst-j2ee-basic.map index 16dab5452..42962a3ca 100644 --- a/releng.jeetools/maps/jst-j2ee-basic.map +++ b/releng.jeetools/maps/jst-j2ee-basic.map @@ -13,7 +13,7 @@ plugin@org.eclipse.jst.j2ee.core=v201006211500,:pserver:anonymous@dev.eclipse.or plugin@org.eclipse.jst.j2ee.web=v201007021528,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.j2ee.web plugin@org.eclipse.jst.servlet.ui=v201006221437,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.servlet.ui -plugin@org.eclipse.jst.jee=v201005191301,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee -plugin@org.eclipse.jst.jee.web=v201007070823,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.web +plugin@org.eclipse.jst.jee=v201007070907,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee +plugin@org.eclipse.jst.jee.web=v201007070907,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,jeetools/plugins/org.eclipse.jst.jee.web !***************
\ No newline at end of file |