Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 97683 Details for
Bug 228873
ClassNotFoundException when running ASF automation services without OSGi/ICU.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch.
Defect_228873_patch.txt (text/plain), 75.50 KB, created by
Paul Slauenwhite
on 2008-04-25 16:25:42 EDT
(
hide
)
Description:
Patch.
Filename:
MIME Type:
Creator:
Paul Slauenwhite
Created:
2008-04-25 16:25:42 EDT
Size:
75.50 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.hyades.execution >Index: src-core/org/eclipse/hyades/execution/core/util/Guid.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-core/org/eclipse/hyades/execution/core/util/Guid.java,v >retrieving revision 1.4 >diff -u -r1.4 Guid.java >--- src-core/org/eclipse/hyades/execution/core/util/Guid.java 20 Mar 2008 18:49:53 -0000 1.4 >+++ src-core/org/eclipse/hyades/execution/core/util/Guid.java 25 Apr 2008 20:24:06 -0000 >@@ -21,7 +21,6 @@ > import java.util.Hashtable; > import java.util.Random; > >-import org.eclipse.hyades.automation.core.internal.resources.AutomationCoreResourceBundle; > import org.eclipse.hyades.execution.core.internal.resources.CoreResourceBundle; > import org.eclipse.osgi.util.NLS; > >Index: src-automation-client/org/eclipse/hyades/automation/tests/tutorial/Test.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/tests/tutorial/Test.java,v >retrieving revision 1.12 >diff -u -r1.12 Test.java >--- src-automation-client/org/eclipse/hyades/automation/tests/tutorial/Test.java 24 Mar 2008 15:48:01 -0000 1.12 >+++ src-automation-client/org/eclipse/hyades/automation/tests/tutorial/Test.java 25 Apr 2008 20:24:06 -0000 >@@ -18,7 +18,6 @@ > > import org.eclipse.hyades.automation.client.adapters.java.AutomationClientAdapter; > import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; >-import org.eclipse.osgi.util.NLS; > > /** > * This test tests the automatable services such as execution, interrogation and >@@ -51,7 +50,7 @@ > final String ECLIPSE = "d:/development/products/tptp/4.2/client/eclipse";//$NON-NLS-1$ > final String WORKSPACE = "d:/development/products/tptp/4.2/workspace";//$NON-NLS-1$ > final String PROJECT = "A";//$NON-NLS-1$ >- final String[] SUITES = { "A.testsuite", "A.testsuite", "A.testsuite" };//$NON-NLS-1$ >+ final String[] SUITES = { "A.testsuite", "A.testsuite", "A.testsuite" };//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ > final String REPORT = ECLIPSE + "/reports";//$NON-NLS-1$ > final String CONNECTION = "tptp:rac://localhost:10002/default";//$NON-NLS-1$ > >@@ -92,7 +91,7 @@ > // Configure service properties for this service invocation > Properties properties = new Properties(); > properties.setProperty("connection", connection);//$NON-NLS-1$ >- properties.setProperty("quiet", "true");//$NON-NLS-1$ >+ properties.setProperty("quiet", "true");//$NON-NLS-1$ //$NON-NLS-2$ > > // Execute test results interrogation service > adapter.execute("org.eclipse.hyades.test.tools.core.verify",//$NON-NLS-1$ >@@ -108,7 +107,7 @@ > } > > // Output that the agent controller is ready for use >- System.out.println(AutomationClientResourceBundle.Test_AGENT_CONTROLLER_UP_); >+ System.out.println(AutomationClientResourceBundle.getString("Test_AGENT_CONTROLLER_UP_")); //$NON-NLS-1$ > > } > >@@ -142,7 +141,7 @@ > > // Retrieve results back from return list > results = (List) properties.get("results");//$NON-NLS-1$ >- System.out.println(NLS.bind(AutomationClientResourceBundle.Test_RESULTS_COLLECTED_, results)); >+ System.out.println(AutomationClientResourceBundle.getString("Test_RESULTS_COLLECTED_", results)); //$NON-NLS-1$ > > } > >@@ -158,7 +157,7 @@ > Properties properties = new Properties(); > properties.setProperty("workspace", workspace);//$NON-NLS-1$ > properties.setProperty("project", project);//$NON-NLS-1$ >- properties.setProperty("quiet", "true");//$NON-NLS-1$ >+ properties.setProperty("quiet", "true");//$NON-NLS-1$ //$NON-NLS-2$ > > // Add list to results property > properties.put("results", results);//$NON-NLS-1$ >@@ -168,7 +167,7 @@ > properties); > > // Output verdict indicated from test results >- System.out.println(NLS.bind(AutomationClientResourceBundle.Test_OVERALL_TEST_RESULT_VERDICT_, properties.getProperty("verdict"))); >+ System.out.println(AutomationClientResourceBundle.getString("Test_OVERALL_TEST_RESULT_VERDICT_", properties.getProperty("verdict"))); //$NON-NLS-1$ //$NON-NLS-2$ > > } > >@@ -183,7 +182,7 @@ > properties.setProperty("workspace", workspace);//$NON-NLS-1$ > properties.setProperty("project", project);//$NON-NLS-1$ > properties.setProperty("report", report);//$NON-NLS-1$ >- properties.setProperty("quiet", "true");//$NON-NLS-1$ >+ properties.setProperty("quiet", "true");//$NON-NLS-1$ //$NON-NLS-2$ > > // Add list to results property > properties.put("results", results);//$NON-NLS-1$ >@@ -193,7 +192,7 @@ > properties); > > // Output verdict indicated from test results >- System.out.println(NLS.bind(AutomationClientResourceBundle.Test_OVERALL_TEST_RESULT_VERDICT_, properties.getProperty("verdict"))); >+ System.out.println(AutomationClientResourceBundle.getString("Test_OVERALL_TEST_RESULT_VERDICT_", properties.getProperty("verdict"))); //$NON-NLS-1$ //$NON-NLS-2$ > > } > >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/ant/AutomationClientAdapter.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/adapters/ant/AutomationClientAdapter.java,v >retrieving revision 1.30 >diff -u -r1.30 AutomationClientAdapter.java >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/ant/AutomationClientAdapter.java 20 Mar 2008 18:49:51 -0000 1.30 >+++ src-automation-client/org/eclipse/hyades/automation/client/adapters/ant/AutomationClientAdapter.java 25 Apr 2008 20:24:05 -0000 >@@ -36,7 +36,6 @@ > import org.apache.tools.ant.util.FileUtils; > import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; > import org.eclipse.hyades.automation.core.utils.ProgressiveTask; >-import org.eclipse.osgi.util.NLS; > > /** > * These are the two included ant task definitions, the first one, named >@@ -280,12 +279,12 @@ > file = files[i]; > > if (!quiet) { >- System.out.println(NLS.bind(AutomationClientResourceBundle.AutomationClientAdapter_ADDING_FILE_, theFile.getAbsolutePath())); >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_ADDING_FILE_", theFile.getAbsolutePath())); //$NON-NLS-1$ > } > resultList.add(file); > } > else >- System.out.println(NLS.bind(AutomationClientResourceBundle.AutomationClientAdapter_FILE_NOT_EXIST_, theFile.getAbsolutePath())); >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_FILE_NOT_EXIST_", theFile.getAbsolutePath())); //$NON-NLS-1$ > } > } > >@@ -366,7 +365,7 @@ > String defaultCommand = this > .getProjectProperty("tptp.automation.command");//$NON-NLS-1$ > this.command = defaultCommand != null ? defaultCommand >- : "execute"; >+ : "execute"; //$NON-NLS-1$ > } > if (this.iterations == 0) { > String defaultIterations = this >@@ -608,8 +607,8 @@ > putToProperties("suite", suiteList);//$NON-NLS-1$ > } > >- if (this.getFromProperties("suite") == null && this.getFromProperties("configuration") == null) {//$NON-NLS-1$ >- System.out.println(AutomationClientResourceBundle.AutomationClientAdapter_NO_TEST_SPECIFIED_); >+ if (this.getFromProperties("suite") == null && this.getFromProperties("configuration") == null) {//$NON-NLS-1$ //$NON-NLS-2$ >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_NO_TEST_SPECIFIED_")); //$NON-NLS-1$ > return; > } > >@@ -629,7 +628,7 @@ > (List)results, projectDir); > getProject().addReference(resultsrefid, resultFileList); > } else { >- System.out.println(AutomationClientResourceBundle.AutomationClientAdapter_NO_PARAM_SPECIFIED_); >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_NO_PARAM_SPECIFIED_")); //$NON-NLS-1$ > } > > } >@@ -712,7 +711,7 @@ > */ > protected synchronized void checkConfiguration() throws BuildException { > if (suite == null && filesets.size() + filelists.size() == 0) { >- throw new BuildException(AutomationClientResourceBundle.AutomationClientAdapter_SPEICIFY_SOURCE_OF_TESTS_); >+ throw new BuildException(AutomationClientResourceBundle.getString("AutomationClientAdapter_SPEICIFY_SOURCE_OF_TESTS_")); //$NON-NLS-1$ > } > } > >@@ -976,7 +975,7 @@ > this.execute(); > > // Return true if the verdict is 'pass' >- return this.getProperty("verdict").equalsIgnoreCase("pass");//$NON-NLS-1$ >+ return this.getProperty("verdict").equalsIgnoreCase("pass");//$NON-NLS-1$ //$NON-NLS-2$ > > } > >@@ -991,7 +990,7 @@ > this.addProperty("workspace", this.workspace);//$NON-NLS-1$ > this.addProperty("project", this.project);//$NON-NLS-1$ > this.addProperty("results", this.results);//$NON-NLS-1$ >- this.addProperty("verdict", "fail");//$NON-NLS-1$ >+ this.addProperty("verdict", "fail");//$NON-NLS-1$ //$NON-NLS-2$ > > // If filesets or filelists have been specified, copy the > // files into the input array >@@ -1215,7 +1214,7 @@ > try { > time = format.parse(dateTime).getTime(); > } catch (ParseException e) { >- System.out.println(NLS.bind(AutomationClientResourceBundle.AutomationClientAdapter_UNABLE_PARSE_DATETIME_, dateTime)); >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_UNABLE_PARSE_DATETIME_", dateTime)); //$NON-NLS-1$ > } > return Long.toString(time); > } >@@ -1245,7 +1244,7 @@ > */ > protected synchronized void checkConfiguration() throws BuildException { > if (results == null && filesets.size() + filelists.size() == 0) { >- throw new BuildException(AutomationClientResourceBundle.AutomationClientAdapter_SPEICIFY_SOURCE_OF_RESULTS_); >+ throw new BuildException(AutomationClientResourceBundle.getString("AutomationClientAdapter_SPEICIFY_SOURCE_OF_RESULTS_")); //$NON-NLS-1$ > } > // if (results != null && filesets.size() + filelists.size() > 0) { > // throw new BuildException("For workspace result files, specify" >@@ -1478,7 +1477,7 @@ > this.execute(); > > // Return true if verified is set to true >- return this.getProperty("verified").equalsIgnoreCase("true");//$NON-NLS-1$ >+ return this.getProperty("verified").equalsIgnoreCase("true");//$NON-NLS-1$ //$NON-NLS-2$ > } > > /* >@@ -1490,7 +1489,7 @@ > > // Set properties and command for this execution > this.addProperty("connection", this.connection);//$NON-NLS-1$ >- this.addProperty("verified", "false");//$NON-NLS-1$ >+ this.addProperty("verified", "false");//$NON-NLS-1$ //$NON-NLS-2$ > this.setCommand("execute");//$NON-NLS-1$ > > // Execute service (via automation base class) >Index: src-automation-client/org/eclipse/hyades/automation/client/strategies/VoidStrategy.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/strategies/VoidStrategy.java,v >retrieving revision 1.3 >diff -u -r1.3 VoidStrategy.java >--- src-automation-client/org/eclipse/hyades/automation/client/strategies/VoidStrategy.java 7 Oct 2005 14:49:19 -0000 1.3 >+++ src-automation-client/org/eclipse/hyades/automation/client/strategies/VoidStrategy.java 25 Apr 2008 20:24:06 -0000 >@@ -30,7 +30,7 @@ > * org.eclipse.hyades.automation.core.utils.ProgressiveTask.Synchronicity) > */ > public Object execute(Service service, ProgressiveTask.Synchronicity synchronicity) { >- return ""; >+ return ""; //$NON-NLS-1$ > } > > } >\ No newline at end of file >Index: src-automation-client/org/eclipse/hyades/automation/client/strategies/AbstractExecutionStrategy.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/strategies/AbstractExecutionStrategy.java,v >retrieving revision 1.10 >diff -u -r1.10 AbstractExecutionStrategy.java >--- src-automation-client/org/eclipse/hyades/automation/client/strategies/AbstractExecutionStrategy.java 20 Mar 2008 18:49:51 -0000 1.10 >+++ src-automation-client/org/eclipse/hyades/automation/client/strategies/AbstractExecutionStrategy.java 25 Apr 2008 20:24:06 -0000 >@@ -21,7 +21,6 @@ > import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; > import org.eclipse.hyades.automation.core.Service; > import org.eclipse.hyades.automation.core.utils.ProgressiveTask; >-import org.eclipse.osgi.util.NLS; > > /** > * The client execution strategy to use, this strategy specifies how the command >@@ -151,7 +150,7 @@ > */ > static void redirectConsole(Process process, final InputStream inputStream, > final PrintStream printStream) { >- new Thread(NLS.bind(AutomationClientResourceBundle.AbstractExecutionStrategy_CONSOLE_REDIRECTION_, inputStream, printStream)) >+ new Thread(AutomationClientResourceBundle.getString("AbstractExecutionStrategy_CONSOLE_REDIRECTION_", inputStream, printStream)) //$NON-NLS-1$ > { > public void run() { > try { >Index: src-automation-client/org/eclipse/hyades/automation/client/strategies/InProcessStrategy.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/strategies/InProcessStrategy.java,v >retrieving revision 1.9 >diff -u -r1.9 InProcessStrategy.java >--- src-automation-client/org/eclipse/hyades/automation/client/strategies/InProcessStrategy.java 20 Mar 2008 18:49:51 -0000 1.9 >+++ src-automation-client/org/eclipse/hyades/automation/client/strategies/InProcessStrategy.java 25 Apr 2008 20:24:06 -0000 >@@ -47,7 +47,7 @@ > try { > > // Find service implementation for this service identifier >- IExtension extension = Platform.getExtensionRegistry().getExtension("org.eclipse.core.runtime.applications", >+ IExtension extension = Platform.getExtensionRegistry().getExtension("org.eclipse.core.runtime.applications", //$NON-NLS-1$ > "org.eclipse.hyades.execution.server");//$NON-NLS-1$ > > if (extension != null) { >Index: src-automation-client/org/eclipse/hyades/automation/client/strategies/OutOfProcessStrategy.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/strategies/OutOfProcessStrategy.java,v >retrieving revision 1.28 >diff -u -r1.28 OutOfProcessStrategy.java >--- src-automation-client/org/eclipse/hyades/automation/client/strategies/OutOfProcessStrategy.java 20 Mar 2008 18:49:51 -0000 1.28 >+++ src-automation-client/org/eclipse/hyades/automation/client/strategies/OutOfProcessStrategy.java 25 Apr 2008 20:24:06 -0000 >@@ -25,9 +25,9 @@ > > import org.eclipse.hyades.automation.client.adapters.java.AutomationClientAdapter; > import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; >+import org.eclipse.hyades.automation.core.AbstractService; > import org.eclipse.hyades.automation.core.IAutomationServer; > import org.eclipse.hyades.automation.core.Service; >-import org.eclipse.hyades.automation.core.AbstractService; > import org.eclipse.hyades.automation.core.utils.ProgressiveTask; > import org.eclipse.hyades.automation.core.utils.ProgressiveTask.Synchronicity; > >@@ -136,7 +136,7 @@ > IAutomationServer server) throws RemoteException { > if (server == null) { > throw new IllegalArgumentException( >- AutomationClientResourceBundle.OutOfProcessStrategy_AUTOMATION_SERVER_VALUE_); >+ AutomationClientResourceBundle.getString("OutOfProcessStrategy_AUTOMATION_SERVER_VALUE_")); //$NON-NLS-1$ > } > Object object = server.run(service.createMemento()); > service.configure((Service.Memento) object); >@@ -218,7 +218,7 @@ > > // Windows requires quotes surrounding path > boolean useQuotes = false; >- if (System.getProperty("os.name").toLowerCase().indexOf("windows") != -1) {//$NON-NLS-1$ >+ if (System.getProperty("os.name").toLowerCase().indexOf("windows") != -1) {//$NON-NLS-1$ //$NON-NLS-2$ > useQuotes = true; > } > >@@ -229,15 +229,15 @@ > command.append("-application ");//$NON-NLS-1$ > command > .append(AbstractExecutionStrategy.AUTOMATION_SERVER_IDENTIFIER >- + " "); >+ + " "); //$NON-NLS-1$ > String strWorkspace = p.getProperty("workspace");//$NON-NLS-1$ > if (strWorkspace == null) > strWorkspace = p.getProperty("tptp.test.workspace");//$NON-NLS-1$ > if (strWorkspace != null){ >- if ((useQuotes == true) && (strWorkspace.startsWith("\"") == false)){ >- strWorkspace = "\"" + strWorkspace + "\""; >+ if ((useQuotes == true) && (strWorkspace.startsWith("\"") == false)){ //$NON-NLS-1$ >+ strWorkspace = "\"" + strWorkspace + "\""; //$NON-NLS-1$ //$NON-NLS-2$ > } >- command.append("-data " + strWorkspace + " ");//$NON-NLS-1$ >+ command.append("-data " + strWorkspace + " ");//$NON-NLS-1$ //$NON-NLS-2$ > } > command.append("-vmargs ");//$NON-NLS-1$ > >@@ -253,21 +253,21 @@ > if (strVMargs == null) > strVMargs = p.getProperty("tptp.automation.vmargs");//$NON-NLS-1$ > if (strVMargs != null) >- command.append(strVMargs + " "); >+ command.append(strVMargs + " "); //$NON-NLS-1$ > > // Other -D options to pass in >- command.append("-D" >+ command.append("-D" //$NON-NLS-1$ > + AbstractExecutionStrategy.AUTOMATION_COMMAND_IDENTIFIER); > command.append("=execute ");//$NON-NLS-1$ > command >- .append("-D" >+ .append("-D" //$NON-NLS-1$ > + AbstractExecutionStrategy.AUTOMATION_SYNCHRONICITY_DIRECTIVE); >- command.append("=" + synchronicity.toString()); >- command.append(" -D" >+ command.append("=" + synchronicity.toString()); //$NON-NLS-1$ >+ command.append(" -D" //$NON-NLS-1$ > + AbstractExecutionStrategy.AUTOMATION_DATA_IDENTIFIER); > >- command.append("=" + (useQuotes ? "\"" : "") >- + file.getCanonicalPath() + (useQuotes ? "\"" : "")); >+ command.append("=" + (useQuotes ? "\"" : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ >+ + file.getCanonicalPath() + (useQuotes ? "\"" : "")); //$NON-NLS-1$ //$NON-NLS-2$ > > > >@@ -358,7 +358,7 @@ > String returnFileName = dataFile.getCanonicalPath(); > int length = returnFileName.length(); > returnFileName = returnFileName.substring(0, length - 4).concat( >- "-out").concat(returnFileName.substring(length - 4)); >+ "-out").concat(returnFileName.substring(length - 4)); //$NON-NLS-1$ > > // Read file contents (persisted objects) > FileInputStream fileInput = new FileInputStream(returnFileName); >Index: src-automation-client/org/eclipse/hyades/automation/tests/AllTests.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/tests/AllTests.java,v >retrieving revision 1.3 >diff -u -r1.3 AllTests.java >--- src-automation-client/org/eclipse/hyades/automation/tests/AllTests.java 20 Mar 2008 18:50:00 -0000 1.3 >+++ src-automation-client/org/eclipse/hyades/automation/tests/AllTests.java 25 Apr 2008 20:24:06 -0000 >@@ -12,8 +12,6 @@ > > package org.eclipse.hyades.automation.tests; > >-import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; >- > import junit.framework.Test; > import junit.framework.TestSuite; > >Index: src-automation-client/org/eclipse/hyades/automation/tests/TestExecution.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/tests/TestExecution.java,v >retrieving revision 1.10 >diff -u -r1.10 TestExecution.java >--- src-automation-client/org/eclipse/hyades/automation/tests/TestExecution.java 20 Mar 2008 18:50:00 -0000 1.10 >+++ src-automation-client/org/eclipse/hyades/automation/tests/TestExecution.java 25 Apr 2008 20:24:06 -0000 >@@ -67,10 +67,10 @@ > public void testExecute() { > AutomationClientAdapter automation = new AutomationClientAdapter("d:\\development\\products\\tptp\\4.1\\unsecure\\client\\eclipse");//$NON-NLS-1$ > Properties properties = new Properties(); >- properties.setProperty("workspace", "D:\\development\\products\\tptp\\4.1\\unsecure\\workspace");//$NON-NLS-1$ >- properties.setProperty("project", "A");//$NON-NLS-1$ >- properties.setProperty("suite", "A.testsuite");//$NON-NLS-1$ >- properties.setProperty("vmArgs", "-Xj9");//$NON-NLS-1$ >+ properties.setProperty("workspace", "D:\\development\\products\\tptp\\4.1\\unsecure\\workspace");//$NON-NLS-1$ //$NON-NLS-2$ >+ properties.setProperty("project", "A");//$NON-NLS-1$ //$NON-NLS-2$ >+ properties.setProperty("suite", "A.testsuite");//$NON-NLS-1$ //$NON-NLS-2$ >+ properties.setProperty("vmArgs", "-Xj9");//$NON-NLS-1$ //$NON-NLS-2$ > automation.execute("org.eclipse.hyades.test.tools.core.execute", properties);//$NON-NLS-1$ > } > >Index: src-automation-core/org/eclipse/hyades/automation/core/AbstractService.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-core/org/eclipse/hyades/automation/core/AbstractService.java,v >retrieving revision 1.19 >diff -u -r1.19 AbstractService.java >--- src-automation-core/org/eclipse/hyades/automation/core/AbstractService.java 20 Mar 2008 18:49:53 -0000 1.19 >+++ src-automation-core/org/eclipse/hyades/automation/core/AbstractService.java 25 Apr 2008 20:24:06 -0000 >@@ -218,7 +218,7 @@ > * @see org.eclipse.hyades.automation.core.Service#getRoot() > */ > public String getRoot() { >- return ""; >+ return ""; //$NON-NLS-1$ > } > > /** >@@ -228,7 +228,7 @@ > * @return false is output is not suppressed > */ > protected boolean isQuiet() { >- return Boolean.valueOf(this.getProperty("quiet", "false"))//$NON-NLS-1$ >+ return Boolean.valueOf(this.getProperty("quiet", "false"))//$NON-NLS-1$ //$NON-NLS-2$ > .booleanValue(); > } > >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/java/AutomationClientAdapter.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/adapters/java/AutomationClientAdapter.java,v >retrieving revision 1.9 >diff -u -r1.9 AutomationClientAdapter.java >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/java/AutomationClientAdapter.java 16 Apr 2008 14:39:51 -0000 1.9 >+++ src-automation-client/org/eclipse/hyades/automation/client/adapters/java/AutomationClientAdapter.java 25 Apr 2008 20:24:05 -0000 >@@ -20,10 +20,6 @@ > import org.eclipse.hyades.automation.client.strategies.AbstractExecutionStrategy; > import org.eclipse.hyades.automation.core.Service; > import org.eclipse.hyades.automation.core.utils.ProgressiveTask; >-import org.eclipse.osgi.util.NLS; >- >- >-import com.ibm.icu.text.MessageFormat; > > /** > * The Java automation client adapter provides a front-end to external Java code >@@ -191,10 +187,10 @@ > // error if a path is set as the project name > > private boolean checkProjectProperty(Properties properties){ >- String proj = properties.getProperty("project"); >+ String proj = properties.getProperty("project"); //$NON-NLS-1$ > if (proj != null){ > if (proj.indexOf('\\') >= 0 || proj.indexOf('/') >= 0){ >- System.out.println(NLS.bind(AutomationClientResourceBundle.AutomationClientAdapter_INVALID_PROJECT_, proj)); >+ System.out.println(AutomationClientResourceBundle.getString("AutomationClientAdapter_INVALID_PROJECT_", proj)); //$NON-NLS-1$ > return false; > } > >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/CommandLineArgumentParser.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/CommandLineArgumentParser.java,v >retrieving revision 1.7 >diff -u -r1.7 CommandLineArgumentParser.java >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/CommandLineArgumentParser.java 24 Mar 2008 15:48:01 -0000 1.7 >+++ src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/CommandLineArgumentParser.java 25 Apr 2008 20:24:06 -0000 >@@ -19,7 +19,7 @@ > import java.util.ArrayList; > import java.util.Properties; > >-import com.ibm.icu.text.MessageFormat; >+import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; > > /** > * The command line parser class is used to parse the specified program >@@ -101,11 +101,11 @@ > if (parameterSet[parmNumber] == true && !processingConfigFile) { > Object[] obj = new Object[1]; > obj[0] = str[count]; >- message.append(MessageFormat.format((Messages.getString("ParseCmdLineArgs.1")), obj));//$NON-NLS-1$ >+ message.append(AutomationClientResourceBundle.getString("ParseCmdLineArgs.1", obj));//$NON-NLS-1$ > } else if (configurationParameterSet[parmNumber] == true && processingConfigFile) { > Object[] obj = new Object[1]; > obj[0] = str[count]; >- message.append(MessageFormat.format((Messages.getString("ParseCmdLineArgs.3")), obj));//$NON-NLS-1$ >+ message.append(AutomationClientResourceBundle.getString("ParseCmdLineArgs.3", obj));//$NON-NLS-1$ > } else if (!parameterSet[parmNumber]) { > if (strCompare.compareTo(ICommandLineParameters.CMD_QUIET) == 0) { > properties.setProperty(strCompare, "");//$NON-NLS-1$ >@@ -265,7 +265,7 @@ > Object[] obj = new Object[1]; > obj[0] = configfilepath; > message >- .append(MessageFormat.format((Messages.getString("ParseCmdLineArgs.5")), obj) + lineSeparator);//$NON-NLS-1$ >+ .append(AutomationClientResourceBundle.getString("ParseCmdLineArgs.5", obj) + lineSeparator);//$NON-NLS-1$ > } > } catch (IOException e) { > >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/messages.properties >=================================================================== >RCS file: src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/messages.properties >diff -N src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/messages.properties >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/messages.properties 24 Mar 2008 17:12:24 -0000 1.9 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,83 +0,0 @@ >-############################################################################### >-# Copyright (c) 2005, 2008 IBM Corporation and others. >-# 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 >-# $Id: messages.properties,v 1.9 2008/03/24 17:12:24 jkubasta Exp $ >-# >-# Contributors: >-# IBM Corporation - initial API and implementation >-############################################################################### >- >-AutomationClientAdapter.0=Due to the above errors, no attempt was made to run a test, there are no results to view. >-AutomationClientAdapter.1=\r\nTEST COMMENT: {0} >-AutomationClientAdapter.5=Error, eclipse was not specified and was not found automatically. >-AutomationClientAdapter.6=Error, the path given for eclipsehome: {0}, is not a valid directory.\r\n >-AutomationClientAdapter.9=Error, the path given for workspace: {0}, is not a valid directory. >-AutomationClientAdapter.18=\nDue to the above errors, no attempt was made to run a test, there are no results to view. >-AutomationClientAdapter.19=Parameters accepted, starting the test run. >-AutomationClientAdapter.20=Error, a required jar file was not found: {0} >-AutomationClientAdapter.21=\r\nTPTP 4.1.0 Automation Client Adapter Help\r\n\r\n >-AutomationClientAdapter.22=Automatable services published through the automatable services framework are available for command through this\r\n >-AutomationClientAdapter.221=command line interface. The test execution service has named and more strongly typed parameters than the invocation\r\n >-AutomationClientAdapter.222=of an arbitrary published automatable service although both can be commanded and thus executed through this interface.\r\n\r\n >-AutomationClientAdapter.23=\ \ usage: automation-client-adapter -parm1 <parm1value> -parm2 <parm2value> (etc...)\r\n\r\n >-AutomationClientAdapter.25=Below is the usage definition and valid named parameters that may be used in any order (values containing spaces\r\nmust be in quotes):\r\n\r\n >-AutomationClientAdapter.26=\ \ -configfile <directorypath>\r\n >-AutomationClientAdapter.27=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Specify command line parameters via a user supplied config file.\r\n >-AutomationClientAdapter.28=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -configfile .\\example.config\r\n >-AutomationClientAdapter.29=\ \ -eclipse <directorypath>\r\n >-AutomationClientAdapter.30=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the full path to eclipse, usually detected automatically.\r\n >-AutomationClientAdapter.31=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -eclipse "C:\\eclipse"\r\n >-AutomationClientAdapter.32=\ \ -workspace <directorypath>\r\n >-AutomationClientAdapter.33=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the full path to the desired workspace.\r\n >-AutomationClientAdapter.34=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -workspace c:\\workspace\r\n >-AutomationClientAdapter.35=\ \ -project <relativedirectorypath>\r\n >-AutomationClientAdapter.36=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the location of the desired project relative to the workspace.\r\n >-AutomationClientAdapter.37=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -project testproj\r\n >-AutomationClientAdapter.41=\ \ -suite <relativefilepath>\r\n >-AutomationClientAdapter.42=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the location of the test suite to run relative to the project.\r\n >-AutomationClientAdapter.43=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -suite mytest OR -suite tests\\mytest\r\n >-AutomationClientAdapter.44=\ \ -results <relativefilepath>\r\n >-AutomationClientAdapter.45=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the results relative to the project.\r\n >-AutomationClientAdapter.46=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -result myresults OR -result results\\myresults\r\n >-AutomationClientAdapter.47=\ \ -overwrite <true or false>\r\n >-AutomationClientAdapter.48=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ if "true" the specified results will be overwritten.\r\n >-AutomationClientAdapter.49=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -overwrite true (default is false).\r\n >-AutomationClientAdapter.50=\ \ -deployment <relativefilepath>\r\n >-AutomationClientAdapter.51=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the deployment relative to the project.\r\n >-AutomationClientAdapter.52=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -deployment mydeployment OR -deployment deployments\\mydeployment\r\n >-AutomationClientAdapter.85=\ \ -configuration <relativefilepath>\r\n >-AutomationClientAdapter.86=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the launch configuration relative to the project.\r\n >-AutomationClientAdapter.87=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -configuration mylaunch.launch OR -configuration launches\\mylaunch.launch.\r\n >-AutomationClientAdapter.88=\ \ -connection <connectionstring>\r\n >-AutomationClientAdapter.89=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the connection string specifying the agent controller to use.\r\n >-AutomationClientAdapter.90=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ format: <specification>:<class>://<host>:<port>/<instance>?user=<user>&password=<password>\r\n >-AutomationClientAdapter.91=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection tptp:rac://server.rtp.ibm.com:10002/default\r\n >-AutomationClientAdapter.92=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection tptp:iac://localhost/default\r\n >-AutomationClientAdapter.93=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection server.rtp.ibm.com\r\n >-AutomationClientAdapter.94=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection localhost:11010\r\n >-AutomationClientAdapter.53=\ \ -vmargs <string of VM args>\r\n >-AutomationClientAdapter.54=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ The JVM arguments specified will be used in launching the Eclipse instance.\r\n >-AutomationClientAdapter.55=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -vmargs "-Xmx756 -Xquickstart"\r\n >-AutomationClientAdapter.59=\ \ -service <servicename>\r\n >-AutomationClientAdapter.60=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rather than running test execution service, this\r\n >-AutomationClientAdapter.61=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specifies running another published automatable service.\r\n >-AutomationClientAdapter.62=\r\nA simple and typical usage example:\r\n\r\n >-AutomationClientAdapter.63=\ \ automation-client-adapter -workspace c:\\myworkspace -project myproj -suite mytest\r\n >-AutomationClientAdapter.66=\r\nIn a configfile, any of the above may be specified as a name=value pair. There are no leading hyphens permitted\r\nbetween name and value. >-AutomationClientAdapter.67=Each name=value pair must be on a separate line. Extra spaces around the name and value are\r\naccepted.\r\n\r\n >-AutomationClientAdapter.68=Config file example:\r\n\r\n >-AutomationClientAdapter.69=\ \ workspace = c:\\myworkspace\r\n >-AutomationClientAdapter.70=\ \ project = mytestproject\r\n >-AutomationClientAdapter.71=\ \ suite = mysuite\r\n >-AutomationClientAdapter.72=\ \ results = myresults\r\n >-AutomationClientAdapter.73=\ \ overwrite = true\r\n\r\n >-AutomationClientAdapter.74=Any supplied command line parameters values will override the value in the configuration file. The minimal set of\r\nparameter values are a specified eclipse instance (usually automatic), the workspace to use, the project, and the name\r\nof a suite to run. You may omit the ".testsuite" file extension.\r\n\r\n >-AutomationClientAdapter.79=Use standard shell commands to redirect output to a file. For example, in a Windows command prompt, do the following\r\nto redirect output to a file:\r\n\r\n >-AutomationClientAdapter.81=\ \ automation-client-adapter --help > c:\\mylog\\help.txt\r\n\r\n >-AutomationClientAdapter.84=This help is available via --help, -help, -?, or ?\r\n >-ParseCmdLineArgs.1=Error, {0} specified more than once on the command line.\r\n >-ParseCmdLineArgs.3=Error, {0} specified more than once in the configfile.\r\n >-ParseCmdLineArgs.5=The config file specified was not found: {0}\r\n >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/Messages.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/Messages.java,v >retrieving revision 1.4 >diff -u -r1.4 Messages.java >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/Messages.java 7 Nov 2005 00:16:39 -0000 1.4 >+++ src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/Messages.java 25 Apr 2008 20:24:06 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2005 IBM Corporation and others. >+ * Copyright (c) 2005, 2008 IBM Corporation and others. > * 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 >@@ -9,35 +9,28 @@ > * Contributors: > * IBM - Initial API and implementation > **********************************************************************/ >- > package org.eclipse.hyades.automation.client.adapters.shell; > >-import java.util.MissingResourceException; >-import java.util.ResourceBundle; >+import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; > > /** > * Message properties class for retrieving resource strings from resource > * bundle. Currently, the shell automation client adapter has messages and > * parameter names that are not localized (although this will be planned as > * appropriate in future releases). >+ * </p> >+ * > * >- * @author Duwayne J. Morris >- * @author Scott E. Schneider >+ * @author Duwayne J. Morris >+ * @author Scott E. Schneider >+ * @author Paul E. Slauenwhite >+ * @version April 25, 2008 >+ * @since October 7, 2005 >+ * @deprecated As of TPTP 4.5.0, use {@link AutomationClientResourceBundle}. > */ > class Messages { > > /** >- * The name of the resource bundle associated with the shell automation >- * client adapter >- */ >- private static final String BUNDLE_NAME = "org.eclipse.hyades.automation.client.adapters.shell.messages"; //$NON-NLS-1$ >- >- /** >- * The resource bundle associated with the shell automation client adapters. >- */ >- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); >- >- /** > * Retrieves a string with the given key > * > * @param key >@@ -46,11 +39,7 @@ > * @return the message or string related to the given key > */ > public static String getString(String key) { >- try { >- return RESOURCE_BUNDLE.getString(key); >- } catch (MissingResourceException e) { >- return '!' + key + '!'; >- } >+ return (AutomationClientResourceBundle.getString(key)); > } > > /** >Index: src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/AutomationClientAdapter.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/AutomationClientAdapter.java,v >retrieving revision 1.8 >diff -u -r1.8 AutomationClientAdapter.java >--- src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/AutomationClientAdapter.java 30 Oct 2006 18:25:56 -0000 1.8 >+++ src-automation-client/org/eclipse/hyades/automation/client/adapters/shell/AutomationClientAdapter.java 25 Apr 2008 20:24:06 -0000 >@@ -1,5 +1,5 @@ > /********************************************************************** >- * Copyright (c) 2006 IBM Corporation and others. >+ * Copyright (c) 2006, 2008 IBM Corporation and others. > * 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 >@@ -15,7 +15,7 @@ > import java.io.File; > import java.util.Properties; > >-import com.ibm.icu.text.MessageFormat; >+import org.eclipse.hyades.automation.client.internal.resources.AutomationClientResourceBundle; > > /** > * Shell automation client adapter -- provides a command line interface to the >@@ -134,7 +134,7 @@ > bError = true; > } > if (bError == true) >- message.append(Messages.getString("AutomationClientAdapter.5") + //$NON-NLS-1$ >+ message.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.5") + //$NON-NLS-1$ > lineSeparator); > > } else { >@@ -142,8 +142,7 @@ > if (!file.isDirectory()) { > Object[] obj = new Object[1]; > obj[0] = eclipseHome; >- message.append(MessageFormat.format((Messages >- .getString("AutomationClientAdapter.6")), obj));//$NON-NLS-1$ >+ message.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.6", obj));//$NON-NLS-1$ > } > } > >@@ -156,8 +155,7 @@ > Object[] obj = new Object[1]; > obj[0] = workspace; > message >- .append(MessageFormat.format((Messages >- .getString("AutomationClientAdapter.9")), obj) + lineSeparator);//$NON-NLS-1$ >+ .append(AutomationClientResourceBundle.getString("AutomationClientAdapter.9", obj) + lineSeparator);//$NON-NLS-1$ > } > } > >@@ -190,8 +188,7 @@ > Object[] obj = new Object[1]; > obj[0] = args[1]; > System.out >- .println(MessageFormat.format((Messages >- .getString("AutomationClientAdapter.1")), obj) + lineSeparator); //$NON-NLS-1$ >+ .println(AutomationClientResourceBundle.getString("AutomationClientAdapter.1", obj) + lineSeparator); //$NON-NLS-1$ > } > > properties = new Properties(); >@@ -209,7 +206,7 @@ > fatalError = true; > message.insert(0, lineSeparator); > message.append(lineSeparator >- + Messages.getString("AutomationClientAdapter.0") + //$NON-NLS-1$ >+ + AutomationClientResourceBundle.getString("AutomationClientAdapter.0") + //$NON-NLS-1$ > lineSeparator); > System.out.println(message); > } >@@ -241,66 +238,66 @@ > */ > private static void printHelp() { > StringBuffer bufHelp = new StringBuffer(); >- bufHelp.append(Messages.getString("AutomationClientAdapter.21")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.22")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.221")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.222")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.25")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.23")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.26")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.27")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.28")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.29")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.30")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.31")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.59")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.60")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.61")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.53")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.54")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.55")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.32")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.33")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.34")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.35")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.36")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.37")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.41")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.42")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.43")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.50")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.51")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.52")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.44")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.45")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.46")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.47")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.48")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.49")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.88")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.89")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.90")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.91")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.92")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.93")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.94")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.85")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.86")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.87")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.62")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.63")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.66")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.67")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.68")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.69")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.70")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.71")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.72")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.73")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.74")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.79")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.81")); //$NON-NLS-1$ >- bufHelp.append(Messages.getString("AutomationClientAdapter.84")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.21")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.22")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.221")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.222")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.25")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.23")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.26")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.27")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.28")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.29")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.30")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.31")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.59")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.60")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.61")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.53")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.54")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.55")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.32")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.33")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.34")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.35")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.36")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.37")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.41")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.42")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.43")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.50")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.51")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.52")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.44")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.45")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.46")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.47")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.48")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.49")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.88")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.89")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.90")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.91")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.92")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.93")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.94")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.85")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.86")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.87")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.62")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.63")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.66")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.67")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.68")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.69")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.70")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.71")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.72")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.73")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.74")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.79")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.81")); //$NON-NLS-1$ >+ bufHelp.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.84")); //$NON-NLS-1$ > System.out.println(bufHelp); > } > >@@ -310,7 +307,7 @@ > */ > private static void writeMessagesToUser() { > if (message.length() > 0) { >- message.append(Messages.getString("AutomationClientAdapter.18") + //$NON-NLS-1$ >+ message.append(AutomationClientResourceBundle.getString("AutomationClientAdapter.18") + //$NON-NLS-1$ > lineSeparator); > System.out.println(message); > } >Index: src-automation-core/org/eclipse/hyades/automation/core/internal/resources/AutomationCoreResourceBundle.java >=================================================================== >RCS file: src-automation-core/org/eclipse/hyades/automation/core/internal/resources/AutomationCoreResourceBundle.java >diff -N src-automation-core/org/eclipse/hyades/automation/core/internal/resources/AutomationCoreResourceBundle.java >--- src-automation-core/org/eclipse/hyades/automation/core/internal/resources/AutomationCoreResourceBundle.java 20 Mar 2008 18:49:59 -0000 1.1 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,38 +0,0 @@ >-/********************************************************************** >- * Copyright (c) 2008 IBM Corporation and others. >- * 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 >- * $Id: >- * >- * Contributors: >- * IBM - Initial API and implementation >- **********************************************************************/ >-package org.eclipse.hyades.automation.core.internal.resources; >- >-import org.eclipse.osgi.util.NLS; >- >-/** >- * Automation core resource bundle. >- * <p> >- * >- * >- * @author Tony Wang >- * @version March 11, 2008 >- * @since March 11, 2008 >- */ >-public final class AutomationCoreResourceBundle extends NLS { >- >- private static final String BUNDLE_NAME = "org.eclipse.hyades.automation.core.internal.resources.messages";//$NON-NLS-1$ >- >- private AutomationCoreResourceBundle() { >- // Do not instantiate >- } >- >- public static String Guid_DUPLICATE_TIME_; >- >- static { >- NLS.initializeMessages(BUNDLE_NAME, AutomationCoreResourceBundle.class); >- } >-} >Index: src-automation-core/org/eclipse/hyades/automation/core/internal/resources/messages.properties >=================================================================== >RCS file: src-automation-core/org/eclipse/hyades/automation/core/internal/resources/messages.properties >diff -N src-automation-core/org/eclipse/hyades/automation/core/internal/resources/messages.properties >--- src-automation-core/org/eclipse/hyades/automation/core/internal/resources/messages.properties 24 Mar 2008 18:35:53 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,22 +0,0 @@ >-############################################################################### >-# Copyright (c) 2008 IBM Corporation and others. >-# 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 >-# $Id: messages.properties,v 1.3 2008/03/24 18:35:53 jkubasta Exp $ >-# >-# Contributors: >-# IBM Corporation - initial API and implementation >-############################################################################### >-# >-# messages.properties >-# >-# NOTE: When using substitution parameters, all single quote characters (e.g. ') must be escaped with a preceding single quote character (e.g. ''text in single quotes''). >-# >-# NLS_MESSAGEFORMAT_VAR >-# NLS_ENCODING=UTF-8 >- >- >-# Guid.java message(s): >-Guid_DUPLICATE_TIME_ = \"{0}\" has been duplicated {1} time(s). >Index: src-automation-core/org/eclipse/hyades/automation/core/utils/Guid.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-core/org/eclipse/hyades/automation/core/utils/Guid.java,v >retrieving revision 1.3 >diff -u -r1.3 Guid.java >--- src-automation-core/org/eclipse/hyades/automation/core/utils/Guid.java 20 Mar 2008 18:49:59 -0000 1.3 >+++ src-automation-core/org/eclipse/hyades/automation/core/utils/Guid.java 25 Apr 2008 20:24:06 -0000 >@@ -21,9 +21,6 @@ > import java.util.Hashtable; > import java.util.Random; > >-import org.eclipse.hyades.automation.core.internal.resources.AutomationCoreResourceBundle; >-import org.eclipse.osgi.util.NLS; >- > /** > * Abstract from IETF Specification: > * <p> >@@ -529,7 +526,7 @@ > > private static byte[] getByteArrayFromString(String s) { > int dataLength = s.length(); >- s += " "; >+ s += " "; //$NON-NLS-1$ > > String hcs = new String(hexChars); > byte[] data = new byte[dataLength / 2]; >@@ -623,20 +620,10 @@ > return (hexString.trim()); > } > >- // /** >- // * Utility function. Must be empty for production build! >- // */ >- // private static void debugPrint(String str) >- // { >- // System.out.println(str); >- // } >- >- /** >- */ > public static void main(String[] args) { > > Hashtable generatedGuids = new Hashtable(); >- String guid = ""; >+ String guid = ""; //$NON-NLS-1$ > > for (int counter = 0; counter < 10; counter++) { > >@@ -654,7 +641,6 @@ > > while (enumeration.hasMoreElements()) { > guid = ((String) (enumeration.nextElement())); >- System.out.println(NLS.bind(AutomationCoreResourceBundle.Guid_DUPLICATE_TIME_, guid, generatedGuids.get(guid))); > } > } > } >Index: src-automation-client/org/eclipse/hyades/automation/client/internal/resources/AutomationClientResourceBundle.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/internal/resources/AutomationClientResourceBundle.java,v >retrieving revision 1.2 >diff -u -r1.2 AutomationClientResourceBundle.java >--- src-automation-client/org/eclipse/hyades/automation/client/internal/resources/AutomationClientResourceBundle.java 10 Apr 2008 13:45:14 -0000 1.2 >+++ src-automation-client/org/eclipse/hyades/automation/client/internal/resources/AutomationClientResourceBundle.java 25 Apr 2008 20:24:06 -0000 >@@ -11,43 +11,196 @@ > **********************************************************************/ > package org.eclipse.hyades.automation.client.internal.resources; > >+import java.text.MessageFormat; >+import java.util.MissingResourceException; >+import java.util.ResourceBundle; >+ > import org.eclipse.osgi.util.NLS; > > /** > * Automation client resource bundle. >- * <p> >+ * <p/> >+ * Message formatting is handled by either OSGi, ICU or Java, based on the following steps: >+ * <p/> >+ * <ol> >+ * <li>If OSGi is available at run-time, message formatting is handled by {@link NLS#bind(String, Object[])}.</li> >+ * <li>Otherwise, if ICU is available at run-time, message formatting is handled by {@link com.ibm.icu.text.MessageFormat#format(String, Object[])}.</li> >+ * <li>Otherwise, message formatting is handled by {@link MessageFormat#format(String, Object[])}.</li> >+ * </ol> >+ * </p> > * > * > * @author Tony Wang >- * @version March 12, 2008 >+ * @author Paul E. Slauenwhite >+ * @version April 25, 2008 > * @since March 12, 2008 > */ >-public final class AutomationClientResourceBundle extends NLS { >+public final class AutomationClientResourceBundle { >+ >+ /** >+ * Static flag for quickly determining if the >+ * ICU classes are available on the class path. >+ * <p/> >+ * By default, the ICU classes are assumed to >+ * be available on the class path. >+ */ >+ private static boolean isICUAvailable = true; >+ >+ /** >+ * Static flag for quickly determining if the >+ * OSGi classes are available on the class path. >+ * <p/> >+ * By default, the OSGi classes are assumed to >+ * be available on the class path. >+ */ >+ private static boolean isOSGiAvailable = true; >+ >+ /** >+ * The resource bundle. >+ */ >+ protected static ResourceBundle resourceBundle = null; > >+ /** >+ * The name of the resource bundle. >+ */ > private static final String BUNDLE_NAME = "org.eclipse.hyades.automation.client.internal.resources.messages";//$NON-NLS-1$ > >- private AutomationClientResourceBundle() { >- // Do not instantiate >- } >- >- public static String AutomationClientAdapter_ADDING_FILE_; >- public static String AutomationClientAdapter_FILE_NOT_EXIST_; >- public static String AutomationClientAdapter_NO_TEST_SPECIFIED_; >- public static String AutomationClientAdapter_NO_PARAM_SPECIFIED_; >- public static String AutomationClientAdapter_SPEICIFY_SOURCE_OF_TESTS_; >- public static String AutomationClientAdapter_SPEICIFY_SOURCE_OF_RESULTS_; >- public static String AutomationClientAdapter_UNABLE_PARSE_DATETIME_; >- public static String AutomationClientAdapter_INVALID_PROJECT_; >+ /** >+ * Resolves the localized message associated with the parameter <code>key</code> >+ * from the resource bundle. >+ * <p/> >+ * If the <code>key</code> does not exist in the resource bundle, the <code>key</code> >+ * is returned. >+ * <p/> >+ * Noteworthy, the resultant message is not formatted (e.g. no message parameter substitution). >+ * <p/> >+ * >+ * @param key The <code>key</code> of the message in the resource bundle. >+ * @return The localized message associated with the parameter <code>key</code> from the resource bundle, otherwise the <code>key</code>. >+ */ >+ public static String getString(String key) { >+ >+ if (resourceBundle == null ) { >+ >+ //Resolve the resource bundle: >+ try { >+ resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME); >+ } >+ catch (MissingResourceException m) { >+ return key; >+ } >+ } >+ >+ try{ >+ return (resourceBundle.getString(key.trim()).trim()); >+ } >+ catch(Exception e){ >+ //Ignore and return the key. >+ } >+ >+ return key; >+ } >+ >+ /** >+ * Resolves the localized and formatted message associated with the parameter <code>key</code> >+ * and message parameter from the resource bundle. >+ * <p/> >+ * Message formatting is handled by either OSGi, ICU or Java, based on the following steps: >+ * <p/> >+ * <ol> >+ * <li>If OSGi is available at run-time, message formatting is handled by {@link NLS#bind(String, Object[])}.</li> >+ * <li>Otherwise, if ICU is available at run-time, message formatting is handled by {@link com.ibm.icu.text.MessageFormat#format(String, Object[])}.</li> >+ * <li>Otherwise, message formatting is handled by {@link MessageFormat#format(String, Object[])}.</li> >+ * </ol> >+ * <p/> >+ * If the <code>key</code> does not exist in the resource bundle, the <code>key</code> is >+ * returned. >+ * <p/> >+ * >+ * @param key The <code>key</code> of the message in the resource bundle. >+ * @param argument The first message parameter for formatting in the localized and formatted message. >+ * @return The localized and formatted message associated with the parameter <code>key</code> from the resource bundle, otherwise the <code>key</code>. >+ */ >+ public static String getString(String key, Object argument) { >+ return (getString(key, new Object[] { argument})); >+ } >+ >+ /** >+ * Resolves the localized and formatted message associated with the parameter <code>key</code> >+ * and message parameters from the resource bundle. >+ * <p/> >+ * Message formatting is handled by either OSGi, ICU or Java, based on the following steps: >+ * <p/> >+ * <ol> >+ * <li>If OSGi is available at run-time, message formatting is handled by {@link NLS#bind(String, Object[])}.</li> >+ * <li>Otherwise, if ICU is available at run-time, message formatting is handled by {@link com.ibm.icu.text.MessageFormat#format(String, Object[])}.</li> >+ * <li>Otherwise, message formatting is handled by {@link MessageFormat#format(String, Object[])}.</li> >+ * </ol> >+ * <p/> >+ * If the <code>key</code> does not exist in the resource bundle, the <code>key</code> is >+ * returned. >+ * <p/> >+ * >+ * @param key The <code>key</code> of the message in the resource bundle. >+ * @param argumentA The first message parameter for formatting in the localized and formatted message. >+ * @param argumentB The second message parameter for formatting in the localized and formatted message. >+ * @return The localized and formatted message associated with the parameter <code>key</code> from the resource bundle, otherwise the <code>key</code>. >+ */ >+ public static String getString(String key, Object argumentA, Object argumentB) { >+ return (getString(key, new Object[] { argumentA, argumentB})); >+ } >+ >+ /** >+ * Resolves the localized and formatted message associated with the parameter <code>key</code> >+ * and message parameters from the resource bundle. >+ * <p/> >+ * Message formatting is handled by either OSGi, ICU or Java, based on the following steps: >+ * <p/> >+ * <ol> >+ * <li>If OSGi is available at run-time, message formatting is handled by {@link NLS#bind(String, Object[])}.</li> >+ * <li>Otherwise, if ICU is available at run-time, message formatting is handled by {@link com.ibm.icu.text.MessageFormat#format(String, Object[])}.</li> >+ * <li>Otherwise, message formatting is handled by {@link MessageFormat#format(String, Object[])}.</li> >+ * </ol> >+ * <p/> >+ * If the <code>key</code> does not exist in the resource bundle, the <code>key</code> is >+ * returned. >+ * <p/> >+ * >+ * @param key The <code>key</code> of the message in the resource bundle. >+ * @param arguments The array of message parameters for formatting in the localized and formatted message. >+ * @return The localized and formatted message associated with the parameter <code>key</code> from the resource bundle, otherwise the <code>key</code>. >+ */ public static String getString(String key, Object[] arguments) { >+ >+ try { >+ >+ if(isICUAvailable){ >+ >+ try { >+ return (NLS.bind(getString(key), arguments)); >+ } >+ catch (NoClassDefFoundError n) { >+ >+ //OSGi is not available at run-time, so try ICU. >+ isICUAvailable = false; >+ } >+ } > >- public static String AbstractExecutionStrategy_CONSOLE_REDIRECTION_; >- >- public static String OutOfProcessStrategy_AUTOMATION_SERVER_VALUE_; >- >- public static String Test_AGENT_CONTROLLER_UP_; >- public static String Test_RESULTS_COLLECTED_; >- public static String Test_OVERALL_TEST_RESULT_VERDICT_; >- >- static { >- NLS.initializeMessages(BUNDLE_NAME, AutomationClientResourceBundle.class); >- } >+ if(isOSGiAvailable){ >+ >+ try { >+ return (com.ibm.icu.text.MessageFormat.format(getString(key), arguments)); >+ } >+ catch (NoClassDefFoundError n) { >+ >+ //OSGi is not available at run-time, so default to Java. >+ isOSGiAvailable = false; >+ } >+ } >+ >+ return (MessageFormat.format(getString(key), arguments)); >+ } >+ catch (Exception e) { >+ return key; >+ } >+ } > } >Index: src-automation-client/org/eclipse/hyades/automation/client/internal/resources/messages.properties >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.hyades.execution/src-automation-client/org/eclipse/hyades/automation/client/internal/resources/messages.properties,v >retrieving revision 1.4 >diff -u -r1.4 messages.properties >--- src-automation-client/org/eclipse/hyades/automation/client/internal/resources/messages.properties 10 Apr 2008 13:45:14 -0000 1.4 >+++ src-automation-client/org/eclipse/hyades/automation/client/internal/resources/messages.properties 25 Apr 2008 20:24:06 -0000 >@@ -37,3 +37,79 @@ > Test_AGENT_CONTROLLER_UP_ = --> The agent controller is up and running > Test_RESULTS_COLLECTED_ = --> Results collected: {0} > Test_OVERALL_TEST_RESULT_VERDICT_ = --> Overall test result verdict: \"{0}\" >+ >+# AutomationClientAdapter.java messages(s): >+AutomationClientAdapter.0=Due to the above errors, no attempt was made to run a test, there are no results to view. >+AutomationClientAdapter.1=\r\nTEST COMMENT: {0} >+AutomationClientAdapter.5=Error, eclipse was not specified and was not found automatically. >+AutomationClientAdapter.6=Error, the path given for eclipsehome: {0}, is not a valid directory.\r\n >+AutomationClientAdapter.9=Error, the path given for workspace: {0}, is not a valid directory. >+AutomationClientAdapter.18=\nDue to the above errors, no attempt was made to run a test, there are no results to view. >+AutomationClientAdapter.19=Parameters accepted, starting the test run. >+AutomationClientAdapter.20=Error, a required jar file was not found: {0} >+AutomationClientAdapter.21=\r\nTPTP 4.1.0 Automation Client Adapter Help\r\n\r\n >+AutomationClientAdapter.22=Automatable services published through the automatable services framework are available for command through this\r\n >+AutomationClientAdapter.221=command line interface. The test execution service has named and more strongly typed parameters than the invocation\r\n >+AutomationClientAdapter.222=of an arbitrary published automatable service although both can be commanded and thus executed through this interface.\r\n\r\n >+AutomationClientAdapter.23=\ \ usage: automation-client-adapter -parm1 <parm1value> -parm2 <parm2value> (etc...)\r\n\r\n >+AutomationClientAdapter.25=Below is the usage definition and valid named parameters that may be used in any order (values containing spaces\r\nmust be in quotes):\r\n\r\n >+AutomationClientAdapter.26=\ \ -configfile <directorypath>\r\n >+AutomationClientAdapter.27=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Specify command line parameters via a user supplied config file.\r\n >+AutomationClientAdapter.28=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -configfile .\\example.config\r\n >+AutomationClientAdapter.29=\ \ -eclipse <directorypath>\r\n >+AutomationClientAdapter.30=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the full path to eclipse, usually detected automatically.\r\n >+AutomationClientAdapter.31=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -eclipse "C:\\eclipse"\r\n >+AutomationClientAdapter.32=\ \ -workspace <directorypath>\r\n >+AutomationClientAdapter.33=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the full path to the desired workspace.\r\n >+AutomationClientAdapter.34=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -workspace c:\\workspace\r\n >+AutomationClientAdapter.35=\ \ -project <relativedirectorypath>\r\n >+AutomationClientAdapter.36=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the location of the desired project relative to the workspace.\r\n >+AutomationClientAdapter.37=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -project testproj\r\n >+AutomationClientAdapter.41=\ \ -suite <relativefilepath>\r\n >+AutomationClientAdapter.42=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the location of the test suite to run relative to the project.\r\n >+AutomationClientAdapter.43=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -suite mytest OR -suite tests\\mytest\r\n >+AutomationClientAdapter.44=\ \ -results <relativefilepath>\r\n >+AutomationClientAdapter.45=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the results relative to the project.\r\n >+AutomationClientAdapter.46=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -result myresults OR -result results\\myresults\r\n >+AutomationClientAdapter.47=\ \ -overwrite <true or false>\r\n >+AutomationClientAdapter.48=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ if "true" the specified results will be overwritten.\r\n >+AutomationClientAdapter.49=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -overwrite true (default is false).\r\n >+AutomationClientAdapter.50=\ \ -deployment <relativefilepath>\r\n >+AutomationClientAdapter.51=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the deployment relative to the project.\r\n >+AutomationClientAdapter.52=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -deployment mydeployment OR -deployment deployments\\mydeployment\r\n >+AutomationClientAdapter.85=\ \ -configuration <relativefilepath>\r\n >+AutomationClientAdapter.86=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the namepath for the launch configuration relative to the project.\r\n >+AutomationClientAdapter.87=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ examples: -configuration mylaunch.launch OR -configuration launches\\mylaunch.launch.\r\n >+AutomationClientAdapter.88=\ \ -connection <connectionstring>\r\n >+AutomationClientAdapter.89=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specify the connection string specifying the agent controller to use.\r\n >+AutomationClientAdapter.90=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ format: <specification>:<class>://<host>:<port>/<instance>?user=<user>&password=<password>\r\n >+AutomationClientAdapter.91=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection tptp:rac://server.rtp.ibm.com:10002/default\r\n >+AutomationClientAdapter.92=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection tptp:iac://localhost/default\r\n >+AutomationClientAdapter.93=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection server.rtp.ibm.com\r\n >+AutomationClientAdapter.94=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -connection localhost:11010\r\n >+AutomationClientAdapter.53=\ \ -vmargs <string of VM args>\r\n >+AutomationClientAdapter.54=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ The JVM arguments specified will be used in launching the Eclipse instance.\r\n >+AutomationClientAdapter.55=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ example: -vmargs "-Xmx756 -Xquickstart"\r\n >+AutomationClientAdapter.59=\ \ -service <servicename>\r\n >+AutomationClientAdapter.60=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rather than running test execution service, this\r\n >+AutomationClientAdapter.61=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ specifies running another published automatable service.\r\n >+AutomationClientAdapter.62=\r\nA simple and typical usage example:\r\n\r\n >+AutomationClientAdapter.63=\ \ automation-client-adapter -workspace c:\\myworkspace -project myproj -suite mytest\r\n >+AutomationClientAdapter.66=\r\nIn a configfile, any of the above may be specified as a name=value pair. There are no leading hyphens permitted\r\nbetween name and value. >+AutomationClientAdapter.67=Each name=value pair must be on a separate line. Extra spaces around the name and value are\r\naccepted.\r\n\r\n >+AutomationClientAdapter.68=Config file example:\r\n\r\n >+AutomationClientAdapter.69=\ \ workspace = c:\\myworkspace\r\n >+AutomationClientAdapter.70=\ \ project = mytestproject\r\n >+AutomationClientAdapter.71=\ \ suite = mysuite\r\n >+AutomationClientAdapter.72=\ \ results = myresults\r\n >+AutomationClientAdapter.73=\ \ overwrite = true\r\n\r\n >+AutomationClientAdapter.74=Any supplied command line parameters values will override the value in the configuration file. The minimal set of\r\nparameter values are a specified eclipse instance (usually automatic), the workspace to use, the project, and the name\r\nof a suite to run. You may omit the ".testsuite" file extension.\r\n\r\n >+AutomationClientAdapter.79=Use standard shell commands to redirect output to a file. For example, in a Windows command prompt, do the following\r\nto redirect output to a file:\r\n\r\n >+AutomationClientAdapter.81=\ \ automation-client-adapter --help > c:\\mylog\\help.txt\r\n\r\n >+AutomationClientAdapter.84=This help is available via --help, -help, -?, or ?\r\n >+ >+# CommandLineArgumentParser.java message(s): >+ParseCmdLineArgs.1=Error, {0} specified more than once on the command line.\r\n >+ParseCmdLineArgs.3=Error, {0} specified more than once in the configfile.\r\n >+ParseCmdLineArgs.5=The config file specified was not found: {0}\r\n >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 228873
: 97683