[306732] Update Tomcat publishing to honor customized names for binary child modules
[310333] Update PublishHelper to support publishing of binary modules
diff --git a/releng.servertools/maps/jst-server.map b/releng.servertools/maps/jst-server.map
index 3f4621f..ddee63a 100644
--- a/releng.servertools/maps/jst-server.map
+++ b/releng.servertools/maps/jst-server.map
@@ -10,7 +10,7 @@
 plugin@org.eclipse.jst.server.generic.core=v20090817,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.core
 plugin@org.eclipse.jst.server.generic.ui=v201004110600,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.generic.ui
 
-plugin@org.eclipse.jst.server.tomcat.core=v20100423,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.core
+plugin@org.eclipse.jst.server.tomcat.core=v20100425,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.core
 plugin@org.eclipse.jst.server.tomcat.ui=v20100418,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.tomcat.ui
 
 plugin@org.eclipse.jst.server.websphere.core=v20080620,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.jst.server.websphere.core
diff --git a/releng.servertools/maps/wst-server-core.map b/releng.servertools/maps/wst-server-core.map
index 444a4d2..4b15b41 100644
--- a/releng.servertools/maps/wst-server-core.map
+++ b/releng.servertools/maps/wst-server-core.map
@@ -5,7 +5,7 @@
 
 plugin@org.eclipse.wst.internet.monitor.core=v20090609,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.internet.monitor.core
 
-plugin@org.eclipse.wst.server.core=v20100421,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.core=v20100425,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.core
 plugin@org.eclipse.wst.server.http.core=v20090429,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.http.core
 
 plugin@org.eclipse.wst.server.preview=v20091208,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,servertools/plugins/org.eclipse.wst.server.preview