From c206b003e4634762db6b6d343c79bb968073d18d Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 31 Mar 2008 12:21:55 +0000 Subject: [PATCH] [224873] WinCE cleanup: RAPI version 0.1.0, Javadoc fixes, adding README.txt for native build, NLS class, 4KB buffersize --- .../META-INF/MANIFEST.MF | 4 +-- .../wince/IWinCESubSystem.java | 2 +- .../wince/WinCEConnectorService.java | 2 +- .../wince/WinCEConnectorServiceManager.java | 2 +- .../services/wince/IWinCEService.java | 2 +- .../services/wince/files/Messages.java | 22 +++++-------- .../wince/files/WinCEFileService.java | 14 ++++----- .../services/wince/files/WinCEHostFile.java | 2 +- .../services/wince/files/messages.properties | 4 +-- .../files/wince/WinCEFileAdapter.java | 2 +- .../files/wince/WinCERemoteFile.java | 2 +- .../wince/WinCEFileServiceSubSystem.java | 2 +- .../WinCEFileSubSystemConfiguration.java | 6 ++-- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.tm.rapi/META-INF/MANIFEST.MF | 2 +- wince/org.eclipse.tm.rapi/build/README.txt | 31 +++++++++++++++++++ 17 files changed, 66 insertions(+), 41 deletions(-) create mode 100644 wince/org.eclipse.tm.rapi/build/README.txt diff --git a/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF b/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF index ccfbd50c9e9..35091b506c0 100644 --- a/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF +++ b/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)", - org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)" -Import-Package: org.eclipse.tm.rapi + org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.tm.rapi;bundle-version="[0.1.0,1.0.0)" Export-Package: org.eclipse.rse.internal.connectorservice.wince;x-internal:=true, org.eclipse.rse.internal.services.wince;x-internal:=true, org.eclipse.rse.internal.services.wince.files;x-internal:=true, diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/IWinCESubSystem.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/IWinCESubSystem.java index daa0632ce35..d243ffc0577 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/IWinCESubSystem.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/IWinCESubSystem.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from ISshSubSystem *******************************************************************************/ package org.eclipse.rse.internal.connectorservice.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java index d824cb33f70..2c422a2bb99 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SshConnectorService *******************************************************************************/ package org.eclipse.rse.internal.connectorservice.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java index cd4c3e12995..f9ec93bfff7 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SshConnectorServiceManager *******************************************************************************/ package org.eclipse.rse.internal.connectorservice.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java index 6f00956cc70..b6ab0c308f5 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from ISshService *******************************************************************************/ package org.eclipse.rse.internal.services.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java index bbc8934a6f1..5b9c5dc3be8 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java @@ -10,23 +10,17 @@ *******************************************************************************/ package org.eclipse.rse.internal.services.wince.files; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class Messages { +public class Messages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.rse.internal.services.wince.files.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); + public static String WinCEFileService_0; + public static String WinCEFileService_1; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } private Messages() { } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } } diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java index 96dcf06e9af..e744ee7ff2c 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SftpFileService and LocalFileService *******************************************************************************/ package org.eclipse.rse.internal.services.wince.files; @@ -225,8 +225,8 @@ public class WinCEFileService extends AbstractFileService implements IWinCEServi handle = session.createFile(fullPath, OS.GENERIC_READ, OS.FILE_SHARE_READ, OS.OPEN_EXISTING, OS.FILE_ATTRIBUTE_NORMAL); bos = new BufferedOutputStream(new FileOutputStream(localFile)); - // TODO: find the optimal buffer size - byte[] buffer = new byte[8 * 1024]; + // don't increase the buffer size! the native functions sometimes fail with large buffers, 4K always work + byte[] buffer = new byte[4 * 1024]; while (true) { int bytesRead = session.readFile(handle, buffer); if (bytesRead == -1) { @@ -334,8 +334,8 @@ public class WinCEFileService extends AbstractFileService implements IWinCEServi try { handle = session.createFile(fullPath, OS.GENERIC_WRITE, OS.FILE_SHARE_READ, OS.CREATE_ALWAYS, OS.FILE_ATTRIBUTE_NORMAL); - // TODO: find the optimal buffer size - byte[] buffer = new byte[8 * 1024]; + // don't increase the buffer size! the native functions sometimes fail with large buffers, 4K always work + byte[] buffer = new byte[4 * 1024]; while (true) { int bytesRead = bis.read(buffer); if (bytesRead == -1) { @@ -414,11 +414,11 @@ public class WinCEFileService extends AbstractFileService implements IWinCEServi } public String getDescription() { - return Messages.getString("WinCEFileService.12"); //$NON-NLS-1$ + return Messages.WinCEFileService_0; } public String getName() { - return Messages.getString("WinCEFileService.13"); //$NON-NLS-1$ + return Messages.WinCEFileService_1; } public void initService(IProgressMonitor monitor) { diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java index 2002310cc6b..da6502a5014 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SftpHostFile *******************************************************************************/ package org.eclipse.rse.internal.services.wince.files; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties index 7a9b556b6d9..41b806d825e 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties @@ -1,2 +1,2 @@ -WinCEFileService.12=The WinCE File Service uses ActiveSync/RAPI2 to provide service to the Files subsystem on the device. -WinCEFileService.13=WinCE File Service +WinCEFileService_0=The WinCE File Service uses ActiveSync/RAPI2 to provide service to the Files subsystem on the device. +WinCEFileService_1=WinCE File Service diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java index 8c5518b68a1..956f56f545e 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SftpFileAdapter *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java index 54481e70cd6..a93d618ddf3 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SftpRemoteFile *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java index a92f5202342..2dedb1de803 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from FileServiceSubSystem *******************************************************************************/ package org.eclipse.rse.subsystems.files.wince; diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java index 98b8c20828c..797f05016e5 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Radoslav Gerganov - initial API and implementation + * Radoslav Gerganov - derived from SftpFileSubSystemConfiguration *******************************************************************************/ package org.eclipse.rse.subsystems.files.wince; @@ -69,7 +69,7 @@ public class WinCEFileSubSystemConfiguration extends FileServiceSubSystemConfigu RemoteFileFilterString myHomeFilterString = new RemoteFileFilterString(this); myHomeFilterString.setPath("\\My Documents\\"); //$NON-NLS-1$ filterStrings.add(myHomeFilterString.toString()); - mgr.createSystemFilter(pool, "My Home", filterStrings); + mgr.createSystemFilter(pool, "My Home", filterStrings); //$NON-NLS-1$ //filter.setNonChangable(true); //filter.setSingleFilterStringOnly(true); @@ -77,7 +77,7 @@ public class WinCEFileSubSystemConfiguration extends FileServiceSubSystemConfigu filterStrings = new Vector(); RemoteFileFilterString rootFilesFilterString = new RemoteFileFilterString(this); filterStrings.add(rootFilesFilterString.toString()); - mgr.createSystemFilter(pool, "Root", filterStrings); + mgr.createSystemFilter(pool, "Root", filterStrings); //$NON-NLS-1$ } catch (Exception exc) { SystemBasePlugin.logError("Error creating default filter pool",exc); //$NON-NLS-1$ } diff --git a/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF index f2f8ca8846d..ac75adebc03 100644 --- a/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF +++ b/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.tm.rapi.examples.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime -Import-Package: org.eclipse.tm.rapi +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.tm.rapi;bundle-version="[0.1.0,1.0.0)" Export-Package: org.eclipse.tm.rapi.examples Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true diff --git a/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF index 512695e9c30..fa072b531f2 100644 --- a/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF +++ b/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.tm.rapi.tests Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Require-Bundle: org.junit -Import-Package: org.eclipse.tm.rapi +Require-Bundle: org.junit, + org.eclipse.tm.rapi;bundle-version="[0.1.0,1.0.0)" Export-Package: org.eclipse.tm.rapi.tests Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF index b0297a99c67..d36753e15b9 100644 --- a/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF +++ b/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tm.rapi -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.1.0.qualifier Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86)) Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/wince/org.eclipse.tm.rapi/build/README.txt b/wince/org.eclipse.tm.rapi/build/README.txt new file mode 100644 index 00000000000..43c25454b74 --- /dev/null +++ b/wince/org.eclipse.tm.rapi/build/README.txt @@ -0,0 +1,31 @@ +Instructions for building the native library (jrapi.dll) for win32-x86 +====================================================================== + +Requirements: + Windows 2000/XP/Vista, + Visual Studio 2005 or newer, + Windows Mobile (PocketPC/Smartphone) SDK 5.0 or newer, + JDK 1.4 or newer + +Building the library: + 1. Open the solution file (jrapi.sln) in Visual Studio. + + 2. Navigate to "Tools" -> "Options", and expand "Projects and Solutions", + and click "VC++ Directories". + + 3. In "Show directories for:" select "Include files". + + 4. Add the Activesync include directory from your Windows Mobile SDK: + \Activesync\Inc + + 5. Add the JNI include directories from your JDK: + \include + \include\win32 + + 6. In "Show directories for:" select "Library files". + + 7. Add the Activesync library directory from your Windows Mobile SDK: + \Activesync\Lib + + 8. Navigate to "Build", and click "Rebuild Solution" to rebuild the library. + The output dll will be placed in \lib\os\win32\x86