Bug #283170: Add support for multiple CXF installations. Plus refactoring.
diff --git a/releng.incubator.jaxws/maps/jaxws.map b/releng.incubator.jaxws/maps/jaxws.map
index 872f99f..63f003d 100644
--- a/releng.incubator.jaxws/maps/jaxws.map
+++ b/releng.incubator.jaxws/maps/jaxws.map
@@ -23,17 +23,17 @@
 feature@org.eclipse.jst.ws.jaxws.dom_sdk.feature=v200909302112,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/features/org.eclipse.jst.ws.jaxws.dom_sdk.feature
 feature@org.eclipse.jst.ws.jaxws.dom_tests.feature=v200910101115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/features/org.eclipse.jst.ws.jaxws.dom_tests.feature
 
-bundle@org.eclipse.jst.ws.annotations.core=v200911182120,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.annotations.core
-bundle@org.eclipse.jst.ws.jaxws.core=v200911182120,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.jaxws.core
+bundle@org.eclipse.jst.ws.annotations.core=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.annotations.core
+bundle@org.eclipse.jst.ws.jaxws.core=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.jaxws.core
 bundle@org.eclipse.jst.ws.jaxb.core=v200909271617,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.jaxb.core
-bundle@org.eclipse.jst.ws.jaxws.ui=v200912092234,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.jaxws.ui
+bundle@org.eclipse.jst.ws.jaxws.ui=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.jaxws.ui
 
-bundle@org.eclipse.jst.ws.cxf.consumption.core=v200911302224,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.consumption.core
-bundle@org.eclipse.jst.ws.cxf.consumption.ui=v200911302224,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.consumption.ui
-bundle@org.eclipse.jst.ws.cxf.core=v200912062222,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.core
-bundle@org.eclipse.jst.ws.cxf.creation.core=v200912062222,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.creation.core
-bundle@org.eclipse.jst.ws.cxf.creation.ui=v200911302224,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.creation.ui
-bundle@org.eclipse.jst.ws.cxf.ui=v200911302224,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.ui
+bundle@org.eclipse.jst.ws.cxf.consumption.core=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.consumption.core
+bundle@org.eclipse.jst.ws.cxf.consumption.ui=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.consumption.ui
+bundle@org.eclipse.jst.ws.cxf.core=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.core
+bundle@org.eclipse.jst.ws.cxf.creation.core=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.creation.core
+bundle@org.eclipse.jst.ws.cxf.creation.ui=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.creation.ui
+bundle@org.eclipse.jst.ws.cxf.ui=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/plugins/org.eclipse.jst.ws.cxf.ui
 
 bundle@org.eclipse.jst.ws.cxf.tests=v200912201803,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.eclipse.jst.ws.cxf.tests
 bundle@org.eclipse.jst.ws.jaxws.core.tests=v200912142241,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.eclipse.jst.ws.jaxws.core.tests
@@ -52,6 +52,6 @@
 bundle@org.eclipse.jst.ws.jaxws.dom.ui.tests=v200910101115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.eclipse.jst.ws.jaxws.dom.ui.tests
 bundle@org.eclipse.jst.ws.jaxws.testutils=v200910101115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.eclipse.jst.ws.jaxws.testutils
 bundle@org.eclipse.jst.ws.jaxws.utils.tests=v200910101115,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.eclipse.jst.ws.jaxws.utils.tests
-bundle@org.jmock=v200912082239,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.jmock
+bundle@org.jmock=v201001172006,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,incubator/webservices/tests/org.jmock
 
 !***************
\ No newline at end of file