[186820] Renamed the ODA XML and Web Services data sources
diff --git a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/META-INF/MANIFEST.MF
index b7c385f..83eaed2 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.datatools.enablement.oda.ws.ui; singleton:=true
-Bundle-Version: 1.0.0.200705101
+Bundle-Version: 1.0.0.200705161
Bundle-Activator: org.eclipse.datatools.enablement.oda.ws.ui.Activator
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/plugin.properties b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/plugin.properties
index e814882..08be09d 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/plugin.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/plugin.properties
@@ -1,5 +1,12 @@
###############################################################################
-# Copyright (c) 2006 <<Your Company Name here>>
+# Copyright (c) 2007 Actuate Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Actuate Corporation - initial API and implementation
#
###############################################################################
# Plug-in Configuration
@@ -9,15 +16,15 @@
###############################################################################
# NLS strings
#
-plugin.name=DTP Web Service Data Source ODA Designer
-data.source.name=DTP Web Service Data Source
-connection.profile.name=DTP Web Service Data Source Connection Profile
-newwizard.name=DTP Web Service Data Source
-newwizard.description=Create a DTP Web Service Data Source connection profile
-wizard.window.title=New DTP Web Service Data Source Profile
-wizard.data.source.page.title=DTP Web Service Data Source
-profile.propertypage.name=DTP Web Service Data Source Connection Properties
-wizard.data.set.window.title=New DTP Web Service Data Set
+plugin.name=Eclipse Data Tools Platform Web Services ODA Designer
+data.source.name=Web Services Data Source
+connection.profile.name=Web Services Data Source Connection Profile
+newwizard.name=Web Services Data Source
+newwizard.description=Create a Web Services data source connection profile
+wizard.window.title=New Web Services Data Source Profile
+wizard.data.source.page.title=Web Services Data Source
+profile.propertypage.name=Web Services Data Source Connection Properties
+wizard.data.set.window.title=New Web Services Data Set
wizard.data.set.page.title=Query
oda.ws.operation=Operation
diff --git a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/src/org/eclipse/datatools/enablement/oda/ws/ui/i18n/messages.properties b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/src/org/eclipse/datatools/enablement/oda/ws/ui/i18n/messages.properties
index d055286..25d2056 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.ws.ui/src/org/eclipse/datatools/enablement/oda/ws/ui/i18n/messages.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.ws.ui/src/org/eclipse/datatools/enablement/oda/ws/ui/i18n/messages.properties
@@ -3,7 +3,7 @@
# Common
# WebServiceSelectionPage
-webServiceSelectionPage.message.default=DTP Web Service Data Source
+webServiceSelectionPage.message.default=Web Services Data Source
webServiceSelectionPage.message.error=Specify the SOAP End Point URL or Select a WSDL Descriptor
webServiceSelectionPage.group.wsdl=WSDL Descriptor
webServiceSelectionPage.group.endPoint=SOAP End Point
@@ -11,7 +11,7 @@
webServiceSelectionPage.label.wsdl=If the WSDL descriptor of the Web Services is available, enter its URL or browse to its location in the local file system
webServiceSelectionPage.label.wsdlURI=WSDL URL or Location:
webServiceSelectionPage.label.endPoint=Specify the SOAP End Point URL. This value is optional if a custom connection class is used
-webServiceSelectionPage.label.customClass=If connection and query to the Web Service is made through a custom Java class, enter the fully qualified class name here
+webServiceSelectionPage.label.customClass=If connection and query to the Web Services is made through a custom Java class, enter the fully qualified class name here
webServiceSelectionPage.button.browse=Browse...
# OperationPage
diff --git a/plugins/org.eclipse.datatools.enablement.oda.ws/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.oda.ws/META-INF/MANIFEST.MF
index 0be7623..2d75aa0 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.ws/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.oda.ws/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.datatools.enablement.oda.ws; singleton:=true
-Bundle-Version: 1.0.0.200705101
+Bundle-Version: 1.0.0.200705161
Bundle-ClassPath: .,
src
Bundle-Activator: org.eclipse.datatools.enablement.oda.ws.Activator
diff --git a/plugins/org.eclipse.datatools.enablement.oda.ws/plugin.properties b/plugins/org.eclipse.datatools.enablement.oda.ws/plugin.properties
index 27aa2a7..36e4638 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.ws/plugin.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.ws/plugin.properties
@@ -1,5 +1,12 @@
###############################################################################
-# Copyright (c) 2006 <<Your Company Name here>>
+# Copyright (c) 2007 Actuate Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Actuate Corporation - initial API and implementation
#
###############################################################################
# Plug-in Configuration
@@ -9,13 +16,11 @@
###############################################################################
# NLS String
#
-plugin.name=DTP Web Service Data Source ODA Runtime Driver
-data.source.name=DTP Web Service Data Source
-data.set.name=DTP Web Service Data Set
+plugin.name=Eclipse Data Tools Platform Web Services ODA Runtime Driver
+data.source.name=Web Services Data Source
+data.set.name=Web Services Data Set
-connection.profile.name=DTP Web Service Data Source Connection Profile
-newwizard.name=DTP Web Service Data Source
-newwizard.description=Create a DTP Web Service Data Source connection profile
+connection.profile.name=Web Services Data Source Connection Profile
datasource.property.soapEndPoint=SOAP End Point
datasource.property.connectionClass=Connection Class
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF
index f781762..52dde16 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: DTP XML UI Plug-in
+Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.datatools.enablement.oda.xml.ui;singleton:=true
-Bundle-Version: 1.0.1.200705101
+Bundle-Version: 1.0.1.200705161
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.datatools.enablement.oda.xml.ui.UiPlugin
Bundle-Vendor: Eclipse.org
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/plugin.properties b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/plugin.properties
index faf6f0a..8eaa630 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/plugin.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/plugin.properties
@@ -14,20 +14,17 @@
oda.data.source.id=org.eclipse.datatools.enablement.oda.xml
#
###############################################################################
-# NLS String
-###############################################################################
-oda.xml.datasource=DTP XML DataSource
-oda.xml.dataset=DTP XML DataSet
+# NLS Strings
+#
+oda.xml.datasource=XML Data Source
+oda.xml.dataset=XML Data Set
oda.xml.tablemapping=Table Mapping
oda.xml.columnmapping=Column Mapping
#
-###############################################################################
-# NLS messages
-#
-plugin.name=DTP XML File Designer
-newwizard.name=DTP XML File Data Source
-newwizard.description=Create an DTP XML File connection profile
-wizard.window.title=New XML File Data Source Profile
+plugin.name=Eclipse Data Tools Platform XML ODA Designer
+newwizard.name=XML Data Source
+newwizard.description=Create a XML data source connection profile
+wizard.window.title=New XML Data Source Profile
wizard.data.source.page.title=Define the URLs to the XML file and schema information
-profile.propertypage.name=DTP XML File Data Source Connection Properties
+profile.propertypage.name=XML Data Source Connection Properties
preference.datasetpreview=XML Data Set
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/i18n/messages.properties b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/i18n/messages.properties
index 46c46fe..2298ace 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/i18n/messages.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/i18n/messages.properties
@@ -1,5 +1,5 @@
# wizard dialog messages
-wizard.title.selectFolder=DTP XML Data Source
+wizard.title.selectFolder=XML Data Source
wizard.defaultMessage.selectFolder=Define the URLs to the XML file and schema information
wizard.title.newDataSet=New Data Set
wizard.title.selectXmlFile=Select XML Data for Preview
@@ -80,4 +80,4 @@
file.choose=&Browse...
title.warning=Warning
-datasource.propertyPage.tooltip=DTP XML Data Source
+datasource.propertyPage.tooltip=XML Data Source
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.oda.xml/META-INF/MANIFEST.MF
index 055467f..da911eb 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: DTP ODA-XML Driver
+Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.datatools.enablement.oda.xml;singleton:=true
-Bundle-Version: 1.0.1.200704281
+Bundle-Version: 1.0.1.200705161
Bundle-ClassPath: .
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml/plugin.properties b/plugins/org.eclipse.datatools.enablement.oda.xml/plugin.properties
index 9c0ef21..a1b747b 100644
--- a/plugins/org.eclipse.datatools.enablement.oda.xml/plugin.properties
+++ b/plugins/org.eclipse.datatools.enablement.oda.xml/plugin.properties
@@ -17,16 +17,17 @@
###############################################################################
# NLS String
###############################################################################
-oda.data.source.category.name=DTP XML Data Source
+plugin.name=Eclipse Data Tools Platform XML ODA Runtime Driver
+oda.data.source.category.name=XML Data Source
-datasource.name=DTP XML Data Source
-dataset.name=DTP XML Data Set
+datasource.name=XML Data Source
+dataset.name=XML Data Set
datasource.property.xmlFile=XML Data Source File
datasource.property.xmlEncoding=XML Date Source Encoding
datasource.property.schemaFile=XML Schema File
-oda.data.source.name=DTP XML Files
-connection.profile.name=DTP XML File Data Source Connection Profile
+oda.data.source.name=XML Data Source
+connection.profile.name=XML Data Source Connection Profile
#
# Below NLS messages apply to all ODA data sources; should be re-factored
#