diff -Nru eclipse-rse-3.1.2/debian/changelog eclipse-rse-3.4.2/debian/changelog
--- eclipse-rse-3.1.2/debian/changelog 2013-03-21 20:48:30.000000000 +0000
+++ eclipse-rse-3.4.2/debian/changelog 2013-05-31 20:59:58.000000000 +0000
@@ -1,9 +1,31 @@
-eclipse-rse (3.1.2-1build1) raring; urgency=low
+eclipse-rse (3.4.2-1) unstable; urgency=low
- * No-change rebuild to fix libcommons-net2-java dependency.
- (LP: #1158182)
+ * New upstream release.
+ * Add d/get-orig-source.
+ * Removed obsolete d/fetch-eclipse-source.exclude.
+ * Use xz compression for upstream tarball.
+ * Bump Standards-Version to 3.9.4.
+ * Removed obsolete DM-Upload-Allowed field from d/control.
+ * Updated upstream homepage.
+ * Canonicalize Vcs-* fields.
+ * Removed default-jre | java5-runtime | java6-runtime from Depends.
- -- Graham Inggs May 2, 2006 The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content. If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
* The ByteStreamHandler class is used to abstract file read and write operations
@@ -41,15 +49,29 @@
protected DataStore _dataStore;
protected DataElement _log;
protected static final String FILEMSG_REMOTE_SAVE_FAILED = "RSEF5006"; //$NON-NLS-1$
-
+
+ // for file backups
+ private boolean _doBackups = true;
+ private boolean _keepBackups = false;
+
/**
- * Contructor
+ * Constructor
* @param dataStore the DataStore instance
*/
public ByteStreamHandler(DataStore dataStore, DataElement log)
- {
+ {
_dataStore = dataStore;
_log = log;
+
+ String doBackups = System.getProperty("backupfiles"); //$NON-NLS-1$
+ _doBackups = (doBackups == null || doBackups.equals("true")); //$NON-NLS-1$
+
+ if (_doBackups){
+ String keepBackups = System.getProperty("keepbackupfiles"); //$NON-NLS-1$
+
+ // default is not NOT keep backups
+ _keepBackups = (keepBackups != null && keepBackups.equals("true")); //$NON-NLS-1$
+ }
}
public String getId()
@@ -57,6 +79,100 @@
return getClass().getName();
}
+ class DeleteBackupThread extends SecuredThread {
+ private File _currentFile;
+ private File _backupFile;
+ private long _initialLength;
+ public DeleteBackupThread(DataStore dataStore, File currentFile, File backupFile){
+ super(dataStore);
+ _currentFile = currentFile;
+ _backupFile = backupFile;
+ _initialLength = _currentFile.length(); // get initial length so we can see if upload is still happening
+ }
+
+ public void run(){
+ super.run();
+ boolean doneDelete = false;
+
+ while (!doneDelete){
+ try {
+ Thread.sleep(10000); // wait 10 seconds
+ }
+ catch (InterruptedException e){
+ }
+
+ // make sure there was no disconnect
+ if (!_dataStore.isConnected()){
+ // keep the backup
+ doneDelete = true;
+ }
+ else {
+ long curLength = _currentFile.length();
+ if (curLength == _initialLength){ // looks like total upload is complete
+ _backupFile.delete();
+ doneDelete = true;
+ }
+ else {
+ _initialLength = curLength;
+ }
+ }
+ }
+ }
+ }
+
+ private void deleteBackupFile(File currentFile, File backupFile){
+ if (backupFile != null && !_keepBackups){ // only matters if there is a backup file
+ DeleteBackupThread thread = new DeleteBackupThread(_dataStore, currentFile, backupFile);
+ thread.start();
+ }
+ }
+
+ private void backupFile(File file, File backupFile){
+
+ /* this is nice but orginal file permissions not perserved
+ if(!file.renameTo(backupFile) && backupFile.exists()) {
+ backupFile.delete();
+ file.renameTo(backupFile);
+ }
+ */
+
+ /* in order to preserve original permissions for orignal file we can't rename
+ * instead we need to copy the file over
+ */
+ FileInputStream inputStream = null;
+ FileOutputStream backupFileStream = null;
+ try {
+ inputStream = new FileInputStream(file);
+ backupFileStream = new FileOutputStream(backupFile);
+
+ byte[] buffer = new byte[512000];
+ long totalSize = file.length();
+ int totalRead = 0;
+
+ while (totalRead < totalSize){
+ int available = inputStream.available();
+ available = (available < 512000) ? available : 512000;
+
+ int bytesRead = inputStream.read(buffer, 0, available);
+ if (bytesRead == -1) {
+ break;
+ }
+ backupFileStream.write(buffer, 0, bytesRead);
+ totalRead += bytesRead;
+ }
+ } catch (FileNotFoundException e) {
+ } catch (IOException e){
+ } finally {
+ try {
+ inputStream.close();
+ backupFileStream.close();
+ }
+ catch (IOException e){
+ }
+ }
+ }
+
+
/**
* Save a file in the specified location. This method is called by the
* DataStore when the communication layer receives a file transfer
@@ -79,16 +195,27 @@
{
// need to create directories as well
File file = new File(fileName);
+ File backupFile = null;
+ File parent = new File(file.getParent());
if (!file.exists())
- {
- File parent = new File(file.getParent());
+ {
parent.mkdirs();
}
else
{
+ if (!_dataStore.isVirtual()){ // only applies to server
+ // backup file on upload by default
+ if (_doBackups && parent.canWrite()){
+ // backup the file first
+ String n = file.getName();
+ backupFile = new File(parent, '.' + n + '~');
+ _dataStore.trace("Backing up as "+backupFile.getAbsolutePath()); //$NON-NLS-1$
+ backupFile(file, backupFile);
+ }
+ }
}
- File newFile = new File(fileName);
+ File newFile = new File(fileName);
FileOutputStream fileStream = new FileOutputStream(newFile);
if (binary)
@@ -104,6 +231,8 @@
}
fileStream.close();
+
+ deleteBackupFile(newFile, backupFile);
if (status == null)
return;
status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
@@ -152,9 +281,9 @@
{
// need to create directories as well
File file = new File(fileName);
+ File parent = new File(file.getParent());
if (!file.exists())
- {
- File parent = new File(file.getParent());
+ {
parent.mkdirs();
File newFile = new File(fileName);
@@ -194,6 +323,7 @@
outStream.close();
}
+
if (status == null)
return;
status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java 2008-09-25 18:28:47.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -13,6 +13,13 @@
*
* Contributors:
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David McKnight (IBM) - [373507] [dstore][multithread] reduce heap memory on disconnect for server
+ * David McKnight (IBM) - [380158] [dstore] DataStore.command() fails when multiple commands issue simultaneously
+ * David McKnight (IBM) - [385793] [dstore] DataStore spirit mechanism and other memory improvements needed
+ * David McKnight (IBM) - [389286] [dstore] element delete should not clear _attributes since elements get recycled
+ * David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view
+ * David McKnight (IBM) - [391065] [dstore][regression] DataElement with "" type treated as deleted (when it's not)
+ * David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1)
*******************************************************************************/
package org.eclipse.dstore.core.model;
@@ -22,7 +29,6 @@
import org.eclipse.dstore.core.util.StringCompare;
import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.dstore.internal.core.util.DataElementRemover;
import org.eclipse.dstore.internal.extra.DataElementActionFilter;
import org.eclipse.dstore.internal.extra.DesktopElement;
import org.eclipse.dstore.internal.extra.PropertySource;
@@ -70,7 +76,6 @@
{
_dataStore = null;
_parent = null;
- DataElementRemover.addToCreatedCount();
}
/**
@@ -82,13 +87,17 @@
{
_dataStore = dataStore;
_parent = null;
- DataElementRemover.addToCreatedCount();
}
+ /* Apparently having this method causes the GC to delay
+ * cleanup for DataElements. For a product this delayed cleanup
+ * can potentially result in an OOM so, at the expense of the
+ * memory logging function, we need to take this out.
protected void finalize()
{
DataElementRemover.addToGCedCount();
}
+ */
/**
* Initializes a
@@ -72,46 +76,83 @@
clean(object, 2);
}
+
+ private void unmap(DataElement element)
+ {
+ if (element.isDeleted() || element.isSpirit()){
+ HashMap map = _dataStore.getHashMap();
+ synchronized (map){
+ String id = element.getId();
+ // _dataStore.memLog("unmapping " + id);
+ map.remove(id);
+ _dataStore.addToRecycled(element);
+ }
+ }
+ }
+
protected void clean(DataElement object, int depth)
{
- if ((depth > 0) && (object != null) && object.getNestedSize() > 0)
- {
- List deletedList = _dataStore.findDeleted(object);
+ boolean isServer = !_dataStore.isVirtual();
+ if ((depth > 0) && object != null){
+ if (object.isSpirit() || object.isDeleted()){
+ DataElement parent = object.getParent();
+ cleanChildren(object);
+ unmap(object);
+ if (object.isSpirit() && isServer){
+ // officially delete this now
+ object.delete();
+ }
+ if (isServer){
+ object.clear();
+ }
+ if (parent != null){
+ synchronized (parent){
+ parent.removeNestedData(object);
+ }
+ }
+ }
+ else if (object.getNestedSize() > 0){
+ cleanChildren(object);
+ }
+ }
+ // remove objects under temproot
+ DataElement tmpRoot = _dataStore.getTempRoot();
+ if (tmpRoot != null){
+ tmpRoot.removeNestedData();
+ }
+ }
- for (int i = 0; i < deletedList.size(); i++)
- {
+
+ /*
+ protected void clean(DataElement object, int depth)
+ {
+ boolean isServer = !_dataStore.isVirtual();
+ if ((depth > 0) && object != null){
+ List deletedList = _dataStore.findDeleted(object);
+ for (int i = 0; i < deletedList.size(); i++){
DataElement child = (DataElement) deletedList.get(i);
- if (child != null && child.isDeleted())
- {
+ if (child != null && child.isDeleted()){
DataElement parent = child.getParent();
- DataElementRemover.addToRemovedCount();
cleanChildren(child); // clean the children
-
- if (child.isSpirit())
- {
- // officially delete this now
- child.delete();
+ unmap(child);
+ if (child.isSpirit() && isServer){
+ // officially delete this now
+ child.delete();
}
- child.clear();
- if (parent != null)
- {
- synchronized (parent)
- {
+ if (parent != null){
+ synchronized (parent){
parent.removeNestedData(child);
}
}
- // _dataStore.addToRecycled(child);
}
}
deletedList.clear();
}
- // delete objects under temproot
- _dataStore.getTempRoot().removeNestedData();
-
}
+*/
/**
* Recursively clean children for deletion
@@ -119,21 +160,25 @@
*/
protected void cleanChildren(DataElement parent)
{
+ boolean isServer = !_dataStore.isVirtual();
List nestedData = parent.getNestedData();
- if (nestedData != null)
- {
- for (int i = 0; i < nestedData.size(); i++){
- DataElement child = (DataElement)nestedData.get(i);
- cleanChildren(child);
-
- if (child.isSpirit())
- {
- // officially delete this now
- child.delete();
+ if (nestedData != null){
+ synchronized (nestedData){
+ for (int i = nestedData.size() - 1; i >= 0; i--){
+ DataElement child = (DataElement)nestedData.get(i);
+ if (child.isSpirit() || child.isDeleted()){
+ cleanChildren(child);
+ unmap(child);
+
+ if (isServer){
+ // officially delete this now
+ child.delete();
+ child.clear();
+ }
+ nestedData.remove(child);
+ }
+ }
}
- child.clear();
- parent.removeNestedData(child);
- }
}
}
@@ -163,43 +208,40 @@
* @param object an object to get updated
* @param immediate true indicates that this object should be first in the queue
*/
- public void update(DataElement object, boolean immediate)
- {
- synchronized (_dataObjects)
- {
- if (immediate)
- {
- _dataObjects.add(0, object);
- // none of this immediate stuff - just put it at the beginning
- //handle();
+ public void update(DataElement object, boolean immediate){
+ if (object != null){
+ String type = object.getType();
+ boolean statusDone = false;
+ boolean isStatus = DataStoreResources.model_status.equals(type);
+ if (isStatus){
+ statusDone = DataStoreResources.model_done.equals(object.getName()) || DataStoreResources.model_done.equals(object.getValue());
}
- else
- {
- if (!_dataObjects.contains(object))
- {
- _dataObjects.add(object);
+ synchronized (_dataObjects){
+ if (immediate){
+ _dataObjects.add(0, object);
}
- else
- {
-
- if (_dataStore != null && object != null && !object.isDeleted())
- {
- if (object.getType().equals(DataStoreResources.model_status))
- {
- if (object.getName().equals(DataStoreResources.model_done))
- {
- //DKM
+ else {
+ if (!_dataObjects.contains(object)){
+ _dataObjects.add(object);
+ }
+ else {
+ if (_dataStore != null && object != null && !object.isDeleted()){
+ if (isStatus && statusDone){
// move to the back of the queue
// this is done so that if status that was already queued changed to done in between
// requests, and had not yet been transferred over comm layer, the completed status
// object does not come back to client (as "done") before the results of a query
_dataObjects.remove(object);
- _dataObjects.add(object);
+ _dataObjects.add(object);
}
}
}
}
}
+ if (_dataStore != null && !_dataStore.isVirtual() && isStatus && statusDone){
+ _dataStore.disconnectObject(object.getParent()); // spirit the command and its children
+ // _dataStore.disconnectObject(object);
+ }
}
notifyInput();
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java 2009-07-17 13:13:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -24,6 +24,13 @@
* Noriaki Takatsu (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept
* David McKnight (IBM) - [257321] [dstore] "Error binding socket" should include port of the failed socket
* Noriaki Takatsu (IBM) - [283656] [dstore][multithread] Serviceability issue
+ * Noriaki Takatsu (IBM) - [289678][api][breaking] ServerSocket creation in multiple IP addresses
+ * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support
+ * David McKnight (IBM) - [368072] [dstore][ssl] no exception logged upon bind error
+ * David McKnight (IBM) - [371401] [dstore][multithread] avoid use of static variables - causes memory leak after disconnect
+ * David McKnight (IBM) - [378136] [dstore] miner.finish is stuck
+ * David McKnight (IBM) - [388472] [dstore] need alternative option for getting at server hostname
+ * David McKnight (IBM) - [390681] [dstore] need to merge differences between HEAD stream and 3.2 in ConnectionEstablisher.finished()
*******************************************************************************/
package org.eclipse.dstore.core.server;
@@ -49,6 +56,7 @@
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreAttributes;
import org.eclipse.dstore.core.model.ISSLProperties;
+import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
import org.eclipse.dstore.internal.core.server.ServerAttributes;
import org.eclipse.dstore.internal.core.server.ServerCommandHandler;
import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
@@ -72,7 +80,7 @@
private ServerSocket _serverSocket;
- private static boolean _continue;
+ private boolean _continue;
private ArrayList _receivers;
@@ -139,6 +147,25 @@
{
setup(port, timeout, ticket);
}
+
+ /**
+ * Creates a ConnectionEstablisher. Communication occurs
+ * on the specified port and the specified IP address,
+ * a timeout value indicates the idle wait time
+ * before shutting down, and ticket specified the required
+ * ticket for a client to present in order to work with the DataStore.
+ *
+ * @param port the number of the socket port
+ * @param backlog listen backlog
+ * @param bindAddr the local IP address to bind to
+ * @param timeout the idle duration to wait before shutting down
+ * @param ticket validation id required by the client to access the DataStore
+ * @since 3.2
+ */
+ public ConnectionEstablisher(String port, int backlog, InetAddress bindAddr, String timeout, String ticket)
+ {
+ setup(port, backlog, bindAddr, timeout, ticket);
+ }
/**
@@ -189,16 +216,41 @@
/**
* Tells the connection establisher to clean up and shutdown
*/
+ /**
+ * Tells the connection establisher to clean up and shutdown
+ */
public void finished(ServerReceiver receiver)
{
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher.finished()"); //$NON-NLS-1$
+ }
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher - removing sender"); //$NON-NLS-1$
+ }
_updateHandler.removeSenderWith(receiver.socket());
+
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher - removing receiver"); //$NON-NLS-1$
+ }
_receivers.remove(receiver);
+
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher - removing preference listener"); //$NON-NLS-1$
+ }
_dataStore.removeDataStorePreferenceListener(receiver);
//if (_receivers.size() == 0)
{
_continue = false;
- _commandHandler.finish();
+ _commandHandler.finish();
+
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher - finishing update handler"); //$NON-NLS-1$
+ }
_updateHandler.finish();
+
+ if (_dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "ConnectionEstablisher - finishing DataStore"); //$NON-NLS-1$
+ }
_dataStore.finish();
System.out.println(ServerReturnCodes.RC_FINISHED);
@@ -207,6 +259,7 @@
}
}
+
private void waitForConnections()
{
while (_continue == true)
@@ -282,7 +335,7 @@
- private ServerSocket createSocket(String portStr) throws UnknownHostException
+ private ServerSocket createSocket(String portStr, int backlog, InetAddress bindAddr) throws UnknownHostException
{
ServerSocket serverSocket = null;
SSLContext sslContext = null;
@@ -328,7 +381,13 @@
{
try
{
- serverSocket = sslContext.getServerSocketFactory().createServerSocket(i);
+ serverSocket = sslContext.getServerSocketFactory().createServerSocket(i, backlog, bindAddr);
+ }
+ catch (BindException e)
+ {
+ _msg = ServerReturnCodes.RC_BIND_ERROR + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println(_msg);
+ _dataStore.trace(_msg);
}
catch (Exception e)
{
@@ -336,7 +395,19 @@
}
else
{
- serverSocket = new ServerSocket(i);
+ try
+ {
+ serverSocket = new ServerSocket(i, backlog, bindAddr);
+ }
+ catch (BindException e)
+ {
+ _msg = ServerReturnCodes.RC_BIND_ERROR + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+ System.err.println(_msg);
+ _dataStore.trace(_msg);
+ }
+ catch (Exception e)
+ {
+ }
}
}
catch (Exception e)
@@ -363,11 +434,12 @@
{
try
{
- serverSocket = sslContext.getServerSocketFactory().createServerSocket(port);
+ serverSocket = sslContext.getServerSocketFactory().createServerSocket(port, backlog, bindAddr);
}
catch (BindException e){
_msg = ServerReturnCodes.RC_BIND_ERROR + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
System.err.println(_msg);
+ _dataStore.trace(_msg);
}
catch (Exception e)
{
@@ -378,11 +450,12 @@
{
try
{
- serverSocket = new ServerSocket(port);
+ serverSocket = new ServerSocket(port, backlog, bindAddr);
}
catch (BindException e){
_msg = ServerReturnCodes.RC_BIND_ERROR + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
System.err.println(_msg);
+ _dataStore.trace(_msg);
}
catch (Exception e)
{
@@ -392,7 +465,7 @@
}
return serverSocket;
}
-
+
/**
* Create the DataStore and initializes it's handlers and communications.
*
@@ -402,6 +475,20 @@
*/
private void setup(String portStr, String timeoutStr, String ticketStr)
{
+ setup(portStr, 50, null, timeoutStr, ticketStr);
+ }
+
+ /**
+ * Create the DataStore and initializes it's handlers and communications.
+ *
+ * @param portStr the number of the socket port
+ * @param backlog listen backlog
+ * @param bindAddr the local IP address to bind to
+ * @param timeoutStr the idle duration to wait before shutting down
+ * @param ticketStr validation id required by the client to access the DataStore
+ */
+ private void setup(String portStr, int backlog, InetAddress bindAddr, String timeoutStr, String ticketStr)
+ {
_maxConnections = 1;
@@ -435,7 +522,7 @@
try
{
- _serverSocket = createSocket(portStr);
+ _serverSocket = createSocket(portStr, backlog, bindAddr);
if (_serverSocket == null)
{
_continue = false;
@@ -460,14 +547,7 @@
System.err.println(ServerReturnCodes.RC_SUCCESS);
System.err.println(_serverSocket.getLocalPort());
_msg = ServerReturnCodes.RC_SUCCESS;
- try
- {
- System.err.println("Server running on: " + InetAddress.getLocalHost().getHostName()); //$NON-NLS-1$
- }
- catch (UnknownHostException e)
- {
- // keep running
- }
+ System.err.println("Server running on: " + ServerAttributes.getHostName()); //$NON-NLS-1$
}
}
catch (UnknownHostException e)
@@ -509,7 +589,7 @@
PrintWriter writer = new PrintWriter(bwriter);
String version = DataStoreAttributes.DATASTORE_VERSION;
- String preferenceVersion = System.getProperty("DSTORE_VERSION"); //$NON-NLS-1$
+ String preferenceVersion = System.getProperty(IDataStoreSystemProperties.DSTORE_VERSION);
if (preferenceVersion != null && preferenceVersion.length() > 0){
version = preferenceVersion;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java 2008-06-04 09:13:36.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2010 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
@@ -11,12 +11,17 @@
* Contributors:
* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
+ * David McKnight (IBM) - [305272] [dstore][multithread] log close in ServerLogger
*******************************************************************************/
package org.eclipse.dstore.core.server;
/**
* @since 3.0
+ * @noimplement This interface is not intended to be implemented by clients.
+ * Server logger implementations must subclass
+ * {@link ServerLogger} rather than implementing this
+ * interface directly.
*/
public interface IServerLogger
{
@@ -51,4 +56,10 @@
* @param message Message text to be logged.
*/
public void logDebugMessage(String minerName, String message);
+
+ /**
+ * closeLogFileStream
+ * @since 3.2
+ */
+ public void closeLogFileStream();
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java 2008-06-04 10:50:16.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2012 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
@@ -12,6 +12,8 @@
* Contributors:
* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
* Noriaki Takatsu (IBM) - [228335] [dstore][multithread] start() in SecuredThread class
+ * David McKnight (IBM) - [358301] [DSTORE] Hang during debug source look up
+ * David McKnight (IBM) - [373459] [dstore][multithread] duplicate finish() calls during idle timeout
*******************************************************************************/
package org.eclipse.dstore.core.server;
@@ -122,6 +124,9 @@
*/
public void run()
{
+ if (_dataStore != null && _dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "SecuredThread.run()..."); //$NON-NLS-1$
+ }
try
{
ISystemService systemService = SystemServiceManager.getInstance().getSystemService();
@@ -129,12 +134,18 @@
systemService.setThreadSecurity(_dataStore.getClient());
}
}
+ catch (OutOfMemoryError err){
+ System.exit(-1);
+ }
catch (Throwable e)
{
e.printStackTrace(new PrintWriter(System.err));
}
super.run();
+ if (_dataStore != null && _dataStore.getClient() != null) {
+ _dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "... end of SecuredThread.run()"); //$NON-NLS-1$
+ }
}
/**
@@ -169,5 +180,14 @@
}
}
*/
+
+ public void start(){
+ try {
+ super.start();
+ }
+ catch (OutOfMemoryError e){
+ System.exit(-1);
+ }
+ }
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java 2008-06-04 10:50:16.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2010 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
@@ -16,10 +16,12 @@
* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability
* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
+ * Noriaki Takatsu (IBM) - [289678][api][breaking] ServerSocket creation in multiple IP addresses
*******************************************************************************/
package org.eclipse.dstore.core.server;
+import java.net.InetAddress;
import java.util.StringTokenizer;
import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
@@ -157,6 +159,24 @@
{
_establisher = new ConnectionEstablisher(port, timeout, ticket);
}
+
+ /**
+ * Creates a new Server that waits on the specified socket port and
+ * the specified IP address with the backlog for
+ * the specified time interval before shutting down.
+ *
+ * @param port the number of the socket port to wait on
+ * @param backlog listen backlog
+ * @param bindAddr the local IP address to bind to
+ * @param timeout the idle time to wait before shutting down
+ * @param ticket the ticket that the client needs to interact with the DataStore
+ * @since 3.2
+ */
+ public Server(String port, int backlog, InetAddress bindAddr, String timeout, String ticket)
+ {
+ _establisher = new ConnectionEstablisher(port, backlog, bindAddr, timeout, ticket);
+ }
+
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java 2008-09-03 19:24:12.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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,6 +15,9 @@
* David McKnight (IBM) - [193426] don't display exceptions
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
* David McKnight (IBM) - [245714] [dstore] Multiple user ID/password prompts and connect fails
+ * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support
+ * David McKnight (IBM) - [378878] [dstore] Need ability to log handshake messages from the authentication/server process to ServerLauncher
+ * David McKnight (IBM) - [388472] [dstore] need alternative option for getting at server hostname
*******************************************************************************/
package org.eclipse.dstore.core.server;
@@ -26,12 +29,14 @@
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.RandomAccessFile;
import java.net.BindException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Date;
import javax.net.ssl.HandshakeCompletedEvent;
import javax.net.ssl.HandshakeCompletedListener;
@@ -42,6 +47,8 @@
import org.eclipse.dstore.core.model.DE;
import org.eclipse.dstore.core.model.IDataStoreConstants;
import org.eclipse.dstore.core.model.ISSLProperties;
+import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
+import org.eclipse.dstore.internal.core.server.ServerAttributes;
import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
import org.eclipse.dstore.internal.core.server.ServerSSLProperties;
import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
@@ -96,7 +103,9 @@
_reader = new BufferedReader(new InputStreamReader(_socket
.getInputStream(), DE.ENCODING_UTF_8));
} catch (java.io.IOException e) {
- System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
+ String msg = "ServerLauncher:" + e; //$NON-NLS-1$
+ System.out.println(msg);
+ logError(msg, e);
}
}
@@ -141,11 +150,15 @@
_serverProcess.waitFor();
} catch (Exception e) {
- System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
+ String msg = "ServerLauncher:" + e; //$NON-NLS-1$
+ System.out.println(msg);
+ logError(msg, e);
}
}
- System.out.println("finished on port " + _port); //$NON-NLS-1$
+ String msg = "finished on port " + _port; //$NON-NLS-1$
+ System.out.println(msg);
+
_outReader = null;
_errReader = null;
_serverProcess = null;
@@ -266,7 +279,7 @@
// contains the authorization
// script path
//
- String authPath = System.getProperty("RSE.AUTH"); //$NON-NLS-1$
+ String authPath = System.getProperty(IDataStoreSystemProperties.RSE_AUTH);
File authFile = null;
if (authPath != null && authPath.length() > 0)
{
@@ -332,6 +345,7 @@
launchStatus = "success"; //$NON-NLS-1$
}
+ logMessage("launch status = "+launchStatus); //$NON-NLS-1$
if ((launchStatus == null) || !launchStatus.equals("success")) //$NON-NLS-1$
{
_writer.println(IDataStoreConstants.AUTHENTICATION_FAILED);
@@ -341,6 +355,7 @@
// look for the server startup string, it needs to occur
// somewhere in the line.
String status = _errReader.readLine();
+ logMessage("status = "+status); //$NON-NLS-1$
while (status!=null && (status.indexOf(ServerReturnCodes.RC_DSTORE_SERVER_MAGIC) < 0))
{
status = _errReader.readLine();
@@ -358,7 +373,9 @@
_writer.println(_port);
_writer.println(ticket);
- System.out.println("launched new server on " + _port); //$NON-NLS-1$
+ String msg = "launched new server on " + _port; //$NON-NLS-1$
+ System.out.println(msg);
+ logMessage(msg);
connected = true;
}
else
@@ -398,16 +415,20 @@
}
catch (IOException e)
{
- System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
+ String msg = "ServerLauncher:" + e; //$NON-NLS-1$
+ System.out.println(msg);
+ logError(msg, e);
}
return connected;
}
public void handshakeCompleted(HandshakeCompletedEvent event) {
- System.out.println("handshake completed"); //$NON-NLS-1$
+ String msg = "handshake completed"; //$NON-NLS-1$
+ System.out.println(msg);
System.out.println(event);
-
+
+ logMessage(msg);
}
}
@@ -421,13 +442,16 @@
private ISSLProperties _sslProperties;
+ private boolean _logDaemon = false;
+ private RandomAccessFile _logFile = null;
+
public static int DEFAULT_DAEMON_PORT = 4075;
/**
* Constructor
*/
public ServerLauncher() {
- String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
+ String pluginPath = System.getProperty(IDataStoreSystemProperties.A_PLUGIN_PATH);
if (pluginPath == null) {
System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
System.exit(-1);
@@ -449,7 +473,7 @@
* the port for the daemon socket to run on
*/
public ServerLauncher(String portStr) {
- String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
+ String pluginPath = System.getProperty(IDataStoreSystemProperties.A_PLUGIN_PATH);
if (pluginPath == null) {
System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
System.exit(-1);
@@ -472,7 +496,7 @@
* the port range for launched servers
*/
public ServerLauncher(String portStr, String serverPortRange) {
- String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
+ String pluginPath = System.getProperty(IDataStoreSystemProperties.A_PLUGIN_PATH);
if (pluginPath == null) {
System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
System.exit(-1);
@@ -501,6 +525,31 @@
* @param portStr the daemon port
*/
public void init(String portStr) {
+
+ String logdaemonLocation = System.getProperty("logdaemonpath"); //$NON-NLS-1$
+ if (logdaemonLocation != null && logdaemonLocation.length() > 0){
+ // create temp file for logging
+ File traceFileHandle = new File(logdaemonLocation);
+ if (!traceFileHandle.exists()){
+ try { // try to create it
+ traceFileHandle.createNewFile();
+ } catch (IOException e) {
+ }
+ }
+ if (traceFileHandle.canWrite()){
+ try {
+ _logFile = new RandomAccessFile(traceFileHandle, "rw"); //$NON-NLS-1$
+ _logFile.seek(traceFileHandle.length());
+
+ logMessage("-----------------------------------------"); //$NON-NLS-1$
+ logMessage("Start Tracing at " + System.currentTimeMillis()); //$NON-NLS-1$
+ _logDaemon = true;
+ }
+ catch (Exception e){
+ }
+ }
+ }
+
// create server socket from port
_sslProperties = new ServerSSLProperties();
@@ -540,23 +589,27 @@
if (_serverSocket != null
&& _serverSocket.getLocalPort() > 0) {
socketBound = true;
- System.out.println("Daemon running on: " //$NON-NLS-1$
- + InetAddress.getLocalHost().getHostName()
- + ", port: " + i); //$NON-NLS-1$
+ String msg = "Daemon running on: " + ServerAttributes.getHostName() + ", port: " + i; //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println(msg);
+ logMessage(msg);
}
} catch (UnknownHostException e) {
- System.err
- .println("Networking problem, can't resolve local host"); //$NON-NLS-1$
+ String msg = "Networking problem, can't resolve local host"; //$NON-NLS-1$
+ System.err.println(msg);
// don't display exceptions 193426
- //e.printStackTrace();
+ logError(msg, e);
System.exit(-1);
} catch (BindException e) {
- System.err.println("socket taken on " + i); //$NON-NLS-1$
+ String msg = "socket taken on " + i; //$NON-NLS-1$
+ System.err.println(msg);
+ logError(msg, e);
// keep going
} catch (IOException e) {
- System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$
+ String msg = "Failure to create ServerSocket"; //$NON-NLS-1$
+ System.err.println(msg);
// don't display exceptions 193426
//e.printStackTrace();
+ logError(msg, e);
System.exit(-1);
}
@@ -579,28 +632,70 @@
// don't display exceptions 193426
//e.printStackTrace();
System.err.println(e.getMessage());
+ logError(e.getMessage(), e);
System.exit(-1);
}
} else {
_serverSocket = new ServerSocket(port);
}
- System.out.println("Daemon running on: " //$NON-NLS-1$
- + InetAddress.getLocalHost().getHostName() + ", port: " //$NON-NLS-1$
- + port);
+
+ String msg = "Daemon running on: " //$NON-NLS-1$
+ + ServerAttributes.getHostName() + ", port: " //$NON-NLS-1$
+ + port;
+
+ System.out.println(msg);
+ logMessage(msg);
} catch (UnknownHostException e) {
- System.err
- .println("Networking problem, can't resolve local host"); //$NON-NLS-1$
+ String msg = "Networking problem, can't resolve local host"; //$NON-NLS-1$
+ System.err.println(msg);
// don't display exceptions 193426
//e.printStackTrace();
+ logError(msg, e);
System.exit(-1);
} catch (IOException e) {
- System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$
+ String msg = "Failure to create ServerSocket"; //$NON-NLS-1$
+ System.err.println(msg);
// don't display exceptions 193426
//e.printStackTrace();
+ logError(msg, e);
System.exit(-1);
}
}
}
+
+ private void logMessage(String msg){
+ if (_logDaemon && _logFile != null){
+ try {
+ _logFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$
+ _logFile.writeBytes(msg);
+ _logFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
+ }
+ catch (IOException e)
+ {
+ }
+ }
+ }
+
+ private void logError(String msg, Throwable e){
+ if (_logDaemon && _logFile != null){
+ try {
+ _logFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$
+ _logFile.writeBytes(msg);
+ _logFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
+
+ StackTraceElement[] stack = e.getStackTrace();
+ for (int i = 0;i
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2007.
+The material in this guide is Copyright (c) IBM Corporation and others 2000, 2012.
Terms and conditions regarding the use of this guide.
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/options.txt eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/options.txt
--- eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/options.txt 2008-04-11 22:16:12.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/options.txt 2013-02-12 20:26:45.000000000 +0000
@@ -10,9 +10,9 @@
-splitIndex
-windowtitle "Remote System Explorer DataStore API Specification"
-doctitle "Remote System Explorer DataStore API Specification"
--header "Remote System Explorer DataStore Guidelines for using DataStore APIs. March 17, 2005 February 1, 2011 Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content. Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads"). Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads"). The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations: Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+ Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content. The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification"). You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following: Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted. Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.About This Content
-
-License
-
-DataElement
to be reference to some other DataElement
.
@@ -293,6 +302,7 @@
public void reInitAsTransient(String attributes[])
{
_attributes = attributes;
+ setAttribute(DE.A_ID, DataStoreResources.model_transient);
_isReference = false;
_isDescriptor = false;
@@ -324,18 +334,18 @@
/**
* Indicates whether the DataElement
is deleted or not.
*
- * @return whehther the element is deleted or not
+ * @return whether the element is deleted or not
*/
public boolean isDeleted()
{
- if (_attributes == null)
+ if (_attributes == null || _attributes[0] == null)
{
return true;
}
String valueAttribute = getAttribute(DE.A_VALUE);
- if (valueAttribute != null && valueAttribute.equals(DataStoreResources.DELETED))
+ if (valueAttribute != null && valueAttribute.equals(DataStoreResources.DELETED) && !isDescriptor())
{
return true;
}
@@ -582,20 +592,19 @@
*/
public DataElement get(int index)
{
- if (_nestedData == null)
- {
+ if (_nestedData == null){
return null;
}
else
{
- if (getNestedSize() > index)
- {
- Object obj = _nestedData.get(index);
- return (DataElement) obj;
- }
- else
- {
- return null;
+ synchronized(_nestedData){ // bug 380158, sync needed to properly do concurrent commands
+ if (_nestedData.size() > index){
+ Object obj = _nestedData.get(index);
+ return (DataElement) obj;
+ }
+ else {
+ return null;
+ }
}
}
}
@@ -876,7 +885,21 @@
*/
public void setSpirit(boolean flag)
{
- _isSpirit = flag;
+ if (flag && isDescriptor()){
+ // descriptors should not be spirited
+ }
+ else {
+ _isSpirit = flag;
+ String refType = getAttribute(DE.A_REF_TYPE);
+ if (refType != null){
+ if (_isSpirit && !refType.equals(DataStoreResources.SPIRIT)) {
+ setAttribute(DE.A_REF_TYPE, DataStoreResources.SPIRIT);
+ }
+ else if (refType.equals(DataStoreResources.SPIRIT)){ // if it was a spirit, change it back
+ setAttribute(DE.A_REF_TYPE, DataStoreResources.VALUE);
+ }
+ }
+ }
}
/**
@@ -1435,6 +1458,8 @@
+ getSource()
+ "\n\tDepth:\t" //$NON-NLS-1$
+ _depth
+ + "\n\tisSpirit:\t" //$NON-NLS-1$
+ + _isSpirit
+ "\n\tDataStore:\t" //$NON-NLS-1$
+ _dataStore.getName()
+ "\n}\n"; //$NON-NLS-1$
@@ -1558,7 +1583,6 @@
_isUpdated = false;
_descriptor = typeDescriptor;
-
String depthStr = getAttribute(DE.A_DEPTH);
if (depthStr != null && depthStr.length() > 0)
{
@@ -1597,14 +1621,16 @@
}
String type = getAttribute(DE.A_TYPE);
- if (type.equals(DE.T_OBJECT_DESCRIPTOR)
- || type.equals(DE.T_COMMAND_DESCRIPTOR)
- || type.equals(DE.T_RELATION_DESCRIPTOR)
- || type.equals(DE.T_ABSTRACT_OBJECT_DESCRIPTOR)
- || type.equals(DE.T_ABSTRACT_COMMAND_DESCRIPTOR)
- || type.equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
- {
- _isDescriptor = true;
+ if (type != null){
+ if (type.equals(DE.T_OBJECT_DESCRIPTOR)
+ || type.equals(DE.T_COMMAND_DESCRIPTOR)
+ || type.equals(DE.T_RELATION_DESCRIPTOR)
+ || type.equals(DE.T_ABSTRACT_OBJECT_DESCRIPTOR)
+ || type.equals(DE.T_ABSTRACT_COMMAND_DESCRIPTOR)
+ || type.equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
+ {
+ _isDescriptor = true;
+ }
}
if (_nestedData != null)
@@ -1621,13 +1647,9 @@
{
for (int i = 0; i < _attributes.length; i++)
{
- String att = _attributes[i];
- if (att != null)
- {
- att = null;
- }
+ _attributes[i] = ""; //$NON-NLS-1$
}
-
+ // do not delete _attributes, since we recycle elements
}
if (_nestedData != null)
@@ -1653,10 +1675,10 @@
{
// set delete attribute
- setAttribute(DE.A_SOURCE, null);
+ setAttribute(DE.A_SOURCE, ""); //$NON-NLS-1$
setAttribute(DE.A_VALUE, DataStoreResources.DELETED);
- setAttribute(DE.A_TYPE, null);
- setAttribute(DE.A_NAME, null);
+ setAttribute(DE.A_TYPE, ""); //$NON-NLS-1$
+ setAttribute(DE.A_NAME, ""); //$NON-NLS-1$
_isUpdated = false;
_isExpanded = true;
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java 2009-08-24 16:51:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -31,6 +31,21 @@
* David McKnight (IBM) - [285151] [dstore] Potential threading problem in DataStore (open call)
* David McKnight (IBM) - [285301] [dstore] 100% CPU if user does not have write access to $HOME
* David McKnight (IBM) - [287457] [dstore] problems with disconnect when readonly trace file
+ * David McKnight (IBM) - [289891] [dstore] StringIndexOutOfBoundsException in getUserPreferencesDirectory when DSTORE_LOG_DIRECTORY is ""
+ * David McKnight (IBM) - [294933] [dstore] RSE goes into loop
+ * David McKnight (IBM) - [331922] [dstore] enable DataElement recycling
+ * David McKnight (IBM) - [336257] [dstore] leading file.searator in DSTORE_LOG_DIRECTORY not handled
+ * David McKnight (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support
+ * David McKnight (IBM) - [340080] [dstore] empty string should not be allowed as a DataElement ID
+ * David McKnight (IBM) - [351993] [dstore] not able to connect to server if .eclipse folder not available
+ * David McKnight (IBM) - [366070] [dstore] fix for bug 351993 won't allow tracing if .dstoreTrace doesn't exist
+ * David McKnight (IBM) - [367096] [dstore] DataElement.isSpirit() may return true for newly created DStore objects
+ * David McKnight (IBM) - [370260] [dstore] log the RSE version in server traces
+ * David McKnight (IBM) - [373507] [dstore][multithread] reduce heap memory on disconnect for server
+ * David McKnight (IBM) - [385097] [dstore] DataStore spirit mechanism is not enabled
+ * David McKnight (IBM) - [385793] [dstore] DataStore spirit mechanism and other memory improvements needed
+ * David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view
+ * David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1)
*******************************************************************************/
package org.eclipse.dstore.core.model;
@@ -66,6 +81,7 @@
import org.eclipse.dstore.extra.IDomainNotifier;
import org.eclipse.dstore.internal.core.client.ClientCommandHandler;
import org.eclipse.dstore.internal.core.model.DefaultByteConverter;
+import org.eclipse.dstore.internal.core.model.IDataStoreSystemProperties;
import org.eclipse.dstore.internal.core.server.ServerUpdateHandler;
import org.eclipse.dstore.internal.core.util.DataElementRemover;
import org.eclipse.dstore.internal.core.util.XMLgenerator;
@@ -143,11 +159,14 @@
private Random _random;
private int _initialSize;
+ private int _MAX_FREE = 10000;
private File _traceFileHandle;
private RandomAccessFile _traceFile;
private boolean _tracingOn;
+ private boolean _queriedSpiritState = false; // for the client - so we don't keep sending down the same query
+
private boolean _spiritModeOn = false;
private boolean _spiritCommandReceived = false;
private File _memLoggingFileHandle;
@@ -175,6 +194,15 @@
private Client _client;
/**
+ * Indicates the RSE plugin version that corresponds with this DataStore. This is only used
+ * for tracing so that users can determine which version of the org.eclipse.dstore.core plugin
+ * this came from.
+ *
+ * This needs to be updated for each major release.
+ */
+ private String _RSE_version = "3.4.2"; //$NON-NLS-1$
+
+ /**
* Creates a new DataStore
instance
*
* @param attributes the default attributes of the DataStore
@@ -188,7 +216,7 @@
_isConnected = false;
_logTimes = false;
setSpiritModeOnState();
- _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 100000;
+ _initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 10000;
initialize();
}
@@ -264,7 +292,7 @@
if (isVirtual()) _spiritModeOn = true;
else
{
- String doSpirit = System.getProperty("DSTORE_SPIRIT_ON"); //$NON-NLS-1$
+ String doSpirit = System.getProperty(IDataStoreSystemProperties.DSTORE_SPIRIT_ON);
_spiritModeOn = (doSpirit != null && doSpirit.equals("true")); //$NON-NLS-1$
}
}
@@ -844,7 +872,9 @@
*/
public int getNumElements()
{
- return _hashMap.size();
+ synchronized (_hashMap){
+ return _hashMap.size();
+ }
}
/**
@@ -921,9 +951,6 @@
reference.reInit(parent, realObject, relationType);
parent.addNestedData(reference, false);
- String sugId = reference.getId();
- _hashMap.put(sugId, reference);
-
refresh(parent);
return reference;
@@ -975,9 +1002,6 @@
parent.addNestedData(reference, false);
- String sugId = reference.getId();
- _hashMap.put(sugId, reference);
-
if (doRefresh)
{
refresh(parent);
@@ -1046,19 +1070,12 @@
toReference.reInit(parent, realObject, toRelation);
parent.addNestedData(toReference, false);
-
- String toId = toReference.getId();
- _hashMap.put(toId, toReference);
-
// reference with "from" relationship
DataElement fromReference = createElement();
fromReference.reInit(realObject, parent, fromRelation);
realObject.addNestedData(fromReference, false);
-
- String fromId = fromReference.getId();
- _hashMap.put(fromId, fromReference);
refresh(parent);
@@ -1093,10 +1110,6 @@
}
parent.addNestedData(toReference, false);
-
- String toId = toReference.getId();
- _hashMap.put(toId, toReference);
-
// reference with "from" relationship
DataElement fromReference = createElement();
@@ -1112,9 +1125,6 @@
realObject.addNestedData(fromReference, false);
- String fromId = fromReference.getId();
- _hashMap.put(fromId, fromReference);
-
refresh(parent);
@@ -1169,7 +1179,7 @@
public DataElement createTransientObject(String attributes[])
{
- DataElement newObject = createElement();
+ DataElement newObject = new DataElement(this);
newObject.reInitAsTransient(attributes);
return newObject;
@@ -1829,7 +1839,9 @@
*/
public boolean contains(String id)
{
- return _hashMap.containsKey(id);
+ synchronized (_hashMap){
+ return _hashMap.containsKey(id);
+ }
}
/**
@@ -2260,17 +2272,26 @@
return synchronizedCommand(cmd, _dummy);
}
+ /**
+ * Client calls this to start the spiriting mechanism on the server. The return value shouldn't be reliable here.
+ * Originally this was a synchronized command but that can slow connect time. Since no one should use the return value here,
+ *
+ * @return whether the server spirit state has been queried
+ */
public boolean queryServerSpiritState()
{
- DataElement spirittype = findObjectDescriptor(IDataStoreConstants.DATASTORE_SPIRIT_DESCRIPTOR);
- if (spirittype == null) return false;
- DataElement cmd = localDescriptorQuery(spirittype, IDataStoreConstants.C_START_SPIRIT, 2);
- if (cmd == null) return false;
-
- DataElement status = synchronizedCommand(cmd, _dummy);
- if ((status != null) && status.getName().equals(DataStoreResources.model_done))
- return true;
- else return false;
+ if (!_queriedSpiritState){
+ DataElement spirittype = findObjectDescriptor(IDataStoreConstants.DATASTORE_SPIRIT_DESCRIPTOR);
+ if (spirittype != null){
+ DataElement cmd = localDescriptorQuery(spirittype, IDataStoreConstants.C_START_SPIRIT, 2);
+
+ if (cmd != null){
+ command(cmd, _dummy); // start
+ _queriedSpiritState = true;
+ }
+ }
+ }
+ return _queriedSpiritState;
}
public DataElement queryHostJVM()
@@ -2488,7 +2509,7 @@
*/
public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject)
{
- return command(commandDescriptor, arguments, dataObject, false);
+ return command(commandDescriptor, arguments, dataObject, true);
}
/**
@@ -2504,7 +2525,8 @@
{
if (_commandHandler != null)
{
- return _commandHandler.command(commandDescriptor, arguments, dataObject, true, immediate);
+ // as per bug #396440, default is now to not use references
+ return _commandHandler.command(commandDescriptor, arguments, dataObject, false, immediate);
}
return null;
}
@@ -2535,7 +2557,8 @@
{
if (_commandHandler != null)
{
- return _commandHandler.command(commandDescriptor, arg, dataObject, true, immediate);
+ // as per bug #396440, default is now to not use references
+ return _commandHandler.command(commandDescriptor, arg, dataObject, false, immediate);
}
return null;
}
@@ -2549,6 +2572,7 @@
*/
public DataElement command(DataElement commandDescriptor, DataElement dataObject)
{
+ // as per bug #396440, default is now to not use references
return command(commandDescriptor, dataObject, false);
}
@@ -2609,9 +2633,35 @@
flush(_descriptorRoot);
flush(_dummy);
flush(_root);
-
+ flush(_externalRoot);
+
+ // make sure these aren't null set since
+ // Miners need them on shutdown
+ // _logRoot = null;
+ // _minerRoot = null;
+
+ _hostRoot = null;
+ _tempRoot = null;
+ _descriptorRoot = null;
+ _dummy = null;
+ _root = null;
+ _externalRoot = null;
+ _status = null;
+ _ticket = null;
+
+ // clear the maps
+ _classReqRepository.clear();
+ _cmdDescriptorMap.clear();
+ _hashMap.clear();
+ _lastCreatedElements.clear();
+ _localClassLoaders.clear();
+ _objDescriptorMap.clear();
+ _relDescriptorMap.clear();
+
+ _remoteLoader = null;
}
+
/**
* Delete information from the DataStore
contained by an element.
*
@@ -2691,7 +2741,10 @@
public void addToRecycled(DataElement toRecycle)
{
- if (!_recycled.contains(toRecycle)) _recycled.add(0, toRecycle);
+ synchronized (_recycled){
+ if (!_recycled.contains(toRecycle))
+ _recycled.add(0, toRecycle);
+ }
}
/**
@@ -2803,39 +2856,26 @@
return results;
}
- if (root.isDeleted())
+ if (root.isDeleted() && !results.contains(root))
{
results.add(root);
}
List searchList = root.getNestedData();
-
- if (searchList != null)
- {
- for (int i = 0; i < searchList.size(); i++)
- {
+ if (searchList != null){
+ for (int i = 0; i < searchList.size(); i++){
DataElement child = (DataElement) searchList.get(i);
- if (child != null)
- {
- synchronized (child)
- {
- if (child.isDeleted() && !results.contains(child))
- {
-
- results.add(child);
- if (!child.isReference())
- {
- if (depth > 0)
- {
- List sResults = findDeleted(child, depth - 1);
- for (int j = 0; j < sResults.size(); j++)
- {
- results.add(sResults.get(j));
- }
+ if (child != null){
+ if (child.isDeleted() && !results.contains(child)){
+ results.add(child);
+ if (!child.isReference()){
+ if (depth > 0){
+ List sResults = findDeleted(child, depth - 1);
+ for (int j = 0; j < sResults.size(); j++){
+ results.add(sResults.get(j));
}
-
- }
+ }
}
}
}
@@ -3120,8 +3160,10 @@
*/
public DataElement find(String id)
{
- DataElement result = (DataElement) _hashMap.get(id);
- return result;
+ synchronized (_hashMap){
+ DataElement result = (DataElement) _hashMap.get(id);
+ return result;
+ }
}
/**
@@ -3584,17 +3626,25 @@
_userPreferencesDirectory = _userPreferencesDirectory + File.separator;
}
- // for bug 282599, log directory allows customization of log location relative to user dir
- String logDirectory = System.getProperty("DSTORE_LOG_DIRECTORY"); //$NON-NLS-1$
+ // for bug 282599,
+ String logDirectory = System.getProperty(IDataStoreSystemProperties.DSTORE_LOG_DIRECTORY);
if (logDirectory == null){
logDirectory = ".eclipse" + File.separator + "RSE" + File.separator; //$NON-NLS-1$//$NON-NLS-2$
}
- // append a '/' if not there
- if (logDirectory.charAt( logDirectory.length() -1 ) != File.separatorChar ) {
- logDirectory = logDirectory + File.separator;
+
+ if (logDirectory.length() > 0){
+ // append a '/' if not there
+ if (logDirectory.charAt( logDirectory.length() -1 ) != File.separatorChar ) {
+ logDirectory = logDirectory + File.separator;
+ }
+
+ // remove the '/' if first char
+ if (logDirectory.charAt(0) == File.separatorChar){
+ logDirectory = logDirectory.substring(1);
+ }
}
- _userPreferencesDirectory = _userPreferencesDirectory + logDirectory + clientUserID;
+ _userPreferencesDirectory = _userPreferencesDirectory + logDirectory + clientUserID;
File dirFile = new File(_userPreferencesDirectory);
if (!dirFile.exists()) {
@@ -3634,7 +3684,7 @@
// if the idle is 0 or not set then it is considered indefinite.
// The server is considered idle for the period of which no commands are
// received in server command handler
- String serverIdleShutdownTimeout = System.getProperty("DSTORE_IDLE_SHUTDOWN_TIMEOUT"); //$NON-NLS-1$
+ String serverIdleShutdownTimeout = System.getProperty(IDataStoreSystemProperties.DSTORE_IDLE_SHUTDOWN_TIMEOUT);
if (serverIdleShutdownTimeout != null)
{
_serverIdleShutdownTimeout = Integer.parseInt(serverIdleShutdownTimeout);
@@ -3643,7 +3693,7 @@
}
- String tracingProperty = System.getProperty("DSTORE_TRACING_ON"); //$NON-NLS-1$
+ String tracingProperty = System.getProperty(IDataStoreSystemProperties.DSTORE_TRACING_ON);
if (tracingProperty != null && tracingProperty.equals("true")) //$NON-NLS-1$
{
_tracingOn = true;
@@ -3658,14 +3708,26 @@
if (SystemServiceManager.getInstance().getSystemService() == null){
String logDir = getUserPreferencesDirectory();
_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
-
- try
- {
- _traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
- startTracing();
+ if (!_traceFileHandle.exists()){
+ try { // try to create it
+ _traceFileHandle.createNewFile();
+ } catch (IOException e) {
+ }
}
- catch (IOException e)
- {
+ if (_traceFileHandle.canWrite()){
+ try
+ {
+ _traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
+ startTracing();
+ }
+ catch (IOException e)
+ {
+ // turn tracing off if there's a problem
+ _tracingOn = false;
+ }
+ }
+ else {
+ _tracingOn = false;
}
}
}
@@ -3692,21 +3754,34 @@
{
if (!isVirtual() && _deRemover == null)
{
- String memLogging = System.getProperty("DSTORE_MEMLOGGING_ON"); //$NON-NLS-1$
+ String memLogging = System.getProperty(IDataStoreSystemProperties.DSTORE_MEMLOGGING_ON);
_memLoggingOn = (memLogging != null && memLogging.equals("true")); //$NON-NLS-1$
if (_memLoggingOn)
{
String logDir = getUserPreferencesDirectory();
_memLoggingFileHandle = new File(logDir, ".dstoreMemLogging"); //$NON-NLS-1$
-
- try
- {
- _memLogFile = new RandomAccessFile(_memLoggingFileHandle, "rw"); //$NON-NLS-1$
- startMemLogging();
+ // need this check, otherwise, we don't create this log file
+ if (!_memLoggingFileHandle.exists()){
+ try { // try to create it
+ _memLoggingFileHandle.createNewFile();
+ } catch (IOException e) {
+ }
}
- catch (IOException e)
- {
+ if (_memLoggingFileHandle.canWrite()){
+ try
+ {
+ _memLogFile = new RandomAccessFile(_memLoggingFileHandle, "rw"); //$NON-NLS-1$
+ startMemLogging();
+ }
+ catch (IOException e)
+ {
+ // turn mem logging off if there's a problem
+ _memLoggingOn = false;
+ }
+ }
+ else {
+ _memLoggingOn = false;
}
}
_deRemover = new DataElementRemover(this);
@@ -3851,9 +3926,11 @@
*/
private void initElements(int size)
{
- for (int i = 0; i < size; i++)
- {
- _recycled.add(new DataElement(this));
+ synchronized (_recycled){
+ for (int i = 0; i < size; i++)
+ {
+ _recycled.add(new DataElement(this));
+ }
}
}
@@ -3869,23 +3946,14 @@
int numRecycled = _recycled.size();
- if (numRecycled > 1)
- {
- synchronized (_recycled)
- {
-
- /*
- if (numRecycled > _MAX_FREE)
- {
+ if (numRecycled > 0){
+ synchronized (_recycled){
+ if (numRecycled > _MAX_FREE){
int numRemoved = numRecycled - _MAX_FREE;
- for (int i = 1; i <= numRemoved; i++)
- {
- DataElement toRemove = (DataElement)_recycled.remove(numRemoved - i);
- toRemove = null;
- }
- }
- */
-
+ for (int i = numRemoved - 1; i >=0; i--){
+ _recycled.remove(i);
+ }
+ }
newObject = (DataElement) _recycled.remove((_recycled.size() - 1));
}
}
@@ -3893,7 +3961,7 @@
{
newObject = new DataElement(this);
}
-
+ newObject.setSpirit(false);
newObject.setUpdated(false);
updateLastCreated(newObject);
return newObject;
@@ -3955,6 +4023,7 @@
synchronized (_hashMap)
{
_hashMap.remove(id);
+ addToRecycled(toDelete);
}
if (!isConnected() && from != null)
@@ -3966,16 +4035,16 @@
private void disconnectObjectHelper(DataElement toDisconnect, int depth)
{
- if (depth > 0)
- {
+ if (depth > 0){
depth--;
_deRemover.addToQueueForRemoval(toDisconnect);
- for (int i = 0; i < toDisconnect.getNestedSize(); i++)
- {
- DataElement subDisconnect = toDisconnect.get(i);
- if (subDisconnect != null && subDisconnect.getDataStore() == this && !subDisconnect.isSpirit())
- {
- disconnectObjectHelper(subDisconnect, depth);
+ List nestedData = toDisconnect.getNestedData();
+ if (nestedData != null){
+ for (int i = 0; i < nestedData.size(); i++){
+ DataElement subDisconnect = (DataElement)nestedData.get(i);
+ if (subDisconnect != null && !subDisconnect.isSpirit() && !subDisconnect.isDescriptor() && !subDisconnect.isReference()){
+ disconnectObjectHelper(subDisconnect, depth);
+ }
}
}
}
@@ -3983,26 +4052,20 @@
private String makeIdUnique(String id)
{
-
- if (!_hashMap.containsKey(id))
+ boolean containsKey = false;
+ synchronized (_hashMap){
+ containsKey = _hashMap.containsKey(id);
+ }
+
+ if (!containsKey && id.length() > 0)
{
return id;
}
else
{
return generateId();
- /*
- String newId = String.valueOf(_random.nextInt());
- while (_hashMap.containsKey(newId))
- {
- newId = String.valueOf(_random.nextInt());
- }
-
- return newId;
- */
}
-
}
private String generateId(DataElement parent, String type, String name)
@@ -4019,16 +4082,13 @@
*/
protected String generateId()
{
- //return "" + _uniqueNumber++;
- ///*
String newId = String.valueOf(_random.nextInt());
- while (_hashMap.containsKey(newId))
+ while (contains(newId))
{
newId = String.valueOf(_random.nextInt());
}
return newId;
-// */
}
public void startTracing()
@@ -4045,6 +4105,7 @@
trace("-----------------------------------------"); //$NON-NLS-1$
trace("Start Tracing at " + System.currentTimeMillis()); //$NON-NLS-1$
+ trace("DataStore version: "+ _RSE_version); //$NON-NLS-1$
}
}
@@ -4139,6 +4200,14 @@
// which causes havoc for iSeries caching when switching between offline / online
//if (isVirtual())
// flush();
+
+ if (!isVirtual()){ // only on server
+ if (getClient() != null){
+ getClient().getLogger().logInfo(this.getName(), "DataStore.finish() - flush()"); //$NON-NLS-1$
+ }
+ flush();
+ }
+
if (_deRemover != null){
_deRemover.finish();
}
@@ -4337,12 +4406,13 @@
}
protected void assignCacheJar()
- {
+ {
String cacheDirectory = getCacheDirectory();
File cacheJar = new File(cacheDirectory + REMOTE_CLASS_CACHE_JARFILE_NAME + JARFILE_EXTENSION);
File nextCacheJar = new File(cacheDirectory + REMOTE_CLASS_CACHE_JARFILE_NAME + "_next" + JARFILE_EXTENSION); //$NON-NLS-1$
- if (nextCacheJar.exists()) nextCacheJar.renameTo(cacheJar);
- if (!cacheJar.exists())
+ if (nextCacheJar.exists())
+ nextCacheJar.renameTo(cacheJar);
+ if (!cacheJar.exists() && cacheJar.canWrite())
{
try
{
@@ -4350,6 +4420,8 @@
cacheOut.putNextEntry(new JarEntry("/")); //$NON-NLS-1$
cacheOut.closeEntry();
cacheOut.close();
+
+ _cacheJar = cacheJar;
}
catch (IOException e)
{
@@ -4358,11 +4430,11 @@
return;
}
}
+ else {
+ _cacheJar = null;
+ }
- _cacheJar = cacheJar;
- if (!_cacheJar.canWrite()){ // can't write this..don't bother with cache
- _cacheJar = null;
- }
+
}
protected String getCacheDirectory()
@@ -4496,13 +4568,20 @@
{
if (_tracingOn) {
_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
- try
- {
- _traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
- startTracing();
+ if (_traceFileHandle.canWrite()){
+ try
+ {
+ _traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
+ startTracing();
+ }
+ catch (IOException e)
+ {
+ // turn tracing off if there's a problem
+ _tracingOn = false;
+ }
}
- catch (IOException e)
- {
+ else {
+ _tracingOn = false;
}
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java 2008-05-02 15:26:33.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation. All rights reserved.
+ * Copyright (c) 2002, 2012 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,8 @@
*
* Contributors:
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David McKnight (IBM) - [385097] [dstore] DataStore spirit mechanism is not enabled
+ * David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1)
********************************************************************************/
package org.eclipse.dstore.core.model;
@@ -190,9 +192,6 @@
// miner-specific descriptors are defined in the miners when they extend the schema
// these first elements are the most fundamental
-// DataElement uiCmdD = _dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
- _dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
-
_commandDescriptor = _dataStore.createCommandDescriptor(schemaRoot, DE.T_COMMAND_DESCRIPTOR);
_objectDescriptor = _dataStore.createObjectDescriptor(schemaRoot, DE.T_OBJECT_DESCRIPTOR);
_relationDescriptor = _dataStore.createRelationDescriptor(schemaRoot, DE.T_RELATION_DESCRIPTOR);
@@ -332,7 +331,11 @@
_dataStore.createCommandDescriptor(rootD, "Notification", "*", C_NOTIFICATION, false); //$NON-NLS-1$ //$NON-NLS-2$
_dataStore.createCommandDescriptor(rootD, "Send Input", "*", C_SEND_INPUT, false); //$NON-NLS-1$ //$NON-NLS-2$
-
+
+ // spirit stuff
+ DataElement spiritnode = _dataStore.createObjectDescriptor(_dataStore.getDescriptorRoot(), IDataStoreConstants.DATASTORE_SPIRIT_DESCRIPTOR);
+ _dataStore.createCommandDescriptor(spiritnode, "StartSpirit", "DataElementRemover", IDataStoreConstants.C_START_SPIRIT); //$NON-NLS-1$ //$NON-NLS-2$
+
// both ends have this base schema, so mark each descriptor as updated
for (int i = 0; i < schemaRoot.getNestedSize(); i++)
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java
--- eclipse-rse-3.1.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java 2008-05-19 19:28:25.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -14,15 +14,19 @@
* Contributors:
* David McKnight (IBM) [202822] should not be synchronizing on clean method
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David McKnight (IBM) - [385793] [dstore] DataStore spirit mechanism and other memory improvements needed
+ * David McKnight (IBM) - [389286] [dstore] element delete should not clear _attributes since elements get recycled
+ * David McKnight (IBM) - [390037] [dstore] Duplicated items in the System view
+ * David McKnight (IBM) - [396440] [dstore] fix issues with the spiriting mechanism and other memory improvements (phase 1)
*******************************************************************************/
package org.eclipse.dstore.core.model;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.internal.core.util.DataElementRemover;
/**
*
Notices
Release 3.0"
--bottom '
Release 3.4"
+-bottom "Copyright (c) IBM Corporation and others 2000, 2012. All Rights Reserved."
+-link http://docs.oracle.com/javase/1.5.0/docs/api
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
-link http://bundles.osgi.org/javadoc/r4
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/plugin.properties eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/plugin.properties 2009-05-14 07:03:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -13,4 +13,4 @@
# NLS_ENCODING=UTF-8
pluginName=RSE DStore ISV Documentation
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/plugin.xml eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.dstore.doc.isv/plugin.xml 2009-05-14 07:03:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.dstore.doc.isv/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
-
Eclipse Foundation Software User Agreement
-Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.Applicable Licenses
-
+
+Applicable Licenses
+
-
-
+
-
-
-
-
Use of Provisioning Technology
+
+
+
+
Cryptography
true
if status done, false
otherwise.
@@ -284,8 +310,7 @@
}
setWorking(status);
-
- Display display = Display.getCurrent();
+
// Prevent infinite looping by introducing a threshold for wait
@@ -298,119 +323,49 @@
int initialWaitThreshold = WaitThreshold;
int nudges = 0; // nudges used for waking up server with slow connections
// nudge up to 12 times before giving up
-
- if (display != null)
+
+ // Current thread is not UI thread
+ while (_workingStatuses.contains(status))
{
- // Current thread is UI thread
- while (_workingStatuses.contains(status))
- {
- // while (display.readAndDispatch()) {
- //Process everything on event queue
- // }
-
- if ((monitor != null) && (monitor.isCanceled()))
- {
- setCancelled(status);
- throw new InterruptedException();
- }
-
- boolean statusDone = determineStatusDone(status);
-
- if (statusDone)
- {
- setDone(status);
- }
- else
- {
- try
- {
- Thread.sleep(100);
- }
- catch (InterruptedException e)
- {
- // Continue waiting in case of spurious interrupt.
- // We check the progress monitor to listen for Eclipse Shutdown.
- continue;
- }
- if (WaitThreshold > 0) // update timer count if
- // threshold not reached
- --WaitThreshold; // decrement the timer count
-
- if (WaitThreshold == 0)
- {
- wakeupServer(status);
-
- // no diagnostic factory but there is a timeout
- if (nudges >= 12)
- return status; // returning the undone status object
-
- nudges++;
- WaitThreshold = initialWaitThreshold;
- }
- else if (_networkDown || !_dataStore.isConnected())
- {
- dispose();
- throw new InterruptedException();
- }
- }
+
+ if ((monitor != null && monitor.isCanceled()) ||
+ !status.getDataStore().getStatus().getName().equals("okay")){ // datastore not okay?
+ setCancelled(status);
+ throw new InterruptedException();
}
+
+ boolean statusDone = determineStatusDone(status);
- }
- else
- {
- // Current thread is not UI thread
- while (_workingStatuses.contains(status))
+ if (statusDone)
+ {
+ setDone(status);
+ }
+ else
{
+ waitForUpdate();
- if ((monitor != null) && (monitor.isCanceled()))
+ if (WaitThreshold > 0) // update timer count if
+ // threshold not reached
+ --WaitThreshold; // decrement the timer count
+
+ if (WaitThreshold == 0)
{
- setCancelled(status);
+ wakeupServer(status);
+
+ // no diagnostic factory but there is a timeout
+ if (nudges >= 12)
+ return status; // returning the undone status object
+
+ nudges++;
+ WaitThreshold = initialWaitThreshold;
+ }
+ else if (_networkDown)
+ {
+ dispose();
throw new InterruptedException();
- }
-
- boolean statusDone = determineStatusDone(status);
-
- if (statusDone)
- {
- setDone(status);
- }
- else
- {
- try
- {
- Thread.sleep(100);
- }
- catch (InterruptedException e)
- {
- // Continue waiting in case of spurious interrupt.
- // We check the progress monitor to listen for Eclipse Shutdown.
- continue;
- }
-
- if (WaitThreshold > 0) // update timer count if
- // threshold not reached
- --WaitThreshold; // decrement the timer count
-
- if (WaitThreshold == 0)
- {
- wakeupServer(status);
-
- // no diagnostic factory but there is a timeout
- if (nudges >= 12)
- return status; // returning the undone status object
-
- nudges++;
- WaitThreshold = initialWaitThreshold;
- }
- else if (_networkDown)
- {
- dispose();
- throw new InterruptedException();
- }
- }
- }
- }
-
+ }
+ }
+ }
return status;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties 2009-08-24 20:12:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2008 IBM Corporation and others.
+# Copyright (c) 2006, 2009 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
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java 2008-06-09 17:43:46.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -19,6 +19,7 @@
* David McKnight (IBM) - [221095] [dstore][launcher] Specified REXEC port number is not used
* David McKnight (IBM) - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
* David McKnight (IBM) - [235756] [dstore] Unable to connect to host with SSL via REXEC
+ * David McKnight (IBM) - [390055] [DSTORE)Timeout for REXEC connection is too long
*******************************************************************************/
package org.eclipse.rse.internal.connectorservice.dstore;
@@ -476,7 +477,7 @@
int inBytes = rxIn.available(); // any data available?
- int timeout = _socketTimeoutValue;
+ int timeout = _socketTimeoutValue / 100;
while (inBytes == 0 && timeout > 0)
{
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/.cvsignore 2006-04-10 19:55:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF 2009-05-20 19:31:50.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.connectorservice.local
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.1.400.qualifier
Bundle-Activator: org.eclipse.rse.internal.connectorservice.local.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/build.properties eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/build.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/build.properties 2007-06-05 10:42:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
+# Copyright (c) 2005, 2012 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,3 +15,4 @@
source.. = src/
output.. = bin/
src.includes = about.html
+#FIXME#breaks hudson nightlies# javacProjectSettings = true
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/plugin.properties 2009-05-14 07:08:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -13,4 +13,4 @@
# NLS_ENCODING=UTF-8
pluginName = RSE Local Connector Service
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.connectorservice.local/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.connectorservice.local/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ * A PasswordPersistenceManager is sensitive to the "rse.enableSecureStoreAccess" property.
+ * If absent it defaults to true
.
+ * If present then the value must be true
to enable access to the secure store.
+ * The following code disables access to the secure store.
+ *
+ * System.setProperty("rse.enableSecureStoreAccess", "false");
*
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients. Use
* the {@link #getInstance()} method to get the singleton
* instance.
*/
+
+/*
+ * Passwords are stored in a node that is selected by system type id.
+ * Each password has a key that consists of a host name and a user id pair.
+ * The key is a string and looks like
+ * A SafeRunner keeps track of the thread that is running. If that thread + * reenters the SafeRunner, then it is allowed to continue execution. + */ + private class SafeRunner { + private Mutex semaphore = new Mutex(); + private Thread semaphoreOwner = null; + /** + * Run a runnable. If one is already running in this runner then this one will wait up to + * the specified timeout period. If the timeout expires an exception is thrown. + * @param runnable the runnable to run + * @param timeout the timeout value in milliseconds + * @param monitor the monitor that is tracking progress + * @throws TimeoutException if the timeout expires before the runner becomes unblocked. + */ + void run(UnsafeRunnableWithProgress runnable, long timeout, IProgressMonitor monitor) throws Exception { + if (semaphoreOwner != Thread.currentThread()) { + if (semaphore.waitForLock(monitor, timeout)) { + semaphoreOwner = Thread.currentThread(); + try { + if (monitor.isCanceled()) { + throw new OperationCanceledException(); + } + runnable.run(monitor); + } finally { + semaphore.release(); + semaphoreOwner = null; + } + } else { + throw new TimeoutException(timeout); + } + } else { + runnable.run(monitor); + } + } + } + + /** + * The TimeoutException is to be thrown when an operation experiences a time-out. + */ + // TODO it may be possible to replace this exception with the one in JRE 5.0 when that becomes the base + private class TimeoutException extends Exception { + private static final long serialVersionUID = 1L; + private long timeoutValue; + /** + * Creates a new TimeoutException with a particular value. + * @param timeoutValue The value of the timeout that expired in milliseconds. + */ + TimeoutException(long timeoutValue) { + this.timeoutValue = timeoutValue; + } + /** + * @return The value of the timeout in milliseconds. + */ + long getTimeout() { + return timeoutValue; + } + } + + /** + * This interface is used to describe operations that require a progress + * monitor and may throw arbitrary exceptions during their execution. + * It is meant to be a companion to the SafeRunner class which should + * serialize these and handle the exceptions appropriately. + */ + private interface UnsafeRunnableWithProgress { + void run(IProgressMonitor monitor) throws Exception; + } + + private final SafeRunner safeRunner = new SafeRunner(); + /* (non-Javadoc) * @see org.eclipse.rse.core.subsystems.IConnectorService#connect(org.eclipse.core.runtime.IProgressMonitor) */ public final void connect(IProgressMonitor monitor) throws Exception { - preConnect(); - internalConnect(monitor); - initializeSubSystems(monitor); - postConnect(); + long timeout = 120000; // two minute timeout, this is arbitrary but seems to be a good amount + UnsafeRunnableWithProgress runnable = new UnsafeRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws Exception { + preConnect(); + internalConnect(monitor); + initializeSubSystems(monitor); + postConnect(); + } + }; + try { + safeRunner.run(runnable, timeout, monitor); + } catch (TimeoutException e) { + String id = RSECorePlugin.getDefault().getBundle().getSymbolicName(); + String messageTemplate = "Connect operation timed out after {0} milliseconds. Operation canceled."; //TODO externalize this message in 3.3 + String message = NLS.bind(messageTemplate, new Long(e.getTimeout())); + IStatus status = new Status(IStatus.INFO, id, message); + RSECorePlugin.getDefault().getLog().log(status); + throw new OperationCanceledException(); + } } /** @@ -424,10 +521,24 @@ * @throws Exception if the disconnect fails */ public final void disconnect(IProgressMonitor monitor) throws Exception { - preDisconnect(); - internalDisconnect(monitor); - uninitializeSubSystems(monitor); - postDisconnect(); + long timeout = 120000; // two minute timeout + UnsafeRunnableWithProgress runnable = new UnsafeRunnableWithProgress() { + public void run(IProgressMonitor monitor) throws Exception { + preDisconnect(); + internalDisconnect(monitor); + uninitializeSubSystems(monitor); + postDisconnect(); + } + }; + try { + safeRunner.run(runnable, timeout, monitor); + } catch (TimeoutException e) { + String id = RSECorePlugin.getDefault().getBundle().getSymbolicName(); + String messageTemplate = "Disconnect operation timed out after {0} milliseconds."; //TODO externalize this message in 3.3 + String message = NLS.bind(messageTemplate, new Long(e.getTimeout())); + IStatus status = new Status(IStatus.INFO, id, message); + RSECorePlugin.getDefault().getLog().log(status); + } } /** diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java 2008-04-18 09:19:50.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractDelegatingConnectorService.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2007, 2008 IBM Corporation. All rights reserved. + * Copyright (c) 2007, 2011 IBM Corporation. All rights reserved. * This program and the accompanying materials are made available under the terms * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -14,6 +14,7 @@ * Martin Oberhuber (Wind River) - [185750] Remove IConnectorService.getHostType() * David Dykstal (IBM) - [210474] Deny save password function missing * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception + * David McKnight (IBM) - [338510] "Copy Connection" operation deletes the registered property set in the original connection ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -21,6 +22,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IPropertySet; +import org.eclipse.rse.core.model.IPropertySetContainer; import org.eclipse.rse.core.model.IRSEPersistableContainer; public abstract class AbstractDelegatingConnectorService implements IDelegatingConnectorService @@ -811,4 +813,15 @@ return result; } + /** + * @since 3.2 + */ + public void clonePropertySets(IPropertySetContainer targetContainer) { + IConnectorService connectorService = getRealConnectorService(); + if (connectorService != null) { + connectorService.clonePropertySets(targetContainer); + } + } + + } diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java 2008-04-04 14:03:18.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AuthenticatingConnectorService.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2012 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 @@ -11,6 +11,8 @@ * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods * David Dykstal (IBM) - [210474] Deny save password function missing * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception + * David McKnight (IBM) [323648] SSH Terminals subsystem should re-use user id and password for the Files subsystem + * David McKnight (IBM) [398234] Connect from host doesn't always propagate id/password to multiple contained connector services ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -121,14 +123,34 @@ * @see org.eclipse.rse.core.subsystems.IConnectorService#setPassword(java.lang.String, java.lang.String, boolean, boolean) */ public final void setPassword(String userId, String password, boolean persist, boolean propagate) { - if (getPrimarySubSystem().forceUserIdToUpperCase()) { + ISubSystem ss = getPrimarySubSystem(); + if (ss.forceUserIdToUpperCase()) { userId = userId.toUpperCase(); } + String myUserId = credentialsProvider.getUserId(); + IHost host = getHost(); if (host.compareUserIds(userId, myUserId)) { credentialsProvider.setPassword(password); } + else { + String hostName = host.getHostName(); + SystemSignonInformation existingSignon = null; + // check if there are any uid credentials saved here - if not, then use the new userID/password + List signonsWithIDs = PasswordPersistenceManager.getInstance().getSavedUserIDs(); + for (int i = 0 ; i < signonsWithIDs.size() && existingSignon != null; i++){ + SystemSignonInformation signon = (SystemSignonInformation)signonsWithIDs.get(i); + if (hostName.equals(signon.getHostname())){ + existingSignon = signon; + } + } + if (existingSignon == null){ + // update with propagated id/password + credentialsProvider.setUserId(userId); + credentialsProvider.setPassword(password); + } + } if (sharesCredentials() && propagate) { updatePasswordForOtherSystemsInConnection(userId, password, persist); } @@ -186,6 +208,12 @@ */ public final void acquireCredentials(boolean reacquire) throws OperationCanceledException { credentialsProvider.acquireCredentials(reacquire); + ICredentials credentials = credentialsProvider.getCredentials(); + IHost host = getHost(); + String userId = credentials.getUserId(); + String password = credentials.getPassword(); + boolean persist = PasswordPersistenceManager.getInstance().find(host.getSystemType(), host.getHostName(), userId) != null; + setPassword(userId, password, persist, true); } /* (non-Javadoc) diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSEInitJob.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSEInitJob.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSEInitJob.java 2008-09-02 17:53:12.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSEInitJob.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2008, 2013 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 @@ -10,6 +10,8 @@ * David McKnight (IBM) - [229610] [api] File transfers should use workspace text file encoding * David Dykstal (IBM) = [226958] add status values to waitForInitCompletion(phase) * David Dykstal (IBM) - [235581] Initialize RSE should be a daemon job + * David McKnight (IBM) - [283033] remoteFileTypes extension point should include "xml" type + * David Dykstal (IBM) - [397995] RSEInitJob runs too early ********************************************************************************/ package org.eclipse.rse.internal.core; @@ -18,7 +20,6 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IPath; @@ -40,7 +41,6 @@ import org.eclipse.rse.internal.core.model.SystemModelChangeEvent; import org.eclipse.rse.internal.core.model.SystemProfileManager; import org.eclipse.rse.logging.Logger; -import org.eclipse.rse.services.clientserver.SystemEncodingUtil; /** * This is a job named "Initialize RSE". It is instantiated and run during @@ -187,7 +187,7 @@ } } } - + /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ @@ -221,6 +221,8 @@ submonitor.done(); } + /* + * default encoding provider moved to startup of files.core // set the default encoding provider SystemEncodingUtil encodingUtil = SystemEncodingUtil.getInstance(); encodingUtil.setDefaultEncodingProvider( @@ -229,9 +231,10 @@ return ResourcesPlugin.getEncoding(); } }); - + */ + initializerPhase.done(result); - // finish up - propogate cancel if necessary + // finish up - propagate cancel if necessary if (monitor.isCanceled()) { result = Status.CANCEL_STATUS; } else { diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java 2008-04-07 12:48:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/filters/SystemFilterPoolReference.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2008 IBM Corporation and others. + * Copyright (c) 2002, 2012 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 @@ -18,6 +18,8 @@ * contained in the reference was not found. * David Dykstal (IBM) - [192122] extended search to look for filter pools in * profile during getReferencedFilterPool() rather than returning broken reference + * David McKnight (IBM) - [358999] Deleting multiple connections takes long time + * David McKnight (IBM) -[391132] filterpools don't persist when profile names end in _ *******************************************************************************/ package org.eclipse.rse.internal.core.filters; @@ -115,10 +117,17 @@ * The filter pool manager name is the same as its owning profile. */ String savedName = getReferencedObjectName(); - String[] parts = savedName.split(DELIMITER, 2); - String result = parts[0]; - if (parts.length == 2) { - result = parts[1]; + String result = null; + int lastDelim = savedName.lastIndexOf(DELIMITER); + if (lastDelim > 0){ + result = savedName.substring(lastDelim + DELIMITER_LENGTH); + } + else { + String[] parts = savedName.split(DELIMITER, 2); + result = parts[0]; + if (parts.length == 2) { + result = parts[1]; + } } return result; } @@ -134,16 +143,22 @@ * The filter pool manager name is the same as its owning profile. */ String result = null; - String savedName = getReferencedObjectName(); - String[] parts = savedName.split(DELIMITER, 2); - if (parts.length == 2) { - result = parts[0]; - } else { - ISystemFilterPoolReferenceManagerProvider provider = getProvider(); - if (provider instanceof ISubSystem) { - ISubSystem subsystem = (ISubSystem) provider; - ISystemProfile profile = subsystem.getSystemProfile(); - result = profile.getName(); + String savedName = getReferencedObjectName(); + int lastDelim = savedName.lastIndexOf(DELIMITER); + if (lastDelim > 0){ + result = savedName.substring(0, lastDelim); + } + else { + String[] parts = savedName.split(DELIMITER, 2); + if (parts.length == 2) { + result = parts[0]; + } else { + ISystemFilterPoolReferenceManagerProvider provider = getProvider(); + if (provider instanceof ISubSystem) { + ISubSystem subsystem = (ISubSystem) provider; + ISystemProfile profile = subsystem.getSystemProfile(); + result = profile.getName(); + } } } if (result == null) { @@ -195,13 +210,17 @@ } } } + + + // bug 358999 - this was originally outside of the first if but then it created tons of unnecessary references + if (filterPool != null) { + setReferenceToFilterPool(filterPool); + setReferenceBroken(false); + } else { + setReferenceBroken(true); + } } - if (filterPool != null) { - setReferenceToFilterPool(filterPool); - setReferenceBroken(false); - } else { - setReferenceBroken(true); - } + return filterPool; } diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RemoteObjectId.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RemoteObjectId.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RemoteObjectId.java 2008-04-25 16:35:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/RemoteObjectId.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Wind River Systems, Inc. and others. + * Copyright (c) 2008, 2011 Wind River Systems, Inc. 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 @@ -39,7 +39,7 @@ * EXPERIMENTAL. This class or interface has been added as * part of a work in progress. There is no guarantee that this API will work or * that it will remain the same. Please do not use this API without consulting - * with the Target Management + * with the Target Management * team. *
* diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java 2008-02-12 17:04:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemHostPool.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2002, 2011 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 @@ -21,7 +21,9 @@ * David Dykstal (IBM) - [176577] wrong enablement of "Move up/down" in connection context menu * Martin Oberhuber (Wind River) - [206742] Make SystemHostPool thread-safe * David Dykstal (IBM) - [210537] removed exception signaling from this class to match the interface - ********************************************************************************/ + * Tom Hochstein (Freescale) - [301075] Host copy doesn't copy contained property sets + * David McKnight (IBM) - [338510] "Copy Connection" operation deletes the registered property set in the original connection +********************************************************************************/ package org.eclipse.rse.internal.core.model; import java.util.ArrayList; @@ -404,9 +406,13 @@ IHost copy = targetPool.createHost(conn.getSystemType(), aliasName, conn.getHostName(), conn.getDescription(), conn.getLocalDefaultUserId(), IRSEUserIdConstants.USERID_LOCATION_HOST); + + // Copy all properties as well. + conn.clonePropertySets(copy); return copy; } - + + /* * (non-Javadoc) * @see org.eclipse.rse.core.model.ISystemHostPool#moveHosts(org.eclipse.rse.core.model.IHost[], int) diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java 2009-07-03 14:14:31.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2011 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 @@ -60,6 +60,7 @@ * David McKnight (IBM) - [254590] When disconnecting a subsystem with COLLAPSE option, subsystems of other connector services also get collapsed * Martin Oberhuber (Wind River) - [245154][api] add getSubSystemConfigurationProxiesBySystemType() * Zhou Renjian (Kortide) - [282238] NPE when copying host and overwrite itself + * Martin Oberhuber (Wind River) - [359554] Avoid disconnect when changing default user id only ********************************************************************************/ package org.eclipse.rse.internal.core.model; @@ -1965,12 +1966,17 @@ ISubSystem[] subsystems = getSubSystems(conn); // get list of related subsystems for (int idx = 0; idx < subsystems.length; idx++) { - if (hostNameChanged || (subsystems[idx].getLocalUserId() == null)) + //Need to clear caches if host name changed or user ID is inherited from default + if (hostNameChanged || (subsystems[idx].getConnectorService().supportsUserId() && subsystems[idx].getLocalUserId() == null)) { try { - if (subsystems[idx].isConnected()) subsystems[idx].disconnect(); // MJB: added conditional for defect 45754 - if (defaultUserIdChanged) + //MOB - Bug 359554: There is no reason for disconnecting subsystems just because a default user ID changed + if (hostNameChanged && subsystems[idx].isConnected()) + { + subsystems[idx].disconnect(); // MJB: added conditional for defect 45754 + } + if (defaultUserIdChanged && !subsystems[idx].isConnected()) { subsystems[idx].getConnectorService().clearCredentials(); } diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java 2008-10-29 17:18:04.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2012 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 @@ -16,6 +16,7 @@ * David Dykstal (IBM) - [189274] provide import and export operations for profiles * David Dykstal (IBM) - [225988] need API to mark persisted profiles as migrated * David Dykstal (IBM) - [252357] made nested property sets and properties embedded nodes in the persistent form + * David McKnight (IBM)- [376738] PropertyFileProvider should catch exceptions in care a written profile was corrupted ********************************************************************************/ package org.eclipse.rse.internal.persistence; @@ -795,7 +796,13 @@ for (Iterator z = childNames.iterator(); z.hasNext();) { String childName = (String) z.next(); Properties p = getProperties(childPropertiesMap, childName); - makeNode(node, location, p, monitor); + try { + makeNode(node, location, p, monitor); + } + catch (Exception e){ + // minimize impact of unexpected exception + logException(e); + } } for (Iterator z = referenceKeys.iterator(); z.hasNext();) { String key = (String) z.next(); diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java --- eclipse-rse-3.1.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java 2009-07-17 14:32:10.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved. + * Copyright (c) 2006, 2012 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 @@ -27,6 +27,7 @@ * David McKnight (IBM) - [267052] need to be able to create subsystems-after-the-fact * David McKnight (IBM) - [271243] [files] Switching service type brings up TWO file subsystems after restart * Uwe Stieber (Wind River) - [283844] NPE on restoring property set if persistent data is corrupted + * David McKnight (IBM) -[391132] filterpools don't persist when profile names end in _ ********************************************************************************/ package org.eclipse.rse.internal.persistence.dom; @@ -516,9 +517,9 @@ ISystemProfile profile = subsystem.getSystemProfile(); String profileName = profile.getName(); String baseFilterPoolName = filterPoolName; + filterPoolName = filterPoolName.substring(profileName.length()); // in case there's an underscore in the profile name String[] part = filterPoolName.split("___", 2); //$NON-NLS-1$ if (part.length == 2) { // name is qualified and refers to a filter pool in a specific profile - profileName = part[0]; baseFilterPoolName = part[1]; } // special processing for host owned pool references Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.core/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.core/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.core-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/feature.properties 2009-05-13 22:13:19.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2006, 2009 IBM Corporation and others. +# Copyright (c) 2006, 2012 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 @@ -21,14 +21,14 @@ user documentation. # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project # "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates +tmUpdateSiteName=Target Management 3.4 Updates # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.\n\ +Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.\n\ \n\ This program and the accompanying materials are made available under the terms\n\ of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\ @@ -42,8 +42,8 @@ # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ +Eclipse Foundation Software User Agreement\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -51,42 +51,38 @@ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -95,47 +91,78 @@ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ \n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ Cryptography\n\ \n\ Content may contain encryption software. The country in which you are\n\ currently may have restrictions on the import, possession, and use,\n\ and/or re-export to another country, of encryption software. BEFORE\n\ using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n ########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.core-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/feature.xml 2009-07-30 00:02:33.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,6 @@ - -March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content. + +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
- -Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -58,24 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.core-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:13:19.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties 2009-02-10 22:36:52.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -21,5 +21,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties 2009-05-14 08:14:42.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:13:19.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE Core Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.core-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.discovery/.classpath eclipse-rse-3.4.2/org.eclipse.rse.discovery/.classpath --- eclipse-rse-3.1.2/org.eclipse.rse.discovery/.classpath 2007-02-21 18:52:49.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.discovery/.classpath 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.discovery/build.properties eclipse-rse-3.4.2/org.eclipse.rse.discovery/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.discovery/build.properties 2009-05-27 15:15:49.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.discovery/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - .,\ - plugin.xml -src.includes = about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.discovery/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.discovery/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.discovery/plugin.properties 2009-05-27 15:15:49.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.discovery/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery RSE Plug-in -providerName = Eclipse.org - DSDP - -DiscoverySystemLabel=Discovery -DiscoverySystemDescription=Discovery - -NewConnectionWizard.discovery.name=Service Discovery Wizard diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.discovery/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.discovery/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.rse.discovery/plugin.xml 2007-05-12 01:40:12.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.discovery/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ - - - - -Although RSE API has been reviewed and proven useful in earlier proprietary -versions, we want to give the Open Source Communitiy a chance to provide more -public feedback and help further improving the APIs. Therefore,
- -As of TM / RSE 2.0, all API is considered provisional.
- -This means, that we reserve the right to change any API after TM / RSE 2.0 -in a not backward compatible way. We will make every sensible effort to -keep at least Source API Compatibility intact, but in cases where this would -lead to unnecessary code bloat we will go with API breakage. All such API changes will be voted on -by committers on the -dsdp-tm-dev developer mailing list, and documented in a migration guide -for future releases. We expect that with Community Feedback, we'll reach a -stable, hardened API for TM 3.0. Please give your feedback on -Eclipse Bugzilla -under category DSDP, Product Target Management.
-The source code for all tutorials is available in the RSE-examples package, which -can be obtained from the DSDP +can be obtained from the Target Management download site or directly from the RSE Update Site. In fact, the simplest way to get the examples is to choose Help > Software Updates > Find and Install from the Workbench, get the Examples installed, and then choose diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/guide/usingAPIs.html eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/guide/usingAPIs.html --- eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/guide/usingAPIs.html 2007-06-12 14:39:14.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/guide/usingAPIs.html 2013-02-12 20:26:45.000000000 +0000 @@ -5,7 +5,7 @@
- Although RSE API has been reviewed and proven useful in earlier proprietary -versions, we want to give the Open Source Communitiy a chance to provide more -public feedback and help further improving the APIs. Therefore, - -As of TM / RSE 2.0, all API is considered provisional. - -This means, that we reserve the right to change any API after TM / RSE 2.0 -in a not backward compatible way. We will make every sensible effort to -keep at least Source API Compatibility intact, but in cases where this would -lead to unnecessary code bloat we will go with API breakage. All such API changes will be voted on -by committers on the -dsdp-tm-dev developer mailing list, and documented in a migration guide -for future releases. We expect that with Community Feedback, we'll reach a -stable, hardened API for TM 3.0. Please give your feedback on -Eclipse Bugzilla -under category DSDP, Product Target Management. - |
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2007. +The material in this guide is Copyright (c) IBM Corporation and others 2000, 2012.
Terms and conditions regarding the use of this guide.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/options.txt eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/options.txt
--- eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/options.txt 2008-12-19 14:25:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/options.txt 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,7 @@
-quiet
-encoding "iso-8859-1"
-charset "iso-8859-1"
--source 1.4
+-source 1.5
-sourcepath "../org.eclipse.rse.connectorservice.dstore/src
;../org.eclipse.rse.core/src
;../org.eclipse.rse.files.ui/src
@@ -46,12 +46,12 @@
-splitIndex
-windowtitle "RSE API Specification"
-doctitle "RSE API Specification"
--header "RSE
Release 3.0"
--bottom "Copyright (c) IBM Corporation and others 2000, 2008. All Rights Reserved."
+-header "RSE
Release 3.4"
+-bottom "Copyright (c) IBM Corporation and others 2000, 2012. All Rights Reserved."
-group "RSE Services Plug-in Packages" "org.eclipse.rse.services;org.eclipse.rse.services.*;org.eclipse.rse.internal.services.*"
-group "RSE Core Plug-in Packages" "org.eclipse.rse.core;org.eclipse.rse.core.*"
-group "RSE UI Plug-in Packages" "org.eclipse.rse.ui;org.eclipse.rse.ui.*;org.eclipse.rse.files.ui.*;org.eclipse.rse.shells.ui.*;org.eclipse.rse.processes.ui.*"
--link http://java.sun.com/j2se/1.4.2/docs/api
+-link http://docs.oracle.com/javase/1.5.0/docs/api
-linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
-linkoffline ./../../../org.eclipse.dstore.doc.isv/reference/api ../org.eclipse.dstore.doc.isv/reference/api
-link http://bundles.osgi.org/javadoc/r4
@@ -64,7 +64,6 @@
org.eclipse.rse.core.filters
org.eclipse.rse.core.model
org.eclipse.rse.core.references
-org.eclipse.rse.core.servicesubsystem
org.eclipse.rse.core.subsystems
org.eclipse.rse.dstore.universal.miners
org.eclipse.rse.files.ui
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/plugin.properties 2009-05-14 08:19:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -13,4 +13,4 @@
# NLS_ENCODING=UTF-8
pluginName=RSE Developer Guide
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.doc.isv/plugin.xml 2009-05-14 08:19:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.doc.isv/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,7 @@
Although RSE API has been reviewed and proven useful in earlier proprietary -versions, we want to give the Open Source Communitiy a chance to provide more -public feedback and help further improving the APIs. Therefore,
- -As of TM / RSE 2.0, all API is considered provisional.
- -This means, that we reserve the right to change any API after TM / RSE 2.0 -in a not backward compatible way. We will make every sensible effort to -keep at least Source API Compatibility intact, but in cases where this would -lead to unnecessary code bloat we will go with API breakage. All such API changes will be voted on -by committers on the -dsdp-tm-dev developer mailing list, and documented in a migration guide -for future releases. We expect that with Community Feedback, we'll reach a -stable, hardened API for TM 3.0. Please give your feedback on -Eclipse Bugzilla -under category DSDP, Product Target Management.
--The simplest way to get RSE is via the Update Manager: From your running instance -of Eclipse 3.3, choose Help > Software Updates > Find and Install.... -Choose "Search for New Features to Install", and select the "add a new Remote Site named -"RSE" and pointing to -http://download.eclipse.org/dsdp/tm/updates/2.0/. -Select the RSE SDK feature, and perform the update process as usual.
+The simplest way to get RSE is via Software Updates: From your running instance +of Eclipse 3.4 or newer, choose Help > Install New Software.... +to open the software installation wizard. + ++In case an update site is not pre-configured, consult the +Eclipse TM Homepage for finding +the latest update site to use, or enable an Eclipse Release Train Repository, +like the http://download.eclipse.org/releases/indigo +repository for Eclipse 3.7 (June 2011). + +Type "Remote" in the filter box and press ENTER to find the RSE downloads; +for the stand-alone Terminal view, find "Terminal". Select what you want to install +and finish the wizard.
If you prefer manual installation, you can download RSE SDK from the -DSDP Target -Management Download Site and extract it into your installation of -Eclipse 3.3 or later, or link it as product extension.
+Target +Management Download Site and extract it into the dropins folder of +Eclipse 3.4 or later, or link it as product extension.Start Eclipse Workbench, and choose Window > Open Perspective > Other > Remote System Explorer.
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2007. +The material in this guide is Copyright (c) IBM Corporation and others 2000, 2012.
Terms and conditions regarding the use of this guide.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.user/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.doc.user/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.doc.user/plugin.properties 2009-05-27 15:15:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.doc.user/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2011 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
@@ -19,4 +19,4 @@
# NLS_ENCODING=UTF-8
pluginName = RSE User Guide
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.doc.user/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.doc.user/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.doc.user/plugin.xml 2006-11-10 21:08:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.doc.user/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,6 +1,6 @@
March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:13:13.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:37:08.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -21,5 +21,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties 2009-05-14 08:14:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 08:14:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE DStore Services Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/.cvsignore 2006-04-10 19:58:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF 2009-05-20 19:31:40.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.dstore.security; singleton:=true -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.400.qualifier Bundle-Activator: org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/plugin.properties 2009-05-27 15:15:40.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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 @@ -19,7 +19,7 @@ # NLS_ENCODING=UTF-8 pluginName = RSE DStore SSL Support -providerName = Eclipse.org - DSDP +providerName = Eclipse TM Project KeystoreProviderName = Universal Keystore Provider PreferencePage.SSL = SSL diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.dstore.security/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.dstore.security/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +null
if no matching connection object was found.
*/
- public static IHost getConnectionFor(String hostNameOrAddr, IProgressMonitor monitor) {
+ public static IHost getConnectionFor(String hostNameOrAddr, String aliasName, IProgressMonitor monitor) {
if (hostNameOrAddr==null) {
return null;
}
@@ -164,18 +186,36 @@
IHost[] connections = sr.getHosts();
IHost unconnected = null;
- for (int i = 0; i < connections.length; i++) {
-
- IHost con = connections[i];
-
- //TODO use more elaborate methods of checking whether two
- //host names/IP addresses are the same; or, use the host alias
- if (hostNameOrAddr.equalsIgnoreCase(con.getHostName())) {
- IRemoteFileSubSystem fss = getRemoteFileSubSystem(con);
- if (fss!=null && fss.isConnected()) {
- return con;
- } else {
- unconnected = con;
+
+ // first look for connection alias
+ if (aliasName != null){
+ for (int i = 0; i < connections.length; i++) {
+ IHost con = connections[i];
+
+ if (aliasName.equalsIgnoreCase(con.getAliasName())){
+ IRemoteFileSubSystem fss = getRemoteFileSubSystem(con);
+ if (fss!=null && fss.isConnected()) {
+ return con;
+ } else {
+ unconnected = con;
+ }
+ }
+ }
+ }
+
+ if (unconnected == null){
+ // if nothing matches the connection alias, fall back to hostname
+ for (int i = 0; i < connections.length; i++) {
+ IHost con = connections[i];
+ //TODO use more elaborate methods of checking whether two
+ //host names/IP addresses are the same; or, use the host alias
+ if (hostNameOrAddr.equalsIgnoreCase(con.getHostName())) {
+ IRemoteFileSubSystem fss = getRemoteFileSubSystem(con);
+ if (fss!=null && fss.isConnected()) {
+ return con;
+ } else {
+ unconnected = con;
+ }
}
}
}
@@ -229,13 +269,14 @@
* Returns the best connected file subsystem for this file store.
* Never returns null
.
* @param hostNameOrAddr host name or IP address
+ * @param aliasName the connection alias
* @param monitor progress monitor
* @return The best connected file subsystem for this file store.
* @throws CoreException if no file subsystem could be found or connected.
*/
- public static IRemoteFileSubSystem getConnectedFileSubSystem(String hostNameOrAddr, IProgressMonitor monitor) throws CoreException
+ public static IRemoteFileSubSystem getConnectedFileSubSystem(String hostNameOrAddr, String aliasName, IProgressMonitor monitor) throws CoreException
{
- IHost con = RSEFileStoreImpl.getConnectionFor(hostNameOrAddr, monitor);
+ IHost con = RSEFileStoreImpl.getConnectionFor(hostNameOrAddr, aliasName, monitor);
if (con == null) {
throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(),
@@ -252,6 +293,9 @@
if (monitor==null) monitor=new NullProgressMonitor();
subSys.connect(monitor, false);
}
+ catch (OperationCanceledException e) {
+ throw e;
+ }
catch (Exception e) {
throw new CoreException(new Status(IStatus.ERROR,
Activator.getDefault().getBundle().getSymbolicName(),
@@ -290,7 +334,7 @@
private IRemoteFile getRemoteFileObject(IProgressMonitor monitor, boolean forceExists) throws CoreException {
IRemoteFile remoteFile = getCachedRemoteFile();
if (remoteFile!=null) {
- if (remoteFile.getParentRemoteFileSubSystem().isConnected()) {
+ if (remoteFile.getParentRemoteFileSubSystem().isConnected() && remoteFile.exists()) {
return remoteFile;
} else {
//need to re-initialize cache
@@ -315,7 +359,10 @@
}
} else {
//Handle was created with an absolute name
- IRemoteFileSubSystem subSys = RSEFileStoreImpl.getConnectedFileSubSystem(_store.getHost(), monitor);
+ String aliasName = _store.getAlias();
+ String hostName = _store.getHost();
+ IRemoteFileSubSystem subSys = RSEFileStoreImpl.getConnectedFileSubSystem(hostName, aliasName, monitor);
+
try {
remoteFile = subSys.getRemoteFileObject(_store.getAbsolutePath(), monitor);
}
@@ -490,27 +537,41 @@
* @see org.eclipse.core.filesystem.IFileStore#fetchInfo(int, org.eclipse.core.runtime.IProgressMonitor)
*/
public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
- // clear cache in order to query latest info
- cacheRemoteFile(null);
+ long curTime = System.currentTimeMillis();
+
+
+ // don't clear cache when there are several successive queries in a short time-span
+ if (_lastFetch == 0 || ((curTime - _lastFetch) > _fetchWaitThreshold)){
+ // clear cache in order to query latest info
+ cacheRemoteFile(null);
+ _lastFetch = curTime;
+ }
+
// connect if needed. Will throw exception if not successful.
IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
String classification = (remoteFile==null) ? null : remoteFile.getClassification();
FileInfo info = new FileInfo(_store.getName());
- if (remoteFile == null || !remoteFile.exists()) {
+ if (remoteFile == null) {
info.setExists(false);
+ return info;
+ }
+ if (classification!=null && classification.startsWith("broken symbolic link")) { //$NON-NLS-1$
//broken symbolic link handling
- if (classification!=null && classification.startsWith("broken symbolic link")) { //$NON-NLS-1$
- info.setAttribute(EFS.ATTRIBUTE_SYMLINK, true);
- int i1 = classification.indexOf('\'');
- if (i1>0) {
- int i2 = classification.indexOf('´');
- if (i2>i1) {
- info.setStringAttribute(EFS.ATTRIBUTE_LINK_TARGET, classification.substring(i1+1,i2));
- }
+ info.setExists(false);
+ info.setLastModified(remoteFile.getLastModified());
+ info.setAttribute(EFS.ATTRIBUTE_SYMLINK, true);
+ int i1 = classification.indexOf('`');
+ if (i1>0) {
+ int i2 = classification.indexOf('\'');
+ if (i2>i1) {
+ info.setStringAttribute(EFS.ATTRIBUTE_LINK_TARGET, classification.substring(i1+1,i2));
}
}
return info;
+ } else if (!remoteFile.exists()) {
+ info.setExists(false);
+ return info;
}
info.setExists(true);
@@ -616,6 +677,7 @@
if (remoteFile.isFile()) {
try {
+ cacheRemoteFile(null);
return subSys.getInputStream(remoteFile.getParentPath(), remoteFile.getName(), true, monitor);
}
catch (SystemMessageException e) {
@@ -702,7 +764,14 @@
}
}
- if (remoteFile.isFile()) {
+ if (remoteFile.isDirectory()) {
+ throw new CoreException(new Status(IStatus.ERROR,
+ Activator.getDefault().getBundle().getSymbolicName(),
+ EFS.ERROR_WRONG_TYPE,
+ Messages.CANNOT_OPEN_STREAM_ON_FOLDER, null));
+ } else {
+ //bug 314433: try opening the Stream even for non-existing items or symlinks
+ //since returning null violates the API contract - better throw an Exception.
try {
// Convert from EFS option constants to IFileService option constants
if ((options & EFS.APPEND) != 0) {
@@ -710,21 +779,18 @@
} else {
options = IFileService.NONE;
}
+ cacheRemoteFile(null);
return subSys.getOutputStream(remoteFile.getParentPath(), remoteFile.getName(), options, monitor);
}
catch (SystemMessageException e) {
rethrowCoreException(e, EFS.ERROR_WRITE);
}
}
- else if (remoteFile.isDirectory()) {
- throw new CoreException(new Status(IStatus.ERROR,
- Activator.getDefault().getBundle().getSymbolicName(),
- EFS.ERROR_WRONG_TYPE,
- Messages.CANNOT_OPEN_STREAM_ON_FOLDER, null));
- }
- //Fallback: No file, no folder?
- //TODO check what to do for symbolic links and other strange stuff
- return null;
+ //file does not exist, apparently
+ //TODO use Java MessageFormat for embedding filename in message
+ throw new CoreException(new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(),
+ // EFS.ERROR_NOT_EXISTS,
+ EFS.ERROR_WRITE, Messages.FILE_STORE_DOES_NOT_EXIST + ": " + toString(), null)); //$NON-NLS-1$
}
/*
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileSystem.java eclipse-rse-3.4.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileSystem.java
--- eclipse-rse-3.1.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileSystem.java 2007-08-10 15:18:19.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileSystem.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2009 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
@@ -19,6 +19,7 @@
* - Also remove unnecessary class RSEFileCache and obsolete branding files.
* Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
* Martin Oberhuber (Wind River) - [199587] return attributes of RSEFileSystem
+ * David McKnight (IBM) - [287185] EFS provider should interpret the URL host component as RSE connection name rather than a hostname
********************************************************************************/
package org.eclipse.rse.internal.efs;
@@ -108,4 +109,25 @@
throw new RuntimeException(e);
}
}
+
+ /**
+ * Return an URI uniquely naming an RSE remote resource.
+ * @param hostNameOrAddr host name or IP address of remote system
+ * @param absolutePath absolute path to resource as valid on the remote system
+ * @param alias the alias name for the connection
+ * @return an URI uniquely naming the remote resource.
+ */
+ public static URI getURIFor(String hostNameOrAddr, String absolutePath, String alias) {
+ //FIXME backslashes are valid in UNIX file names. This is not correctly handled yet.
+ if (absolutePath.charAt(0) != '/') {
+ absolutePath = "/" + absolutePath.replace('\\', '/'); //$NON-NLS-1$
+ }
+ try {
+ return new URI("rse", hostNameOrAddr, absolutePath, alias, null); //$NON-NLS-1$
+ }
+ catch (URISyntaxException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java eclipse-rse-3.4.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java
--- eclipse-rse-3.1.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java 2009-05-13 21:05:04.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2009 IBM Corporation. All rights reserved.
+ * Copyright (c) 2012 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,6 +11,8 @@
* Contributors:
* Mike Kucera (IBM) - [241316] [efs] Cannot restore editors for RSE/EFS-backed resources
* David McKnight (IBM) - [241316] [efs] Cannot restore editors for RSE/EFS-backed resources
+ * David McKnight (IBM) - [291738] [efs] repeated queries to RSEFileStoreImpl.fetchInfo() in short time-span should be reduced
+ * David McKnight (IBM) - [380025] [efs] shutdown in certain product shell sharing environments can result in NPE
********************************************************************************/
package org.eclipse.rse.internal.efs;
@@ -204,9 +206,11 @@
if (input instanceof FileEditorInput){
IFile file = ((FileEditorInput)input).getFile();
URI uri = file.getLocationURI();
- if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
- IEditorPart editor = editorReference.getEditor(false);
- callback.apply(page, editor, file);
+ if (uri != null && uri.getScheme() != null){
+ if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
+ IEditorPart editor = editorReference.getEditor(false);
+ callback.apply(page, editor, file);
+ }
}
}
} catch (PartInitException e){
@@ -223,35 +227,45 @@
*/
public boolean closeRemoteEditors() {
boolean result = true;
- IWorkbench wb = PlatformUI.getWorkbench();
- IWorkbenchWindow[] windows = wb.getWorkbenchWindows();
- for (int w = 0; w < windows.length; w++){
- IWorkbenchWindow win = windows[w];
- IWorkbenchPage[] pages = win.getPages();
- for (int p = 0; p < pages.length && result; p++){
- IWorkbenchPage page = pages[p];
- IEditorReference[] activeReferences = page.getEditorReferences();
- for (int er = 0; er < activeReferences.length; er++){
- IEditorReference editorReference = activeReferences[er];
-
- try {
- IEditorInput input = editorReference.getEditorInput();
- if (input instanceof FileEditorInput){
- IFile file = ((FileEditorInput)input).getFile();
- URI uri = file.getLocationURI();
- if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
- IEditorPart editor = editorReference.getEditor(false);
-
- // close the editor
- result = page.closeEditor(editor, true);
+ try {
+ IWorkbench wb = PlatformUI.getWorkbench();
+ if (wb != null){
+ IWorkbenchWindow[] windows = wb.getWorkbenchWindows();
+ if (windows != null){
+ for (int w = 0; w < windows.length; w++){
+ IWorkbenchWindow win = windows[w];
+ IWorkbenchPage[] pages = win.getPages();
+ if (pages != null){
+ for (int p = 0; p < pages.length && result; p++){
+ IWorkbenchPage page = pages[p];
+ IEditorReference[] activeReferences = page.getEditorReferences();
+ for (int er = 0; er < activeReferences.length; er++){
+ IEditorReference editorReference = activeReferences[er];
+
+ try {
+ IEditorInput input = editorReference.getEditorInput();
+ if (input instanceof FileEditorInput){
+ IFile file = ((FileEditorInput)input).getFile();
+ URI uri = file.getLocationURI();
+ if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
+ IEditorPart editor = editorReference.getEditor(false);
+
+ // close the editor
+ result = page.closeEditor(editor, true);
+ }
+ }
+ } catch (PartInitException e){
+ e.printStackTrace();
+ }
+ }
}
}
- } catch (PartInitException e){
- e.printStackTrace();
}
}
}
}
+ catch (Exception e){
+ }
return result;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/.cvsignore 2007-05-25 17:19:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF 2009-07-30 16:02:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.efs.ui;singleton:=true
-Bundle-Version: 2.1.101.qualifier
+Bundle-Version: 2.1.400.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/plugin.properties 2009-05-14 05:08:29.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -19,7 +19,7 @@
# NLS_ENCODING=UTF-8
pluginName = RSE Eclipse Filesystem (EFS) Provider UI Support
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
createRemoteProject.label = Create Remote Project
createRemoteProject.tooltip = Create a remote project using this folder
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.efs.ui/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.efs.ui/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.examples-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.examples-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.examples-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.examples-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +null
if the profile or connection does not exist.
*/
- private IRemoteFileSubSystem getRemoteFileSubSystem(String profName, String connName) {
+ protected IRemoteFileSubSystem getRemoteFileSubSystem(String profName, String connName) {
if (profName == null || connName == null) {
return null;
@@ -1309,15 +1312,21 @@
fileNameCaseSensitiveButton.setLayoutData(gd);
fileNameCaseSensitiveButton.setSelection(initialFileNameCaseSensitive);
+ // dummy label for alignment
+ Label dummyLabel = new Label(comp, SWT.LEFT);
+ dummyLabel.setText(""); //$NON-NLS-1$
+
+ gd = new GridData(GridData.BEGINNING);
+ gd.horizontalSpan = 2;
+ dummyLabel.setLayoutData(gd);
+
// checkbox for regex
fileNameRegexButton = new Button(comp, SWT.CHECK);
fileNameRegexButton.setText(FileResources.RESID_SEARCH_FILENAME_REGEX_LABEL);
fileNameRegexButton.setToolTipText(FileResources.RESID_SEARCH_FILENAME_REGEX_TOOLTIP);
- //gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+ gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- gd.horizontalSpan = 3;
fileNameRegexButton.setLayoutData(gd);
fileNameRegexButton.setSelection(initialFileNameRegex);
@@ -1517,7 +1526,7 @@
/**
* Stores the current configuration to the dialog settings.
*/
- private void writeConfiguration() {
+ protected void writeConfiguration() {
IDialogSettings s = getConfigDialogSettings();
s.put(STORE_CONFIG_CASE_SENSITIVE, caseButton.getSelection());
s.put(STORE_CONFIG_STRING_REGEX, stringRegexButton.getSelection());
@@ -1577,7 +1586,7 @@
/**
* Writes the data.
*/
- private void writeData() {
+ protected void writeData() {
// get the size of data
int size = previousSearchData.size();
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java eclipse-rse-3.4.2/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
--- eclipse-rse-3.1.2/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java 2009-07-14 19:36:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2013 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
@@ -64,13 +64,32 @@
* David McKnight (IBM) - [276103] Files with names in different cases are not handled properly
* David McKnight (IBM) - [276534] Cache Conflict After Synchronization when Browsing Remote System with Case-Differentiated-Only Filenames
* David McKnight (IBM) - [280466] File download keeps running in case sensitive case
+ * David McKnight (IBM) - [309813] RSE permits opening of file after access removed
+ * David McKnight (IBM) - [308221] Bidi3.6: Improper display of date in Properties and Table Views
+ * David McKnight (IBM) - [317541] Show blank as the last modified for a file with no last modified
+ * David McKnight (IBM) - [323299] [files] remote file view adapter needs to use the latest version of IRemoteFile
+ * David McKnight (IBM) - [324192] Cannot open a renamed file
+ * David McKnight (IBM) - [228743] [usability][dnd] Paste into read-only folder fails silently
+ * David McKnight (IBM) - [284157] [performance] too many jobs kicked off for getting file permissions for table
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
+ * David McKnight (IBM) - [215814] [performance] Duplicate Queries between Table and Remote Systems View
+ * David McKnight (IBM) - [249031] Last used editor should be set to SystemEditableRemoteFile
+ * David McKnight (IBM) - [341244] folder selection input to unlocked Remote Systems Details view sometimes fails
+ * David McKnight (IBM) - [363490] PHP files opening in system editor (Dreamweaver)
+ * Rick Sawyer (IBM) - [376535] RSE does not respect editor overrides
+ * David McKnight (IBM) - [389838] Fast folder transfer does not account for code page
+ * David Mcknight (IBM) - [374681] Incorrect number of children on the properties page of a directory
+ * Samuel Wu (IBM) - [398988] [ftp] FTP Only support to zVM
+ * Xuan Chen (IBM) - [399101] RSE edit actions on local files that map to actually workspace resources should not use temp files
*******************************************************************************/
package org.eclipse.rse.internal.files.ui.view;
import java.io.File;
+import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -78,15 +97,18 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
@@ -115,6 +137,7 @@
import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
+import org.eclipse.rse.internal.core.RSECoreMessages;
import org.eclipse.rse.internal.files.ui.Activator;
import org.eclipse.rse.internal.files.ui.FileResources;
import org.eclipse.rse.internal.files.ui.ISystemFileConstants;
@@ -165,6 +188,7 @@
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEmpty;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileRoot;
+import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.RemoteSearchResultsContentsType;
import org.eclipse.rse.subsystems.files.core.util.ValidatorFileUniqueName;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
@@ -186,20 +210,28 @@
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemViewDropDestination;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.internal.WorkbenchPage;
+import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.progress.IElementCollector;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.PropertyDescriptor;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.NumberFormat;
+import com.ibm.icu.util.ULocale;
+
/**
* Adapter for displaying remote file system objects in tree views.
@@ -256,6 +288,60 @@
static final String _uploadMessage = FileResources.MSG_UPLOADING_PROGRESS;
static final String _downloadMessage = FileResources.MSG_DOWNLOADING_PROGRESS;
+ public HashMap _permissionsJobMap = new HashMap();
+
+ class MultiFetchPermissionsJob extends Job {
+ private List _files;
+ private IFilePermissionsService _service;
+ private boolean _started = false;
+
+ public MultiFetchPermissionsJob(IFilePermissionsService service){
+ super(RSECoreMessages.RSESubSystemOperation_Get_properties_message);
+ _files = new ArrayList();
+ _service = service;
+ }
+
+ protected IStatus run(IProgressMonitor monitor) {
+ final ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
+ IRemoteFile[] files = null;
+ _started = true;
+ synchronized (_files){
+ files = (IRemoteFile[])_files.toArray(new IRemoteFile[_files.size()]);
+ }
+ for (int i = 0; i < files.length; i++){
+ IRemoteFile rFile = files[i];
+
+ try {
+ // service will take care of setting this on the host file
+ _service.getFilePermissions(rFile.getHostFile(), monitor);
+ registry.fireEvent(new SystemResourceChangeEvent(rFile, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, rFile));
+ }
+ catch (Exception e){
+ }
+ }
+
+ _permissionsJobMap.remove(_service);
+ return Status.OK_STATUS;
+ }
+
+ public int size(){
+ return _files.size();
+ }
+
+ public boolean isStarted(){
+ return _started;
+ }
+
+ public void addFile(IRemoteFile file){
+ if (!_files.contains(file)){
+ _files.add(file);
+ }
+ }
+
+
+ }
+
+
/**
* Constructor
*/
@@ -421,18 +507,13 @@
if (moveAction == null)
moveAction = new SystemMoveRemoteFileAction(shell);
- //ISubSystem subsys = firstFile.getParentRemoteFileSubSystem();
-
- // DKM - clipboard based copy actions
- Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
-
if (pasteClipboardAction == null)
{
- pasteClipboardAction = new SystemPasteFromClipboardAction(shell, clipboard);
+ pasteClipboardAction = new SystemPasteFromClipboardAction(shell, null);
}
if (copyClipboardAction == null)
{
- copyClipboardAction = new SystemCopyToClipboardAction(shell, clipboard);
+ copyClipboardAction = new SystemCopyToClipboardAction(shell, null);
}
if (searchAction == null)
{
@@ -496,6 +577,31 @@
IRemoteFile file = (IRemoteFile) element;
if (file.isFile() || file.isArchive()) // hack to show zips without folder icons
{
+ // bug #376535 - need to respect editor overrides
+ IFile localFile = getLocalResource(file);
+ if (localFile != null) {
+ IEditorDescriptor editorDesc = getEditorRegistry().getDefaultEditor(file.getName(), IDE.guessContentType(localFile));
+ // Using reflection in case IDE is older version, without this method
+ //editorDesc = IDE.overrideDefaultEditorAssociation(new FileEditorInput(localFile), IDE.guessContentType(localFile), editorDesc);
+ Class clazz = IDE.class;
+ try {
+ Class parmtypes[] = {IEditorInput.class, IContentType.class, IEditorDescriptor.class};
+ Method method = clazz.getMethod("overrideDefaultEditorAssociation", parmtypes); //$NON-NLS-1$
+ if (method != null) {
+ Object args[] = {new FileEditorInput(localFile), IDE.guessContentType(localFile), editorDesc};
+ editorDesc = (IEditorDescriptor) method.invoke(null, args);
+ }
+ } catch (Exception e) {
+ }
+
+ if (editorDesc != null) {
+ ImageDescriptor image = editorDesc.getImageDescriptor();
+ if (image != null) {
+ return image;
+ }
+ }
+ }
+
return getEditorRegistry().getImageDescriptor(file.getName());
}
else
@@ -524,6 +630,25 @@
}
/**
+ * Get the local cache of the remote file, or null
if none.
+ * @param remoteFile the remote file.
+ * @return the local cached resource, or null
if none.
+ */
+ private IFile getLocalResource(IRemoteFile remoteFile)
+ {
+ IFile file = null;
+ if (remoteFile.getHost().getSystemType().isLocal())
+ {
+ String absolutePath = remoteFile.getAbsolutePath();
+ file = getProjectFileForLocation(absolutePath);
+ }
+ if (file == null) {
+ file = (IFile)UniversalFileTransferUtility.getTempFileFor(remoteFile);
+ }
+ return file;
+ }
+
+ /**
* Return the label for this object. Uses getName() on the remote file object.
*/
public String getText(Object element)
@@ -642,6 +767,18 @@
return ((RemoteFileRoot) file).getRootFiles();
}
IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem();
+
+ // make sure we have the lastest cached version otherwise could be working with a bad file that never got marked as stale
+ IRemoteFile originalFile = file;
+ if (ss instanceof RemoteFileSubSystem){
+ IRemoteFile cachedFile = ((RemoteFileSubSystem)ss).getCachedRemoteFile(file.getAbsolutePath());
+ if (cachedFile != null && cachedFile != originalFile){
+ file = cachedFile;
+ if (originalFile.isStale()){ // the original file was marked stale, so the cached one should be too
+ file.markStale(true);
+ }
+ }
+ }
/*
@@ -741,65 +878,74 @@
}
}
- boolean hasChildren = file.hasContents(RemoteChildrenContentsType.getInstance(), filter);
-
- if (hasChildren && !file.isStale())
- {
- children = file.getContents(RemoteChildrenContentsType.getInstance(), filter);
- children = filterChildren(children);
- }
- else
- {
- try
+ // taking out the synchronized block to avoid potential deadlock
+ // TODO next release, find a risk-free way to avoid duplicate queries
+ // synchronized (file)
+
+ {
+ boolean hasChildren = file.hasContents(RemoteChildrenContentsType.getInstance(), filter);
+
+ if (hasChildren && !file.isStale())
{
- if (monitor != null)
- {
-
- children = ss.resolveFilterString(file, filter, monitor);
- }
- else
- {
- children = ss.resolveFilterString(file, filter, new NullProgressMonitor());
- }
-
- if ((children == null) || (children.length == 0))
- {
- children = EMPTY_LIST;
- }
- else
+ children = file.getContents(RemoteChildrenContentsType.getInstance(), filter);
+ children = filterChildren(children);
+ }
+ else
+ {
+ try
{
- if (children.length == 1 && children[0] instanceof SystemMessageObject)
+ if (monitor != null)
+ {
+
+ children = ss.resolveFilterString(file, filter, monitor);
+ }
+ else
+ {
+ children = ss.resolveFilterString(file, filter, new NullProgressMonitor());
+ }
+
+ if ((children == null) || (children.length == 0))
{
- // don't filter children so that the message gets propagated
+ children = EMPTY_LIST;
}
else
{
- children = filterChildren(children);
+ if (children.length == 1 && children[0] instanceof SystemMessageObject)
+ {
+ // don't filter children so that the message gets propagated
+ }
+ else
+ {
+ children = filterChildren(children);
+ }
}
+
}
-
- }
- catch (InterruptedException exc)
- {
- children = new SystemMessageObject[1];
- SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
- ICommonMessageIds.MSG_EXPAND_CANCELLED,
- IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELLED);
- children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_CANCEL, element);
+ catch (InterruptedException exc)
+ {
+ children = new SystemMessageObject[1];
+ SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
+ ICommonMessageIds.MSG_EXPAND_CANCELLED,
+ IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELLED);
+ children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_CANCEL, element);
+ }
+ catch (Exception exc)
+ {
+ children = new SystemMessageObject[1];
+
+ SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
+ ICommonMessageIds.MSG_EXPAND_FAILED,
+ IStatus.ERROR,
+ CommonMessages.MSG_EXPAND_FAILED);
+ children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR, element);
+ SystemBasePlugin.logError("Exception resolving file filter strings", exc); //$NON-NLS-1$
+ } // message already issued
+ }
+ file.markStale(false);
+ if (originalFile != null && originalFile != file){
+ originalFile.markStale(false);
}
- catch (Exception exc)
- {
- children = new SystemMessageObject[1];
-
- SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
- ICommonMessageIds.MSG_EXPAND_FAILED,
- IStatus.ERROR,
- CommonMessages.MSG_EXPAND_FAILED);
- children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR, element);
- SystemBasePlugin.logError("Exception resolving file filter strings", exc); //$NON-NLS-1$
- } // message already issued
}
- file.markStale(false);
return children;
}
@@ -851,6 +997,20 @@
{
IRemoteFile file = (IRemoteFile) element;
+ IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem();
+
+ // make sure we have the lastest cached version otherwise could be working with a bad file that never got marked as stale
+ IRemoteFile originalFile = file;
+ if (ss instanceof RemoteFileSubSystem){
+ IRemoteFile cachedFile = ((RemoteFileSubSystem)ss).getCachedRemoteFile(file.getAbsolutePath());
+ if (cachedFile != null && cachedFile != originalFile){
+ file = cachedFile;
+ if (originalFile.isStale()){ // the original file was marked stale, so the cached one should be too
+ file.markStale(true);
+ }
+ }
+ }
+
if (!file.exists())
return false;
@@ -1287,11 +1447,20 @@
Date date = file.getLastModifiedDate();
if (date != null)
{
+ long t = date.getTime();
+
if (formatted)
{
- DateFormat datefmt = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM);
- String formattedDate = datefmt.format(date);
- return formattedDate;
+ if (t == 0){
+ // no time available, we should leave this blank
+ return ""; //$NON-NLS-1$
+ }
+ else {
+ ULocale locale = ULocale.getDefault();
+ DateFormat icufmt = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM, locale);
+ String formattedDate = icufmt.format(date);
+ return formattedDate;
+ }
}
else
{
@@ -1464,26 +1633,18 @@
if (rFile.getHostFile() instanceof IHostFilePermissionsContainer){
((IHostFilePermissionsContainer)rFile.getHostFile()).setPermissions(new PendingHostFilePermissions());
}
-
- Job deferredFetch = new Job(NLS.bind(FileResources.MESSAGE_GETTING_PERMISSIONS, file.getAbsolutePath()))
- {
- public IStatus run(IProgressMonitor monitor){
- try
- {
- // service will take care of setting this on the host file
- service.getFilePermissions(rFile.getHostFile(), monitor);
- ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
- registry.fireEvent(new SystemResourceChangeEvent(rFile, ISystemResourceChangeEvents.EVENT_PROPERTY_CHANGE, rFile));
- }
- catch (Exception e)
- {
- }
- return Status.OK_STATUS;
- }
- };
- deferredFetch.schedule();
-
-
+
+ MultiFetchPermissionsJob deferredFetch = (MultiFetchPermissionsJob)_permissionsJobMap.get(service);
+ if (deferredFetch == null || deferredFetch.isStarted() || deferredFetch.size() > 50){ // max 50 files per job
+ deferredFetch = new MultiFetchPermissionsJob(service);
+ _permissionsJobMap.put(service, deferredFetch);
+ deferredFetch.addFile(file);
+ deferredFetch.schedule(100);
+ }
+ else {
+ deferredFetch.addFile(file);
+ }
+
return true; // query kicked off
}
}
@@ -1519,9 +1680,13 @@
if (element instanceof IRemoteFile)
{
IRemoteFile file = (IRemoteFile) element;
- boolean offline = file.getParentRemoteFileSubSystem().isOffline();
- boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
- return !offline && file.canRead() && file.canWrite() && (file.isDirectory() || file.isRoot() || (file.isArchive() && supportsArchiveManagement));
+ IRemoteFileSubSystem ss = file.getParentRemoteFileSubSystem();
+ IRemoteFileSubSystemConfiguration config = ss.getParentRemoteFileSubSystemConfiguration();
+ boolean offline = ss.isOffline();
+ boolean isWindows = !config.isUnixStyle(); // windows check for bug 228743
+ boolean supportsArchiveManagement = config.supportsArchiveManagement();
+
+ return !offline && file.canRead() && (file.canWrite() || isWindows) && (file.isDirectory() || file.isRoot() || (file.isArchive() && supportsArchiveManagement));
}
return false;
@@ -1539,10 +1704,12 @@
if (target instanceof IRemoteFile)
{
IRemoteFile targetFile = (IRemoteFile) target;
- boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
+ IRemoteFileSubSystemConfiguration config = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration();
+ boolean supportsArchiveManagement = config.supportsArchiveManagement();
if (!targetFile.isFile() || (targetFile.isArchive() && supportsArchiveManagement))
{
- targetFile.canWrite();
+ boolean isWindows = !config.isUnixStyle();
+ return targetFile.canWrite() || isWindows; // windows check for bug 228743
}
// all objects are of same type, so we only need to use first to validate
Object first = srcSet.get(0);
@@ -1580,7 +1747,8 @@
if (target instanceof IRemoteFile)
{
IRemoteFile targetFile = (IRemoteFile) target;
- boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
+ IRemoteFileSubSystemConfiguration config = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration();
+ boolean supportsArchiveManagement = config.supportsArchiveManagement();
if (!targetFile.isFile() || (targetFile.isArchive() && supportsArchiveManagement))
{
// get properties
@@ -1671,7 +1839,8 @@
{
boolean supportsSearch = ((IRemoteFileSubSystemConfiguration)set.getSubSystem().getSubSystemConfiguration()).supportsSearch();
- boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+// boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+ boolean doSuperTransferProperty = false; // disabling due to potential corruption
if (!doSuperTransferProperty && supportsSearch)
{
//flatset will contain all FILES that will be copied to workspace in UniversalFileTransferUtility and create corresponding folders. Empty folders will be ignored
@@ -1993,18 +2162,21 @@
{
IRemoteFile targetFolder = (IRemoteFile) target;
IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem();
+ boolean isWindows = !targetFS.getParentRemoteFileSubSystemConfiguration().isUnixStyle();
// make sure properties are uptodate
try
{
//targetFolder.markStale(true);
targetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor);
+ if (targetFolder == null)
+ targetFolder = (IRemoteFile)target;
}
catch (Exception e)
{
}
- if (!targetFolder.canWrite())
+ if (!targetFolder.canWrite() && !isWindows) // windows check for bug 228743
{
String msgTxt = FileResources.FILEMSG_SECURITY_ERROR;
String msgDetails = NLS.bind(FileResources.FILEMSG_SECURITY_ERROR_DETAILS, targetFS.getHostAliasName());
@@ -2025,7 +2197,8 @@
{
if (fromSet instanceof SystemWorkspaceResourceSet)
{
- boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+ //boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+ boolean doSuperTransferProperty = false; // disabling due to potential corruption
if (!doSuperTransferProperty)
{
SystemWorkspaceResourceSet flatFromSet = new SystemWorkspaceResourceSet();
@@ -2438,6 +2611,8 @@
{
//targetFolder.markStale(true);
targetFolder = targetFS.getRemoteFileObject(targetFolder.getAbsolutePath(), monitor);
+ if (targetFolder == null)
+ targetFolder = (IRemoteFile)target;
}
catch (Exception e)
{
@@ -2883,6 +3058,7 @@
}
catch (Exception e)
{
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
}
}
@@ -2919,13 +3095,12 @@
if (editableObj != null)
{
SystemEditableRemoteFile editable = (SystemEditableRemoteFile)editableObj;
-
- // is this open?
- if (editable.checkOpenInEditor() != ISystemEditableRemoteObject.NOT_OPEN){
- // there's an in-memory editable, so change the associated remote file
- IRemoteFile newRemoteFile = ss.getRemoteFileObject(remotePath, new NullProgressMonitor());
- editable.setRemoteFile(newRemoteFile);
- }
+
+ // change the remote file regardless of whether it's open in an editor or not
+ // there's an in-memory editable, so change the associated remote file
+ IRemoteFile newRemoteFile = ss.getRemoteFileObject(remotePath, new NullProgressMonitor());
+ editable.setRemoteFile(newRemoteFile);
+
}
}
catch (Exception e)
@@ -2947,6 +3122,22 @@
String newRemotePath = file.getParentPath() + "/" + newName; //$NON-NLS-1$
IResource localResource = null;
+ IResource localProjectResource = null;
+ if (file.getHost().getSystemType().isLocal())
+ {
+ if (file.isFile()) {
+ localProjectResource = getProjectFileForLocation(file.getAbsolutePath());
+ }
+ else {
+ localProjectResource = getProjectFolderForLocation(file.getAbsolutePath());
+ }
+ }
+ if (localProjectResource != null) {
+ //This is a local project file. So we will rename it directly in the workbench.
+ IPath newLocalPath = localProjectResource.getParent().getFullPath().append(newName);
+ localProjectResource.move(newLocalPath, true, null);
+ return true;
+ }
if (SystemRemoteEditManager.getInstance().doesRemoteEditProjectExist())
{
localResource = UniversalFileTransferUtility.getTempFileFor(file);
@@ -3274,6 +3465,26 @@
}
// only handle double click if object is a file
+ String absolutePath = remoteFile.getAbsolutePath();
+ IFile localFile = null;
+ if (remoteFile.getHost().getSystemType().isLocal())
+ {
+ localFile = getProjectFileForLocation(absolutePath);
+ }
+ if (localFile != null) {
+ try {
+ if (!localFile.exists()) {
+
+ localFile.refreshLocal(IResource.DEPTH_ZERO, null);
+ }
+ openEditor(localFile, !remoteFile.canWrite());
+ }
+ catch (Exception e) {
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
+ return false;
+ }
+ return true;
+ }
ISystemEditableRemoteObject editable = getEditableRemoteObject(remoteFile);
if (editable != null)
{
@@ -3310,7 +3521,31 @@
// open new editor for correct replica
editable = getEditableRemoteObject(remoteFile);
- }
+ }
+
+
+ /* Commenting out - no longer needed with fix to bug #376535
+ if (editable instanceof SystemEditableRemoteFile){
+ SystemEditableRemoteFile edit = (SystemEditableRemoteFile)editable;
+ IEditorDescriptor oldDescriptor = edit.getEditorDescriptor();
+ IEditorDescriptor curDescriptor = null;
+ IFile file = editable.getLocalResource();
+
+ if (file == null || !file.exists()){
+ curDescriptor = registry.getDefaultEditor(remoteFile.getName());
+ }
+ if (curDescriptor == null){
+ try {
+ curDescriptor = IDE.getEditorDescriptor(file);
+ } catch (PartInitException e) {
+ curDescriptor = IDE.getDefaultEditor(file);
+ }
+ }
+ if (oldDescriptor != curDescriptor){
+ edit.setEditorDescriptor(curDescriptor);
+ }
+ }
+ */
try
{
@@ -3358,6 +3593,12 @@
// in the system editor)
IFile file = editable.getLocalResource();
SystemIFileProperties properties = new SystemIFileProperties(file);
+ try {
+ // refresh workspace with just added resource
+ file.refreshLocal(IResource.DEPTH_ZERO, null);
+ } catch (CoreException e) {
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
+ }
boolean newFile = !file.exists();
// detect whether there exists a temp copy already
@@ -3401,9 +3642,13 @@
boolean usedBinary = properties.getUsedBinaryTransfer();
boolean isBinary = remoteFile.isBinary();
+ boolean usedReadOnly = properties.getReadOnly();
+ boolean isReadOnly = !remoteFile.canWrite();
+
return (!dirty &&
!remoteNewer &&
usedBinary == isBinary &&
+ usedReadOnly == isReadOnly &&
!encodingChanged);
}
return false;
@@ -3425,9 +3670,21 @@
RemoteFile remoteFile = (RemoteFile) element;
if (remoteFile.isFile())
{
+ String absolutePath = remoteFile.getAbsolutePath();
+ IFile localProjectFile = null;
+ if (remoteFile.getHost().getSystemType().isLocal())
+ {
+ localProjectFile = getProjectFileForLocation(absolutePath);
+ }
try
{
- IFile file = getCachedCopy(remoteFile); // Note that this is a case-sensitive check
+ IFile file = null;
+ if (localProjectFile == null) {
+ file = getCachedCopy(remoteFile); // Note that this is a case-sensitive check
+ }
+ else {
+ file = localProjectFile;
+ }
if (file != null)
{
SystemIFileProperties properties = new SystemIFileProperties(file);
@@ -3712,4 +3969,111 @@
{
return new SystemFetchOperation(null, o, this, collector, true);
}
+
+ private static IFile getProjectFileForLocation(String absolutePath)
+ {
+ IPath workspacePath = new Path(absolutePath);
+ IFile file = SystemBasePlugin.getWorkspaceRoot().getFileForLocation(workspacePath);
+ return file;
+ }
+
+ private static IContainer getProjectFolderForLocation(String absolutePath)
+ {
+ IPath workspacePath = new Path(absolutePath);
+ IContainer container = SystemBasePlugin.getWorkspaceRoot().getContainerForLocation(workspacePath);
+ return container;
+ }
+
+ private static void openEditor(IFile localFile, boolean readOnly) throws PartInitException {
+ IEditorDescriptor editorDescriptor = null;
+
+ try {
+ editorDescriptor = IDE.getEditorDescriptor(localFile);
+ } catch (PartInitException e) {
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
+ }
+
+ if (editorDescriptor == null) {
+ if (PlatformUI.isWorkbenchRunning())
+ {
+ IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+ editorDescriptor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
+ }
+ }
+
+ //This file is from local connection, and it is inside a project in the work
+ IWorkbenchPage activePage = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage();
+
+ ResourceAttributes attr = localFile.getResourceAttributes();
+ if (attr!=null) {
+ attr.setReadOnly(readOnly);
+ try
+ {
+ localFile.setResourceAttributes(attr);
+ }
+ catch (Exception e)
+ {
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
+ }
+ }
+
+ // set editor as preferred editor for this file
+ String editorId = null;
+ if (editorDescriptor != null) {
+ editorId = editorDescriptor.getId();
+ }
+
+ IDE.setDefaultEditor(localFile, editorId);
+ if (editorDescriptor.isOpenExternal()){
+ openSystemEditor(localFile); // opening regular way doesn't work anymore
+ }
+ else {
+ FileEditorInput finput = new FileEditorInput(localFile);
+ // check for files already open
+ if (editorDescriptor != null && editorDescriptor.isOpenExternal()){
+ ((WorkbenchPage)activePage).openEditorFromDescriptor(new FileEditorInput(localFile), editorDescriptor, true, null);
+ }
+ else {
+ activePage.openEditor(finput, editorDescriptor.getId());
+ }
+
+ return;
+ }
+ }
+
+ private static void openSystemEditor(IFile localFile) throws PartInitException {
+ IEditorDescriptor editorDescriptor = null;
+
+ try {
+ editorDescriptor = IDE.getEditorDescriptor(localFile);
+ } catch (PartInitException e) {
+ SystemBasePlugin.logError(e.getLocalizedMessage(), e);
+ }
+
+ if (editorDescriptor == null) {
+ if (PlatformUI.isWorkbenchRunning())
+ {
+ IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
+ editorDescriptor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
+ }
+ }
+
+ //This file is from local connection, and it is inside a project in the work
+ IWorkbenchPage activePage = SystemBasePlugin.getActiveWorkbenchWindow().getActivePage();
+
+ // set editor as preferred editor for this file
+ String editorId = null;
+ if (editorDescriptor != null) {
+ editorId = editorDescriptor.getId();
+ }
+
+ IDE.setDefaultEditor(localFile, editorId);
+
+ FileEditorInput fileInput = new FileEditorInput(localFile);
+ activePage.openEditor(fileInput, IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
+
+ return;
+
+ }
+
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/feature.properties 2009-05-27 22:32:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2012 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
@@ -16,10 +16,10 @@
featureName=RSE FTP Service
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=The Remote System Explorer (RSE) ftp feature contains an FTP-based \
@@ -27,7 +27,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 Symbian Software Ltd. and others.\n\
+Copyright (c) 2000, 2012 Symbian Software Ltd. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -44,8 +44,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -53,42 +53,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -97,47 +93,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/feature.xml 2009-08-06 22:00:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,6 @@
-
-
March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:12:01.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties 2009-05-27 22:43:44.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -21,6 +21,6 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright Symbian Software Ltd. and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright Symbian Software Ltd. and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties 2009-05-14 07:35:10.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 07:35:10.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE FTP Service Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.ftp-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.importexport/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.importexport/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.rse.importexport/.cvsignore 2007-03-22 14:50:40.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.importexport/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.importexport/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.importexport/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.importexport/META-INF/MANIFEST.MF 2009-09-15 20:34:13.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.importexport/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.importexport; singleton:=true -Bundle-Version: 1.2.1.qualifier +Bundle-Version: 1.2.300.qualifier Bundle-Activator: org.eclipse.rse.internal.importexport.RemoteImportExportPlugin Bundle-Localization: plugin Export-Package: org.eclipse.rse.internal.importexport;x-internal:=true, diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.importexport/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.importexport/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.importexport/plugin.properties 2009-05-13 22:11:34.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.importexport/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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 @@ -17,7 +17,7 @@ # Plugin name pluginName = RSE Import/Export -providerName = Eclipse.org - DSDP +providerName = Eclipse TM Project # Remote file import and export wizards newWizardCategoryName = Remote Systems diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.importexport/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.importexport/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.importexport/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.importexport/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.local-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.local-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.local-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.local-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:13:49.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties 2009-05-27 22:43:29.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -21,5 +21,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties 2009-05-14 08:14:48.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 08:14:48.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE Local Services Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.local-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/.cvsignore 2006-04-10 20:34:37.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF 2009-07-30 13:35:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.processes.ui;singleton:=true -Bundle-Version: 3.0.101.qualifier +Bundle-Version: 3.0.400.qualifier Bundle-Activator: org.eclipse.rse.internal.processes.ui.ProcessesPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/plugin.properties 2009-05-27 15:12:53.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2011 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 @@ -19,7 +19,7 @@ # NLS_ENCODING=UTF-8 pluginName = RSE Processes UI -providerName = Eclipse.org - DSDP +providerName = Eclipse TM Project #Factory.LocalProcesses = Local Processes PropertyPage.ServerLauncherSettings = Server Launcher Settings diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.processes.ui/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.processes.ui/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +Eclipse Public License - v 1.0
+ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.
+ +1. DEFINITIONS
+ +"Contribution" means:
+ +a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.
+ +"Contributor" means any person or entity that distributes +the Program.
+ +"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.
+ +"Program" means the Contributions distributed in accordance +with this Agreement.
+ +"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.
+ +2. GRANT OF RIGHTS
+ +a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.
+ +b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.
+ +c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.
+ +d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.
+ +3. REQUIREMENTS
+ +A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:
+ +a) it complies with the terms and conditions of this +Agreement; and
+ +b) its license agreement:
+ +i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;
+ +ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;
+ +iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and
+ +iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.
+ +When the Program is made available in source code form:
+ +a) it must be made available under this Agreement; and
+ +b) a copy of this Agreement must be included with each +copy of the Program.
+ +Contributors may not remove or alter any copyright notices contained +within the Program.
+ +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.
+ +4. COMMERCIAL DISTRIBUTION
+ +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.
+ +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.
+ +5. NO WARRANTY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.
+ +6. DISCLAIMER OF LIABILITY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ +7. GENERAL
+ +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.
+ +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.
+ +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.
+ +Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.
+ +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation.
+ + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,168 @@ +################################################################################ +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +# Anna Dushistova(Mentor Graphics)- adapted from WinCE +################################################################################ + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +# "featureName" property - name of the feature +featureName=RSE SCP File Services (Incubation) + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse TM Project + +# "tmUpdateSiteName" property - label for the update site +tmUpdateSiteName=Target Management 3.4 Updates + +# "description" property - description of the feature +description=SCP file services for the Remote System Explorer (RSE). \ +Supports non-Windows systems. Includes Source. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2009, 2012 Mentor Graphics Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html +################ end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +Eclipse Foundation Software User Agreement\n\ +February 1, 2011\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,58 @@ + + +February 1, 2011
+ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+ +Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.
+ +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+ +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:
+ +Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.
+ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ + +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.
+ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ + diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +Eclipse Public License - v 1.0
+ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.
+ +1. DEFINITIONS
+ +"Contribution" means:
+ +a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.
+ +"Contributor" means any person or entity that distributes +the Program.
+ +"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.
+ +"Program" means the Contributions distributed in accordance +with this Agreement.
+ +"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.
+ +2. GRANT OF RIGHTS
+ +a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.
+ +b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.
+ +c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.
+ +d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.
+ +3. REQUIREMENTS
+ +A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:
+ +a) it complies with the terms and conditions of this +Agreement; and
+ +b) its license agreement:
+ +i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;
+ +ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;
+ +iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and
+ +iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.
+ +When the Program is made available in source code form:
+ +a) it must be made available under this Agreement; and
+ +b) a copy of this Agreement must be included with each +copy of the Program.
+ +Contributors may not remove or alter any copyright notices contained +within the Program.
+ +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.
+ +4. COMMERCIAL DISTRIBUTION
+ +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.
+ +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.
+ +5. NO WARRANTY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.
+ +6. DISCLAIMER OF LIABILITY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ +7. GENERAL
+ +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.
+ +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.
+ +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.
+ +Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.
+ +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation.
+ + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/feature.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,174 @@ +################################################################################ +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +# Anna Dushistova(Mentor Graphics)- adapted from WinCE feature.properties +################################################################################ + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=RSE SCP Files Services Source (Incubation) + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse TM Project + +# "tmUpdateSiteName" property - label for the update site +tmUpdateSiteName=Target Management 3.4 Updates + +# "description" property - description of the feature +description=SCP file services for the Remote System Explorer (RSE). \ +Supports non-Windows systems. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2009, 2012 Mentor Graphics Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html +################ end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +Eclipse Foundation Software User Agreement\n\ +February 1, 2011\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/license.html --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/license.html 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplateFeature/license.html 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,108 @@ + + + + + +February 1, 2011
+ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+ +Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.
+ +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+ +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:
+ +Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.
+ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ + +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.
+ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ + diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.html eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.html --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.html 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.html 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,33 @@ + + + + +March 27, 2008
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ +This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license +agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the +src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.
+ + + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.ini 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. + +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=tm32.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePage" contains path to welcome page (special XML-based format) +# optional + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.mappings eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.mappings --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.mappings 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.mappings 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,6 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + +0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,30 @@ +################################################################################ +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +# Anna Dushistova(Mentor Graphics) - adapted from WinCE +################################################################################ + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +# about.properties +# contains externalized strings for about.ini +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# fill-ins are supplied by about.mappings +# This file should be translated. +# +# Do not translate any values surrounded by {} + +blurb=RSE SCP File Services Source (Incubation)\n\ +\n\ +Version: {featureVersion}\n\ +Build id: {0}\n\ +\n\ +(c) Copyright Mentor Graphics Corporation and others 2009, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2008, 2011 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber (Wind River) - initial API and implementation +# Anna Dushistova (Mentor Graphics)- adapted from WinCE +############################################################################### +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ +sourcePlugin = true diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/plugin.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,17 @@ +################################################################################ +# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +# Anna Dushistova(Mentor Graphics)- adapted from WinCE +################################################################################ + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +pluginName=RSE SCP File Services Source (Incubation) +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.scp-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.sdk/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/META-INF/MANIFEST.MF 2008-09-30 14:40:50.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.sdk -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.4.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/about.ini eclipse-rse-3.4.2/org.eclipse.rse.sdk/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/about.ini 2009-05-13 22:11:20.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/about.properties eclipse-rse-3.4.2/org.eclipse.rse.sdk/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/about.properties 2009-02-01 18:41:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc and others. +# Copyright (c) 2006, 2012 Wind River Systems, Inc 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 @@ -25,8 +25,8 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm\n\ +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm\n\ \n\ This product includes software developed by the\n\ Apache Software Foundation http://www.apache.org/ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/build.properties eclipse-rse-3.4.2/org.eclipse.rse.sdk/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/build.properties 2009-05-14 08:16:46.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2011 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 @@ -17,6 +17,6 @@ about.ini,\ about.mappings,\ about.properties,\ - dsdp32.png,\ + tm32.png,\ plugin.properties src.includes = about.html Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.sdk/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.sdk/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.sdk/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/plugin.properties 2009-05-14 08:16:46.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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 @@ -13,4 +13,4 @@ # NLS_ENCODING=UTF-8 pluginName = Remote System Explorer Extender SDK -providerName = Eclipse.org - DSDP \ No newline at end of file +providerName = Eclipse TM Project \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.sdk/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.sdk/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.sdk-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.sdk-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.sdk-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.sdk-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +true
if the file is an XML file, false
otherwise.
*/
public boolean isXML(String filePath) {
-
- int index = filePath.lastIndexOf("."); //$NON-NLS-1$
-
- // check if there is a "."
- if (index == -1) {
- return false;
- }
- else {
-
- // check if the name ends with "."
- if (index == filePath.length() - 1) {
- return false;
- }
- else {
- String extension = filePath.substring(index+1);
-
- if (extension.equalsIgnoreCase("xml") || extension.equalsIgnoreCase("xmi")) { //$NON-NLS-1$ //$NON-NLS-2$
- return true;
- }
- else {
- return false;
- }
- }
- }
+ return _defaultEncodingProvider.isXML(filePath);
}
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
--- eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java 2008-06-04 10:21:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2010 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
@@ -24,6 +24,7 @@
* Xuan Chen (IBM) - [191370] [dstore] Supertransfer zip not deleted when canceling copy
* Martin Oberhuber (Wind River) - [cleanup] Add API "since" tags
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
+ * Krzysztof Kosmatka, Atrem S.A. - [331005] Error opening file from ZIP with \ separators
*******************************************************************************/
package org.eclipse.rse.services.clientserver.archiveutils;
@@ -2451,6 +2452,7 @@
{
ZipEntry entry = _zipfile.getEntry(name);
if (entry == null) entry = _zipfile.getEntry("/" + name); //$NON-NLS-1$
+ if (entry == null) entry = _zipfile.getEntry(name.replace('/', '\\')); // fixing bug 331005
if (entry == null) throw new IOException("SystemZipHandler.safeGetEntry(): The ZipEntry " + name + " cannot be found in " + _file.toString()); //$NON-NLS-1$ //$NON-NLS-2$
return entry;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemNetworkIOException.java eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemNetworkIOException.java
--- eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemNetworkIOException.java 2009-09-15 20:48:29.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SystemNetworkIOException.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2009 Wind River Systems, Inc. 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
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/HostProcessFilterImpl.java eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/HostProcessFilterImpl.java
--- eclipse-rse-3.1.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/HostProcessFilterImpl.java 2008-02-22 21:51:19.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/HostProcessFilterImpl.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 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
@@ -14,6 +14,7 @@
* Contributors:
* Martin Oberhuber (Wind River) - [219975] Fix implementations of clone()
* Martin Oberhuber (Wind River) - [220041][api][breaking] Get rid of IHostProcessFilter#getStates()
+ * David McKnight (IBM) - [225776] [dstore][processes] process filter status fields aren't persisted
*******************************************************************************/
package org.eclipse.rse.services.clientserver.processes;
@@ -468,7 +469,6 @@
public void setSpecificState(String stateCode)
{
anystatus = false;
- initStates();
states.put(stateCode, new Boolean(true));
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.services/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.services/plugin.properties 2009-05-27 15:11:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -13,7 +13,7 @@
# NLS_ENCODING=UTF-8
pluginName = RSE Services Framework
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
extPoint.archivehandlers = Remote Archive Handlers
extPoint.codePageConverters = Code Page Converters
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.services/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.services/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+BaseShellDecorator
and
- TerminalShellDecorator
abstract base
+ TerminalShellDecorator
abstract base
classes should be used when clients want to add functionality by decorating
an existing IBaseShell or ITerminalShell object they have. Again, extending
these not only saves the extender typing default delegation methods, but also
@@ -43,7 +43,7 @@
is the RSE Service Interface, and currently only
provides one factory method launchTerminal()
for creating
a new Terminal Connection.
- AbstractTerminalService
must be used as base
+ AbstractTerminalService
must be used as base
class by extenders who wish to implement the ITerminalService, in order to ensure
binary compatibility in case the interface evolves - even though
the AbstractTerminalService is currently empty.IBaseShell
, along with
-ProcessBaseShell
and
+IBaseShell
and
BaseShellDecorator
are usable in
any environment, provided that mock objects are provided for Eclipse
IAdaptable and PlatformObject.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.dstore/.classpath eclipse-rse-3.4.2/org.eclipse.rse.services.dstore/.classpath
--- eclipse-rse-3.1.2/org.eclipse.rse.services.dstore/.classpath 2007-01-30 20:42:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.dstore/.classpath 2013-02-12 20:26:45.000000000 +0000
@@ -1,12 +1,7 @@
true
to request
+ * sending a NOOP command as a side-effect in order
+ * to check connection or re-connect.
+ * When this is done, the call must be protected
+ * by a command mutex in order to avoid race conditions
+ * between sending the NOOP command and awaiting its
+ * response.
*
* @return The commons.net FTPClient.
*/
- public FTPClient getFTPClient()
+ public FTPClient getFTPClient(boolean checkConnection)
{
if (_ftpClient == null)
{
@@ -547,14 +581,18 @@
}
}
- if(_hostName!=null)
+ if(_hostName!=null && checkConnection)
{
- try{
- _ftpClient.sendNoOp();
- }catch (IOException e){
- try {
- connect();
- } catch (Exception e1) {}
+ long curTime = System.currentTimeMillis();
+ if (curTime - _ftpLastCheck > FTP_CONNECTION_CHECK_TIMEOUT) {
+ _ftpLastCheck = curTime;
+ try{
+ _ftpClient.sendNoOp();
+ }catch (IOException e){
+ try {
+ connect();
+ } catch (Exception e1) {}
+ }
}
}
@@ -669,8 +707,8 @@
{
try {
//try to retrieve the file
- _ftpClient = getFTPClient();
- chdir(_ftpClient, remoteParent);
+ FTPClient ftpc = getFTPClient();
+ chdir(ftpc, remoteParent);
if(!listFiles(monitor))
{
throw new SystemOperationCancelledException();
@@ -719,19 +757,13 @@
{
boolean isConnected = false;
- if(_ftpClient!=null) {
+ if(_ftpClient!=null && _connected) {
isConnected = _ftpClient.isConnected();
- if (isConnected){ // make sure that there hasn't been a timeout
- try {
- _ftpClient.noop();
- }
- catch (FTPConnectionClosedException e){
- return false;
- }
- catch (IOException e2){
- return false;
- }
- }
+ // Bug 300394: isConnected() is called on the main thread, so it must
+ // return fast without really checking the remote. In FTP, we deal
+ // with "virtual connections" which can automatically re-connect
+ // through the getFTPClient() method at any time. Sending NOOP as
+ // keepalive is a separate thing to be done.
}
return isConnected;
@@ -768,8 +800,8 @@
filematcher = new NamePatternMatcher(fileFilter, true, true);
}
- _ftpClient = getFTPClient();
- chdir(_ftpClient, parentPath);
+ FTPClient ftpc = getFTPClient();
+ chdir(ftpc, parentPath);
if(!listFiles(monitor))
{
throw new SystemOperationCancelledException();
@@ -1636,8 +1668,9 @@
} else if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) {
try {
clearCache(parent);
- if (!_ftpClient.sendSiteCommand("CHMOD " + newPermissions + " " + file.getAbsolutePath())) { //$NON-NLS-1$ //$NON-NLS-2$
- String lastMessage = _ftpClient.getReplyString();
+ FTPClient ftpc = getFTPClient();
+ if (!ftpc.sendSiteCommand("CHMOD " + newPermissions + " " + file.getAbsolutePath())) { //$NON-NLS-1$ //$NON-NLS-2$
+ String lastMessage = ftpc.getReplyString();
throw new RemoteFileSecurityException(new Exception(lastMessage));
}
} catch (IOException e) {
@@ -1782,8 +1815,9 @@
if (_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) {
try {
clearCache(inFile.getParentPath());
- if (!_ftpClient.sendSiteCommand("CHMOD " + s + " " + inFile.getAbsolutePath())) { //$NON-NLS-1$ //$NON-NLS-2$
- String lastMessage = _ftpClient.getReplyString();
+ FTPClient ftpc = getFTPClient();
+ if (!ftpc.sendSiteCommand("CHMOD " + s + " " + inFile.getAbsolutePath())) { //$NON-NLS-1$ //$NON-NLS-2$
+ String lastMessage = ftpc.getReplyString();
throw new RemoteFileSecurityException(new Exception(lastMessage));
}
} catch (IOException e) {
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.services.files.ftp/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.services.files.ftp/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.services.local/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/.cvsignore 2006-04-10 20:47:45.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/META-INF/MANIFEST.MF 2009-07-30 13:35:08.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.services.local;singleton:=true
-Bundle-Version: 2.1.101.qualifier
+Bundle-Version: 2.1.401.qualifier
Bundle-Activator: org.eclipse.rse.internal.services.local.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/about.ini eclipse-rse-3.4.2/org.eclipse.rse.services.local/about.ini
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/about.ini 2009-05-13 22:13:40.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/about.properties eclipse-rse-3.4.2/org.eclipse.rse.services.local/about.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/about.properties 2009-05-27 22:43:04.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2012 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
@@ -25,5 +25,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
+(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/build.properties eclipse-rse-3.4.2/org.eclipse.rse.services.local/build.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/build.properties 2009-05-27 15:09:49.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
+# Copyright (c) 2005, 2011 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
@@ -17,7 +17,7 @@
.,\
about.ini,\
about.mappings,\
- dsdp32.png
+ tm32.png
source.. = src/
output.. = bin/
src.includes = about.html
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.services.local/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.services.local/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.services.local/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/plugin.properties 2009-05-27 15:09:49.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -13,4 +13,4 @@
# NLS_ENCODING=UTF-8
pluginName = RSE Local Services
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.services.local/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.services.local/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.services.local/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.services.local/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:17:14.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties 2009-02-01 16:46:14.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 @@ -21,5 +21,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright Wind River Systems, Inc. and others 2006, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright Wind River Systems, Inc. and others 2006, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties 2009-05-14 08:15:28.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 08:15:27.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE SSH Services Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.core/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.core/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.core/.cvsignore 2006-04-10 20:50:44.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.core/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.core/.settings/.api_filters eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.core/.settings/.api_filters --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.core/.settings/.api_filters 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.core/.settings/.api_filters 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,17 @@ + +
+ * synchronized (_cachedRemoteFiles){
+ * // call to _cachedRemoteFiles
+ * ...
+ * }
+ *
+ * @deprecated going forward, this field will be non-API. A new
+ * protected clearRemoteFileCache() method allows cache
+ * clearing.
+ */
protected HashMap _cachedRemoteFiles = new HashMap();
/**
@@ -133,6 +151,9 @@
{
super(host, connectorService);
_searchHistory = new ArrayList();
+
+ // load UI plugin for adapters so that temp file listener is ready for any edits before connect
+ Platform.getAdapterManager().loadAdapter(new RemoteFileEmpty(), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$
}
/**
* @return true if this subsystem's properties should take precedence
@@ -1076,8 +1097,10 @@
// if not, the key must be for a file
if (key.lastIndexOf(IHostSearchResult.SEARCH_RESULT_DELIMITER) < 0) {
- IRemoteFile remoteFile = getRemoteFileObject(key, monitor);
-
+ IRemoteFile remoteFile = getCachedRemoteFile(key); // first check for cached file
+ if (remoteFile == null){ // not cached, do query
+ remoteFile = getRemoteFileObject(key, monitor);
+ }
if (remoteFile != null) {
return remoteFile;
}
@@ -1254,8 +1277,6 @@
public void initializeSubSystem(IProgressMonitor monitor) throws SystemMessageException
{
super.initializeSubSystem(monitor);
- // load UI plugin for adapters right after successful connect
- Platform.getAdapterManager().loadAdapter(new RemoteFileEmpty(), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$
getConnectorService().addCommunicationsListener(this);
}
@@ -1271,35 +1292,43 @@
*/
public void cacheRemoteFile(IRemoteFile file, String path)
{
-
- if (_cachedRemoteFiles.containsKey(path))
- {
- IRemoteFile oldFile = (IRemoteFile)_cachedRemoteFiles.remove(path);
- if (oldFile == file)
- {
+ boolean containsKey = false;
+ synchronized (_cachedRemoteFiles){
+ containsKey = _cachedRemoteFiles.containsKey(path);
+ }
+ if (containsKey){
+ IRemoteFile oldFile = null;
+ synchronized (_cachedRemoteFiles){
+ oldFile = (IRemoteFile)_cachedRemoteFiles.remove(path);
+ }
+ if (oldFile == file){
// already cached - recache
- _cachedRemoteFiles.put(path, file);
+ synchronized (_cachedRemoteFiles){
+ _cachedRemoteFiles.put(path, file);
+ }
return;
}
-
+
// replace file under parent
if (oldFile instanceof RemoteFile) {
RemoteFile roldFile = (RemoteFile)oldFile;
- if (roldFile._parentFile != null) // prevent parent query from bug #196664
- {
+ if (roldFile._parentFile != null){ // prevent parent query from bug #196664
roldFile._parentFile.replaceContent(oldFile, file);
}
}
else if (oldFile != null && oldFile.getParentRemoteFile() != null) {
oldFile.getParentRemoteFile().replaceContent(oldFile, file);
}
-
+
// preserve persistent information from old file to new
- if (oldFile != null)
+ if (oldFile != null){
oldFile.copyContentsTo(file);
-
+ }
+ }
+
+ synchronized (_cachedRemoteFiles){
+ _cachedRemoteFiles.put(path, file);
}
- _cachedRemoteFiles.put(path, file);
}
/**
@@ -1321,18 +1350,19 @@
*/
public IRemoteFile getCachedRemoteFile(String path)
{
- if (_cachedRemoteFiles.size() > 0)
- {
- path = path.replaceAll("//", "/"); //$NON-NLS-1$ //$NON-NLS-2$
- if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1)) //$NON-NLS-1$ //$NON-NLS-2$
- {
- path = path.substring(0, path.length() - 1);
- }
- if (_cachedRemoteFiles.containsKey(path))
- {
- {return (IRemoteFile)_cachedRemoteFiles.get(path);}
- }
-
+ synchronized (_cachedRemoteFiles){
+ if (_cachedRemoteFiles.size() > 0)
+ {
+ path = path.replaceAll("//", "/"); //$NON-NLS-1$ //$NON-NLS-2$
+ if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1)) //$NON-NLS-1$ //$NON-NLS-2$
+ {
+ path = path.substring(0, path.length() - 1);
+ }
+ if (_cachedRemoteFiles.containsKey(path))
+ {
+ {return (IRemoteFile)_cachedRemoteFiles.get(path);}
+ }
+ }
}
return null;
}
@@ -1356,7 +1386,10 @@
//If getContents() is implemented correctly, no matches should be removed
String prefix = file.getAbsolutePath() + file.getSeparator();
//Clone the hashMap in order to avoid ConcurrentModificationException in the iterator
- HashMap tmpMap = (HashMap)_cachedRemoteFiles.clone();
+ HashMap tmpMap = null;
+ synchronized (_cachedRemoteFiles){
+ tmpMap = (HashMap)_cachedRemoteFiles.clone();
+ }
Iterator it = tmpMap.keySet().iterator();
while (it.hasNext()) {
String remotePath = (String)it.next();
@@ -1367,13 +1400,24 @@
}
}
- _cachedRemoteFiles.remove(file.getAbsolutePath());
+ removeCachedRemoteFile(file.getAbsolutePath());
}
}
protected void removeCachedRemoteFile(String path)
{
- _cachedRemoteFiles.remove(path);
+ synchronized (_cachedRemoteFiles){
+ _cachedRemoteFiles.remove(path);
+ }
+ }
+
+ /**
+ * @since 3.3
+ */
+ protected void clearRemoteFileCache(){
+ synchronized (_cachedRemoteFiles){
+ _cachedRemoteFiles.clear();
+ }
}
@@ -1382,7 +1426,9 @@
switch (e.getState())
{
case CommunicationsEvent.AFTER_DISCONNECT :
- _cachedRemoteFiles.clear();
+ synchronized (_cachedRemoteFiles){
+ _cachedRemoteFiles.clear();
+ }
// DKM - taking this out because it causes an exception when the event occurs in Modal Context
//ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
//sr.connectedStatusChange(this, false, true, true);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/.cvsignore 2006-04-10 20:52:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF 2008-09-24 11:44:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.rse.subsystems.files.dstore;singleton:=true
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.1.300.qualifier
Bundle-Activator: org.eclipse.rse.internal.subsystems.files.dstore.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/plugin.properties 2009-05-25 22:36:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2011 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
@@ -19,7 +19,7 @@
# NLS_ENCODING=UTF-8
pluginName = RSE DStore Files
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
Files=Files
FilesDescription=This configuration allows you to work with files on local or remote systems using the DataStore protocol.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.files.dstore/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.files.dstore/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+March 27, 2008
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.ini eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.ini 2009-05-13 22:15:51.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.ini 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.mappings eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.mappings --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.mappings 2008-03-27 20:50:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.mappings 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/about.properties 2009-02-10 22:15:04.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/about.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -# David Dykstal (IBM) - [232198] remove NLS MESSAGEFORMAT NONE -################################################################################ - -# NLS_ENCODING=UTF-8 - -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=RSE WinCE Services (Incubation)\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright Radoslav Gerganov and others 2008, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/build.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/build.properties 2009-05-26 11:41:09.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2008, 2009 Radoslav Gerganov 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 -# -# Contributors: -# Radoslav Gerganov - initial API and implementation -# Martin Oberhuber (Wind River) - Add feature branding files -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html,\ - about.ini,\ - about.mappings,\ - about.properties,\ - icons/, \ - plugin.properties,\ - plugin.xml,\ - dsdp32.png -src.includes = about.html - \ No newline at end of file Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/dsdp32.png differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/icons/systemfiles_obj.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/icons/systemfiles_obj.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/icons/systemfileslive_obj.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/icons/systemfileslive_obj.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/icons/wince.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/icons/wince.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/icons/wincelive.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/icons/wincelive.gif differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/plugin.properties 2009-05-26 11:41:09.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -############################################################################### -# Copyright (c) 2008, 2009 Radoslav Gerganov 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 -# -# Contributors: -# Radoslav Gerganov - initial API and implementation -# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags -############################################################################### - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -providerName = Eclipse.org - DSDP -pluginName = RSE WinCE Services (Incubation) -systemType.label.0 = WinCE -configuration.description.0 = This configuration allows you to work with files on remote WinCE-based device using ActiveSync/RAPI2 connection. -configuration.name.0 = WinCE Files -configuration.vendor.0 = Eclipse.org diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/plugin.xml 2008-03-27 19:52:28.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ - - - -WinCEConnectorService
.
- *
- * By implementing this interface, subsystems can be recognized
- * as being able to share a single WinCE connector service between
- * multiple different subsystems.
- */
-public interface IWinCESubSystem {
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/Messages.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/Messages.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/Messages.java 2008-03-27 19:52:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/Messages.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.wince;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.wince.messages"; //$NON-NLS-1$
- public static String WinCEConnectorService_0;
- public static String WinCEConnectorService_1;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java 2008-05-10 13:49:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorService.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. 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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SshConnectorService
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.wince;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.BasicConnectorService;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
-import org.eclipse.rse.internal.services.wince.IRapiSessionProvider;
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.IRapiEnumDevices;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiException;
-
-
-/**
- * Creates ActiveSync/RAPI2 connections to WinCE-based device.
- */
-public class WinCEConnectorService extends BasicConnectorService implements IRapiSessionProvider {
-
- IRapiDesktop desktop = null;
- IRapiEnumDevices enumDevices = null;
- IRapiDevice device = null;
- IRapiSession session = null;
-
- public WinCEConnectorService(IHost host) {
- super(Messages.WinCEConnectorService_0, Messages.WinCEConnectorService_1, host, 0);
- }
-
- protected void internalConnect(IProgressMonitor monitor) throws Exception {
- fireCommunicationsEvent(CommunicationsEvent.BEFORE_CONNECT);
- Rapi.initialize(Rapi.COINIT_MULTITHREADED);
- try {
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- device = enumDevices.next();
- session = device.createSession();
- session.init();
- } catch (RapiException re) {
- //TODO externalize the error message
- throw new Exception("Cannot connect to the remote device (" + re.getMessage() + ")", re); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- protected void internalDisconnect(IProgressMonitor monitor) throws Exception {
- fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT);
- if (session != null) {
- session.uninit();
- session.release();
- session = null;
- }
- if (device != null) {
- device.release();
- device = null;
- }
- if (enumDevices != null) {
- enumDevices.release();
- enumDevices = null;
- }
- if (desktop != null) {
- desktop.release();
- desktop = null;
- }
- }
-
- public boolean isConnected() {
- if (device != null) {
- try {
- return device.isConnected();
- } catch (RapiException e) {
- //ignore
- }
- }
- return false;
- }
-
- public IRapiSession getSession() {
- return session;
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java 2008-03-31 12:21:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/WinCEConnectorServiceManager.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SshConnectorServiceManager
- *******************************************************************************/
-package org.eclipse.rse.internal.connectorservice.wince;
-
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-public class WinCEConnectorServiceManager extends AbstractConnectorServiceManager {
-
- private static WinCEConnectorServiceManager inst = null;
-
- private WinCEConnectorServiceManager() {
- super();
- }
-
- public static WinCEConnectorServiceManager getInstance() {
- if (inst == null) {
- inst = new WinCEConnectorServiceManager();
- }
- return inst;
- }
-
- public IConnectorService createConnectorService(IHost host) {
- IConnectorService connectorService = new WinCEConnectorService(host);
- return connectorService;
- }
-
- public Class getSubSystemCommonInterface(ISubSystem subsystem) {
- return IWinCESubSystem.class;
- }
-
- public boolean sharesSystem(ISubSystem otherSubSystem) {
- return (otherSubSystem instanceof IWinCESubSystem);
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/messages.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/messages.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/messages.properties 2008-04-07 12:50:35.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/connectorservice/wince/messages.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-###############################################################################
-WinCEConnectorService_0=WinCE Connector Service
-WinCEConnectorService_1=The WinCE Connector Service uses ActiveSync/RAPI2 to connect to the device.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IRapiSessionProvider.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IRapiSessionProvider.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IRapiSessionProvider.java 2008-03-27 19:52:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IRapiSessionProvider.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.rse.internal.services.wince;
-
-import org.eclipse.tm.rapi.IRapiSession;
-
-public interface IRapiSessionProvider {
-
- /**
- * Returns an active RAPI2 session from a ConnectorService.
- */
- public IRapiSession getSession();
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java 2008-03-31 12:21:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/IWinCEService.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. 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
- *
- * Contributors:
- * Radoslav Gerganov - derived from ISshService
- *******************************************************************************/
-package org.eclipse.rse.internal.services.wince;
-
-/**
- * Markup Interface for services using the WinCEConnectorService
.
- *
- * By implementing this interface, services can be recognized
- * as operating against an WinCEConnectorService
.
- * The interface is used as the key in a table for looking up the connector
- * service when needed.
- */
-public interface IWinCEService {
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java 2008-03-31 12:21:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/Messages.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.rse.internal.services.wince.files;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.rse.internal.services.wince.files.messages"; //$NON-NLS-1$
- public static String WinCEFileService_0;
- public static String WinCEFileService_1;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java 2008-06-26 13:44:49.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,565 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. 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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SftpFileService and LocalFileService
- * Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable
- * Radoslav Gerganov (ProSyst) - [221211] [api][breaking][files] need batch operations to indicate which operations were successful
- * Martin Oberhuber (Wind River) - [221211] Throw SystemUnsupportedOperationException for WinCE setLastModified() and setReadOnly()
- * Radoslav Gerganov (ProSyst) - [230850] [WinCE] Implement setLastModified and setReadOnly in WinCEFileService
- * Radoslav Gerganov (ProSyst) - [231425] [WinCE] Use the progress monitors in WinCEFileService
- * Radoslav Gerganov (ProSyst) - [230856] [WinCE] Improve the error handling in WinCEFileService
- * Radoslav Gerganov (ProSyst) - [230919] IFileService.delete() should not return a boolean
- * Radoslav Gerganov (ProSyst) - [235360] Return proper "Root" IHostFile
- *******************************************************************************/
-package org.eclipse.rse.internal.services.wince.files;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.rse.internal.services.wince.IRapiSessionProvider;
-import org.eclipse.rse.internal.services.wince.IWinCEService;
-import org.eclipse.rse.internal.subsystems.files.wince.Activator;
-import org.eclipse.rse.services.clientserver.FileTypeMatcher;
-import org.eclipse.rse.services.clientserver.IMatcher;
-import org.eclipse.rse.services.clientserver.NamePatternMatcher;
-import org.eclipse.rse.services.clientserver.messages.SystemElementNotFoundException;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.services.clientserver.messages.SystemOperationCancelledException;
-import org.eclipse.rse.services.clientserver.messages.SystemUnexpectedErrorException;
-import org.eclipse.rse.services.clientserver.messages.SystemUnsupportedOperationException;
-import org.eclipse.rse.services.files.AbstractFileService;
-import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.files.IHostFile;
-import org.eclipse.rse.services.files.RemoteFileIOException;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiException;
-import org.eclipse.tm.rapi.RapiFindData;
-
-public class WinCEFileService extends AbstractFileService implements IWinCEService {
-
- IRapiSessionProvider sessionProvider;
-
- public WinCEFileService(IRapiSessionProvider sessionProvider) {
- this.sessionProvider = sessionProvider;
- }
-
- String concat(String parentDir, String fileName) {
- String result = parentDir;
- if (!result.endsWith("\\")) { //$NON-NLS-1$
- result += "\\"; //$NON-NLS-1$
- }
- result += fileName;
- return result;
- }
-
- protected IHostFile[] internalFetch(String parentPath, String fileFilter,
- int fileType, IProgressMonitor monitor) throws SystemMessageException {
- if (fileFilter == null) {
- fileFilter = "*"; //$NON-NLS-1$
- }
- IMatcher fileMatcher = null;
- if (fileFilter.endsWith(",")) { //$NON-NLS-1$
- String[] types = fileFilter.split(","); //$NON-NLS-1$
- fileMatcher = new FileTypeMatcher(types, true);
- } else {
- fileMatcher = new NamePatternMatcher(fileFilter, true, true);
- }
- List results = new ArrayList();
- try {
- IRapiSession session = sessionProvider.getSession();
- RapiFindData[] foundFiles = session.findAllFiles(concat(parentPath,"*"), //$NON-NLS-1$
- Rapi.FAF_NAME | Rapi.FAF_ATTRIBUTES | Rapi.FAF_LASTWRITE_TIME |
- Rapi.FAF_SIZE_HIGH | Rapi.FAF_SIZE_LOW);
- for (int i = 0 ; i < foundFiles.length ; i++) {
- String fileName = foundFiles[i].fileName;
- if (fileMatcher.matches(fileName)) {
- WinCEHostFile hostFile = makeHostFile(parentPath, fileName, foundFiles[i]);
- if (isRightType(fileType, hostFile)) {
- results.add(hostFile);
- }
- }
- }
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- return (IHostFile[]) results.toArray(new IHostFile[results.size()]);
- }
-
- private WinCEHostFile makeHostFile(String parentPath, String fileName, RapiFindData findData) {
- boolean isDirectory = (findData.fileAttributes & Rapi.FILE_ATTRIBUTE_DIRECTORY) != 0;
- boolean isWritable = (findData.fileAttributes & Rapi.FILE_ATTRIBUTE_READONLY) == 0;
- long lastModified = (findData.lastWriteTime / 10000) - Rapi.TIME_DIFF;
- long size = findData.fileSize;
- return new WinCEHostFile(parentPath, fileName, isDirectory, false, isWritable, lastModified, size);
- }
-
- private boolean isDirectory(IRapiSession session, String fullPath) {
- int attr = session.getFileAttributes(fullPath);
- if (attr == -1) {
- return false;
- }
- return (attr & Rapi.FILE_ATTRIBUTE_DIRECTORY) != 0;
- }
-
- private boolean exist(IRapiSession session, String fileName) {
- return session.getFileAttributes(fileName) != -1;
- }
-
- public void copy(String srcParent, String srcName, String tgtParent,
- String tgtName, IProgressMonitor monitor) throws SystemMessageException {
- String srcFullPath = concat(srcParent, srcName);
- String tgtFullPath = concat(tgtParent, tgtName);
- if (srcFullPath.equals(tgtFullPath)) {
- // prevent copying file/folder to itself
- throw new SystemUnsupportedOperationException(Activator.PLUGIN_ID, "Cannot copy file or folder to itself"); //$NON-NLS-1$
- }
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- IRapiSession session = sessionProvider.getSession();
- try {
- if (isDirectory(session, srcFullPath)) {
- if (tgtFullPath.startsWith(srcFullPath + "\\")) { //$NON-NLS-1$
- // prevent copying \a to \a\b\c
- throw new SystemUnsupportedOperationException(Activator.PLUGIN_ID, "Cannot copy folder to its subfolder"); //$NON-NLS-1$
- }
- if (!exist(session, tgtFullPath)) {
- // the target path is a directory and it doesn't exist -> create it
- session.createDirectory(tgtFullPath);
- }
- RapiFindData[] allFiles = session.findAllFiles(concat(srcFullPath,"*"), Rapi.FAF_NAME); //$NON-NLS-1$
- for (int i = 0 ; i < allFiles.length ; i++) {
- String fileName = allFiles[i].fileName;
- if (monitor.isCanceled()) {
- throw new SystemOperationCancelledException();
- }
- copy(srcFullPath, fileName, tgtFullPath, fileName, monitor);
- }
- } else {
- session.copyFile(srcFullPath, tgtFullPath);
- monitor.worked(1);
- }
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public void copyBatch(String[] srcParents, String[] srcNames,
- String tgtParent, IProgressMonitor monitor) throws SystemMessageException {
- for (int i = 0 ; i < srcParents.length ; i++) {
- copy(srcParents[i], srcNames[i], tgtParent, srcNames[i], monitor);
- }
- }
-
- public IHostFile createFile(String remoteParent, String fileName, IProgressMonitor monitor) throws SystemMessageException {
- String fullPath = concat(remoteParent, fileName);
- IRapiSession session = sessionProvider.getSession();
- try {
- int handle = session.createFile(fullPath, Rapi.GENERIC_WRITE, Rapi.FILE_SHARE_READ,
- Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.closeHandle(handle);
- RapiFindData findData = new RapiFindData();
- handle = session.findFirstFile(fullPath, findData);
- session.findClose(handle);
- return makeHostFile(remoteParent, fileName, findData);
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public IHostFile createFolder(String remoteParent, String folderName, IProgressMonitor monitor) throws SystemMessageException {
- String fullPath = concat(remoteParent, folderName);
- IRapiSession session = sessionProvider.getSession();
- try {
- session.createDirectory(fullPath);
- RapiFindData findData = new RapiFindData();
- int handle = session.findFirstFile(fullPath, findData);
- session.findClose(handle);
- return makeHostFile(remoteParent, folderName, findData);
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public void delete(String remoteParent, String fileName, IProgressMonitor monitor) throws SystemMessageException {
- String fullPath = concat(remoteParent, fileName);
- IRapiSession session = sessionProvider.getSession();
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- try {
- if (!exist(session, fullPath)) {
- throw new SystemElementNotFoundException(fullPath, "delete"); //$NON-NLS-1$
- }
- if (isDirectory(session, fullPath)) {
- // recursive delete if it is a directory
- RapiFindData[] allFiles = session.findAllFiles(concat(fullPath, "*"), Rapi.FAF_NAME); //$NON-NLS-1$
- for (int i = 0; i < allFiles.length; i++) {
- if (monitor.isCanceled()) {
- throw new SystemOperationCancelledException();
- }
- delete(fullPath, allFiles[i].fileName, monitor);
- }
- session.removeDirectory(fullPath);
- } else {
- // it is a file
- session.deleteFile(fullPath);
- monitor.worked(1);
- }
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public void download(String remoteParent, String remoteFile, File localFile, boolean isBinary, String hostEncoding,
- IProgressMonitor monitor) throws SystemMessageException {
-
- if (!localFile.exists()) {
- File localParentFile = localFile.getParentFile();
- if (!localParentFile.exists()) {
- if (!localParentFile.mkdirs()) {
- throw new SystemUnexpectedErrorException(Activator.PLUGIN_ID);
- }
- }
- }
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- String fullPath = concat(remoteParent, remoteFile);
- IRapiSession session = sessionProvider.getSession();
- int handle = Rapi.INVALID_HANDLE_VALUE;
- BufferedOutputStream bos = null;
- try {
- handle = session.createFile(fullPath, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- long fileSize = session.getFileSize(handle);
- monitor.beginTask(fullPath, (int) fileSize);
- bos = new BufferedOutputStream(new FileOutputStream(localFile));
- // 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) {
- break;
- }
- bos.write(buffer, 0, bytesRead);
- if (monitor.isCanceled()) {
- throw new SystemOperationCancelledException();
- }
- monitor.worked(bytesRead);
- }
- bos.flush();
- monitor.done();
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- } catch (IOException e) {
- throw new RemoteFileIOException(e);
- } finally {
- if (handle != Rapi.INVALID_HANDLE_VALUE) {
- try {
- session.closeHandle(handle);
- } catch (RapiException e) {
- // ignore
- }
- }
- if (bos != null) {
- try {
- bos.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
- }
-
- public IHostFile getFile(String remoteParent, String name, IProgressMonitor monitor) throws SystemMessageException {
- if (remoteParent == null || remoteParent.length() == 0) {
- // special case for root
- return getRoots(null)[0];
- }
- IRapiSession session = sessionProvider.getSession();
- try {
- RapiFindData findData = new RapiFindData();
- int h = session.findFirstFile(concat(remoteParent, name), findData);
- session.findClose(h);
- return makeHostFile(remoteParent, name, findData);
- } catch (RapiException e) {
- // ignore the exception and return dummy
- }
- // return dummy if the file doesn't exist
- WinCEHostFile dummy = new WinCEHostFile(remoteParent, name, false, false, false, 0, 0);
- dummy.setExists(false);
- return dummy;
- }
-
- public IHostFile[] getRoots(IProgressMonitor monitor) throws SystemMessageException {
- return new WinCEHostFile[] { new WinCEHostFile(null, "\\", true, true, true, 0, 0) }; //$NON-NLS-1$
- }
-
- public IHostFile getUserHome() {
- return new WinCEHostFile("\\", "My Documents", true, false, true, 0, 0); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public boolean isCaseSensitive() {
- return false;
- }
-
- public void move(String srcParent, String srcName, String tgtParent, String tgtName,
- IProgressMonitor monitor) throws SystemMessageException {
- copy(srcParent, srcName, tgtParent, tgtName, monitor);
- delete(srcParent, srcName, monitor);
- }
-
- public void rename(String remoteParent, String oldName, String newName,
- IProgressMonitor monitor) throws SystemMessageException {
- String oldFullPath = concat(remoteParent, oldName);
- String newFullPath = concat(remoteParent, newName);
- IRapiSession session = sessionProvider.getSession();
- try {
- session.moveFile(oldFullPath, newFullPath);
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public void rename(String remoteParent, String oldName, String newName, IHostFile oldFile,
- IProgressMonitor monitor) throws SystemMessageException {
- rename(remoteParent, oldName, newName, monitor);
- String newFullPath = concat(remoteParent, newName);
- oldFile.renameTo(newFullPath);
- }
-
- public void setLastModified(String parent, String name, long timestamp, IProgressMonitor monitor) throws SystemMessageException {
- IRapiSession session = sessionProvider.getSession();
- String fullPath = concat(parent, name);
- int handle = Rapi.INVALID_HANDLE_VALUE;
- try {
- handle = session.createFile(fullPath, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.setFileLastWriteTime(handle, timestamp);
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- } finally {
- if (handle != Rapi.INVALID_HANDLE_VALUE) {
- try {
- session.closeHandle(handle);
- } catch (RapiException e) {
- // ignore
- }
- }
- }
- }
-
- public void setReadOnly(String parent, String name, boolean readOnly, IProgressMonitor monitor) throws SystemMessageException {
- IRapiSession session = sessionProvider.getSession();
- String fullPath = concat(parent, name);
- int attr = session.getFileAttributes(fullPath);
- if (readOnly) {
- attr = attr | Rapi.FILE_ATTRIBUTE_READONLY;
- } else {
- attr = attr & (~Rapi.FILE_ATTRIBUTE_READONLY);
- }
- try {
- session.setFileAttributes(fullPath, attr);
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- private void internalUpload(InputStream stream, String remoteParent, String remoteFile, boolean isBinary,
- String hostEncoding, long fileSize, IProgressMonitor monitor) throws SystemMessageException {
- BufferedInputStream bis = new BufferedInputStream(stream);
- IRapiSession session = sessionProvider.getSession();
- String fullPath = concat(remoteParent, remoteFile);
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- if (fileSize != -1) {
- monitor.beginTask(fullPath, (int) fileSize);
- }
- int handle = Rapi.INVALID_HANDLE_VALUE;
- try {
- handle = session.createFile(fullPath, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- // 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) {
- break;
- }
- session.writeFile(handle, buffer, 0, bytesRead);
- if (monitor.isCanceled()) {
- throw new SystemOperationCancelledException();
- }
- monitor.worked(bytesRead);
- }
- monitor.done();
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- } catch (IOException e) {
- throw new RemoteFileIOException(e);
- } finally {
- if (handle != Rapi.INVALID_HANDLE_VALUE) {
- try {
- session.closeHandle(handle);
- } catch (RapiException e) {
- // ignore
- }
- }
- try {
- bis.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
-
- public void upload(InputStream stream, String remoteParent, String remoteFile, boolean isBinary,
- String hostEncoding, IProgressMonitor monitor) throws SystemMessageException {
- internalUpload(stream, remoteParent, remoteFile, isBinary, hostEncoding, -1, monitor);
- }
-
- public void upload(File localFile, String remoteParent, String remoteFile, boolean isBinary,
- String srcEncoding, String hostEncoding, IProgressMonitor monitor) throws SystemMessageException {
- long fileSize = localFile.length();
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(localFile);
- } catch (FileNotFoundException e) {
- throw new SystemUnexpectedErrorException(Activator.PLUGIN_ID);
- }
- //FIXME what to do with srcEncoding ?
- internalUpload(fis, remoteParent, remoteFile, isBinary, hostEncoding, fileSize, monitor);
- }
-
- public InputStream getInputStream(String remoteParent, String remoteFile,
- boolean isBinary, IProgressMonitor monitor) throws SystemMessageException {
- String fullPath = concat(remoteParent, remoteFile);
- IRapiSession session = sessionProvider.getSession();
- try {
- int handle = session.createFile(fullPath, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- return new BufferedInputStream(new WinCEInputStream(session, handle));
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public OutputStream getOutputStream(String remoteParent, String remoteFile,
- int options, IProgressMonitor monitor) throws SystemMessageException {
- String fullPath = concat(remoteParent, remoteFile);
- IRapiSession session = sessionProvider.getSession();
- try {
- int cd = Rapi.CREATE_ALWAYS;
- if ((options & IFileService.APPEND) == 0) {
- cd = Rapi.CREATE_ALWAYS;
- } else {
- cd = Rapi.OPEN_EXISTING;
- }
- int handle = session.createFile(fullPath, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, cd, Rapi.FILE_ATTRIBUTE_NORMAL);
- return new BufferedOutputStream(new WinCEOutputStream(session, handle));
- } catch (RapiException e) {
- throw new RemoteFileIOException(e);
- }
- }
-
- public String getDescription() {
- return Messages.WinCEFileService_0;
- }
-
- public String getName() {
- return Messages.WinCEFileService_1;
- }
-
- private static class WinCEInputStream extends InputStream {
-
- private int handle;
- private IRapiSession session;
-
- public WinCEInputStream(IRapiSession session, int handle) {
- this.handle = handle;
- this.session = session;
- }
-
- public int read() throws IOException {
- byte[] b = new byte[1];
- try {
- int br = session.readFile(handle, b);
- return (br == -1) ? -1 : b[0];
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- public int read(byte[] b, int off, int len) throws IOException {
- try {
- return session.readFile(handle, b, off, len);
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- public void close() throws IOException {
- try {
- session.closeHandle(handle);
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- }
-
- private static class WinCEOutputStream extends OutputStream {
-
- private int handle;
- private IRapiSession session;
-
- public WinCEOutputStream(IRapiSession session, int handle) {
- this.session = session;
- this.handle = handle;
- }
-
- public void write(int b) throws IOException {
- try {
- session.writeFile(handle, new byte[] {(byte)b});
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- public void write(byte[] b, int off, int len) throws IOException {
- try {
- session.writeFile(handle, b, off, len);
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
-
- public void close() throws IOException {
- try {
- session.closeHandle(handle);
- } catch (RapiException e) {
- throw new IOException(e.getMessage());
- }
- }
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java 2008-05-09 13:16:11.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEHostFile.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SftpHostFile
- * Radoslav Gerganov (ProSyst) - [230850] [WinCE] Implement setLastModified and setReadOnly in WinCEFileService
- *******************************************************************************/
-package org.eclipse.rse.internal.services.wince.files;
-
-import org.eclipse.rse.services.files.IHostFile;
-
-public class WinCEHostFile implements IHostFile {
-
- String name;
- String parentPath;
- boolean isDirectory;
- boolean isRoot;
- boolean isArchive = false;
- boolean isReadable = true;
- boolean isWritable = true;
- boolean exists = true;
- long lastModified = 0;
- long size = 0;
-
- public WinCEHostFile(String parentPath, String name, boolean isDirectory,
- boolean isRoot, boolean isWritable, long lastModified, long size) {
- this.parentPath = parentPath;
- this.name = name;
- this.isDirectory = isDirectory;
- this.isRoot = isRoot;
- this.isWritable = isWritable;
- this.lastModified = lastModified;
- this.size = size;
- }
-
- public boolean canRead() {
- return isReadable;
- }
-
- public boolean canWrite() {
- return isWritable;
- }
-
- public boolean exists() {
- return exists;
- }
-
- public void setExists(boolean exists) {
- this.exists = exists;
- }
-
- public String getAbsolutePath() {
- if (isRoot()) {
- return getName();
- }
- String path = parentPath;
- if (!parentPath.endsWith("\\")) { //$NON-NLS-1$
- path += "\\"; //$NON-NLS-1$
- }
- path += name;
- return path;
- }
-
- public long getModifiedDate() {
- return lastModified;
- }
-
- public String getName() {
- return name;
- }
-
- public String getParentPath() {
- return parentPath;
- }
-
- public long getSize() {
- return size;
- }
-
- public boolean isArchive() {
- return isArchive;
- }
-
- public boolean isDirectory() {
- return isDirectory;
- }
-
- public boolean isFile() {
- return !(isDirectory || isRoot);
- }
-
- public boolean isHidden() {
- return false;
- }
-
- public boolean isRoot() {
- return isRoot;
- }
-
- public void renameTo(String newAbsolutePath) {
- int ind = newAbsolutePath.lastIndexOf("\\"); //$NON-NLS-1$
- if (ind == -1) {
- name = newAbsolutePath;
- } else {
- parentPath = newAbsolutePath.substring(0, ind);
- name = newAbsolutePath.substring(ind+1);
- }
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties 2008-04-07 12:50:35.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/messages.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-###############################################################################
-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 -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/Activator.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/Activator.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/Activator.java 2008-05-06 23:21:17.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/Activator.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.rse.internal.subsystems.files.wince;
-
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends SystemBasePlugin {
-
- // The shared instance
- private static Activator plugin;
-
- public final static String PLUGIN_ID = "org.eclipse.rse.subsystems.wince"; //$NON-NLS-1$
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- protected void initializeImageRegistry() {
- //TODO
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java 2008-06-03 16:40:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCEFileAdapter.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SftpFileAdapter
- * Martin Oberhuber (Wind River) - [235363][api][breaking] IHostFileToRemoteFileAdapter methods should return AbstractRemoteFile
- *******************************************************************************/
-package org.eclipse.rse.internal.subsystems.files.wince;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.rse.internal.services.wince.files.WinCEHostFile;
-import org.eclipse.rse.services.files.IHostFile;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
-import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
-
-
-public class WinCEFileAdapter implements IHostFileToRemoteFileAdapter {
-
- public AbstractRemoteFile convertToRemoteFile(FileServiceSubSystem ss,
- IRemoteFileContext context, IRemoteFile parent, IHostFile node) {
-
- WinCERemoteFile remoteFile = new WinCERemoteFile(ss, context, parent, (WinCEHostFile) node);
- ss.cacheRemoteFile(remoteFile);
- return remoteFile;
- }
-
- public AbstractRemoteFile[] convertToRemoteFiles(FileServiceSubSystem ss,
- IRemoteFileContext context, IRemoteFile parent, IHostFile[] nodes) {
-
- List results = new ArrayList();
- if (nodes != null) {
- for (int i = 0 ; i < nodes.length ; i++) {
- WinCEHostFile node = (WinCEHostFile) nodes[i];
- WinCERemoteFile remoteFile = new WinCERemoteFile(ss, context, parent, node);
- results.add(remoteFile);
- ss.cacheRemoteFile(remoteFile);
- }
- }
- return (WinCERemoteFile[]) results.toArray(new WinCERemoteFile[results.size()]);
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java 2008-03-31 12:21:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/subsystems/files/wince/WinCERemoteFile.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SftpRemoteFile
- *******************************************************************************/
-package org.eclipse.rse.internal.subsystems.files.wince;
-
-import org.eclipse.rse.internal.services.wince.files.WinCEHostFile;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileContext;
-
-
-public class WinCERemoteFile extends AbstractRemoteFile {
-
- public WinCERemoteFile(FileServiceSubSystem subSystem,
- IRemoteFileContext context, IRemoteFile parent, WinCEHostFile hostFile) {
- super(subSystem, context, parent, hostFile);
- }
-
- public String getCanonicalPath() {
- return getAbsolutePath();
- }
-
- public String getClassification() {
- // TODO
- return "unknown"; //$NON-NLS-1$
- }
-
- public String getEncoding() {
- // override the default implementation because it causes
- // infinite loop on WinCE, see bug #218947
- return getParentRemoteFileSubSystem().getRemoteEncoding();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java 2008-03-31 12:21:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileServiceSubSystem.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from FileServiceSubSystem
- *******************************************************************************/
-package org.eclipse.rse.subsystems.files.wince;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.files.IHostFile;
-import org.eclipse.rse.services.search.ISearchService;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
-import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.ui.ISystemMessages;
-import org.eclipse.rse.ui.RSEUIPlugin;
-
-public class WinCEFileServiceSubSystem extends FileServiceSubSystem {
-
- public WinCEFileServiceSubSystem(IHost host, IConnectorService connectorService, IFileService hostFileService,
- IHostFileToRemoteFileAdapter fileAdapter, ISearchService searchService) {
- super(host, connectorService, hostFileService, fileAdapter, searchService);
- }
-
- public IRemoteFile getRemoteFileObject(String folderOrFileName, IProgressMonitor monitor) throws SystemMessageException {
- String fofName = folderOrFileName.replace('/', '\\');
- IRemoteFile file = getCachedRemoteFile(fofName);
- if (file != null && !file.isStale()) {
- return file;
- }
-
- // for bug 207095, implicit connect if the connection is not connected
- checkIsConnected(monitor);
-
- if (fofName.equals("\\")) { //$NON-NLS-1$
- try {
- return listRoots(null)[0];
- } catch (Exception e) {
- }
- }
-
- if (fofName.equals(".")) { //$NON-NLS-1$
- IRemoteFile userHome = getUserHome();
- if (userHome == null){
- // with 207095, it's possible that we could be trying to get user home when not connected
- SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_UNEXPECTED);
- throw new SystemMessageException(msg);
- }
- return userHome;
- }
-
- if (fofName.endsWith("\\")) { //$NON-NLS-1$
- fofName = fofName.substring(0, fofName.length() - 1);
- }
-
- int lastSep = fofName.lastIndexOf("\\"); //$NON-NLS-1$
- if (lastSep > -1) {
- String parentPath = fofName.substring(0, lastSep);
- if (parentPath.length() == 0) {
- parentPath = "\\"; //$NON-NLS-1$
- }
- String name = fofName.substring(lastSep + 1, fofName.length());
-
- IHostFile node = getFile(parentPath, name, monitor);
- if (node != null) {
- IRemoteFile parent = null;
- if (!node.isRoot()) {
- //parent = getRemoteFileObject(parentPath);
- }
- return getHostFileToRemoteFileAdapter().convertToRemoteFile(this, getDefaultContext(), parent, node);
- }
- }
- return null;
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java
--- eclipse-rse-3.1.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java 2008-05-10 10:29:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/subsystems/files/wince/WinCEFileSubSystemConfiguration.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +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
- *
- * Contributors:
- * Radoslav Gerganov - derived from SftpFileSubSystemConfiguration
- *******************************************************************************/
-package org.eclipse.rse.subsystems.files.wince;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.connectorservice.wince.WinCEConnectorService;
-import org.eclipse.rse.internal.connectorservice.wince.WinCEConnectorServiceManager;
-import org.eclipse.rse.internal.services.wince.IWinCEService;
-import org.eclipse.rse.internal.services.wince.files.WinCEFileService;
-import org.eclipse.rse.internal.subsystems.files.wince.WinCEFileAdapter;
-import org.eclipse.rse.services.clientserver.SystemSearchString;
-import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.search.IHostSearchResultConfiguration;
-import org.eclipse.rse.services.search.IHostSearchResultSet;
-import org.eclipse.rse.services.search.ISearchService;
-import org.eclipse.rse.subsystems.files.core.ILanguageUtilityFactory;
-import org.eclipse.rse.subsystems.files.core.model.RemoteFileFilterString;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystemConfiguration;
-import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
-import org.eclipse.rse.ui.SystemBasePlugin;
-
-public class WinCEFileSubSystemConfiguration extends FileServiceSubSystemConfiguration {
-
- IHostFileToRemoteFileAdapter hostFileAdapter;
-
- public IFileService createFileService(IHost host) {
- WinCEConnectorService connectorService = (WinCEConnectorService) getConnectorService(host);
- return new WinCEFileService(connectorService);
- }
-
- public ISubSystem createSubSystemInternal(IHost host) {
- WinCEConnectorService connectorService = (WinCEConnectorService) getConnectorService(host);
- return new WinCEFileServiceSubSystem(host, connectorService, getFileService(host), getHostFileAdapter(), getSearchService(host));
- }
-
- public IHostSearchResultConfiguration createSearchConfiguration(IHost host,
- IHostSearchResultSet resultSet, Object searchTarget,
- SystemSearchString searchString) {
- return null;
- }
-
- public ISearchService createSearchService(IHost host) {
- return null;
- }
-
- protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr) {
- ISystemFilterPool pool = null;
- try {
- pool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true);
-
- // "My Home" filter
- Vector filterStrings = new Vector();
- RemoteFileFilterString myHomeFilterString = new RemoteFileFilterString(this);
- myHomeFilterString.setPath("\\My Documents\\"); //$NON-NLS-1$
- filterStrings.add(myHomeFilterString.toString());
- mgr.createSystemFilter(pool, "My Home", filterStrings); //$NON-NLS-1$
- //filter.setNonChangable(true);
- //filter.setSingleFilterStringOnly(true);
-
- // "Root Files" filter
- filterStrings = new Vector();
- RemoteFileFilterString rootFilesFilterString = new RemoteFileFilterString(this);
- filterStrings.add(rootFilesFilterString.toString());
- mgr.createSystemFilter(pool, "Root", filterStrings); //$NON-NLS-1$
- } catch (Exception exc) {
- SystemBasePlugin.logError("Error creating default filter pool",exc); //$NON-NLS-1$
- }
- return pool;
- }
-
- public IHostFileToRemoteFileAdapter getHostFileAdapter() {
- if (hostFileAdapter == null) {
- hostFileAdapter = new WinCEFileAdapter();
- }
- return hostFileAdapter;
- }
-
- public ILanguageUtilityFactory getLanguageUtilityFactory(
- IRemoteFileSubSystem ss) {
- return null;
- }
-
- public boolean supportsSearch() {
- return false;
- }
-
- public boolean supportsArchiveManagement() {
- return false;
- }
-
- public IConnectorService getConnectorService(IHost host) {
- return WinCEConnectorServiceManager.getInstance().getConnectorService(host, getServiceImplType());
- }
-
- public Class getServiceImplType() {
- return IWinCEService.class;
- }
-
- public void setConnectorService(IHost host, IConnectorService connectorService) {
- WinCEConnectorServiceManager.getInstance().setConnectorService(host, getServiceImplType(), connectorService);
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/feature.properties 2009-05-13 22:16:40.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
+# Copyright (c) 2006, 2012 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
@@ -16,10 +16,10 @@
featureName=RSE Telnet Service
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=The Remote System Explorer (RSE) telnet feature contains \
@@ -27,7 +27,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 Celunite, Inc. and others.\n\
+Copyright (c) 2000, 2012 Celunite, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -44,8 +44,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -53,42 +53,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -97,47 +93,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/feature.xml 2009-08-05 15:33:35.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,6 @@
-
-
March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:16:39.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.properties 2009-02-01 17:00:39.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -21,6 +21,6 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright Celunite, Inc. and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright Celunite, Inc. and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties 2009-05-14 08:01:33.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Use eclipse32.png feature image ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 08:01:33.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,4 +9,4 @@ # IBM Corporation - initial API and implementation ############################################################################### pluginName=RSE Telnet Service Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.telnet-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/feature.properties 2009-05-13 22:17:07.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 @@ -16,17 +16,17 @@ featureName=RSE Terminals UI # "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project # "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates +tmUpdateSiteName=Target Management 3.4 Updates # "description" property - description of the feature description=A Terminal View Integration for RSE Shell and Terminal Services. Includes Source. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2002, 2009 MontaVista Software, Inc. and others.\n\ +Copyright (c) 2002, 2012 MontaVista Software, Inc. and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ @@ -40,8 +40,8 @@ # "license" property - text of the "Feature Update License" # should be plain text version of license agreement pointed to be "licenseURL" license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ +Eclipse Foundation Software User Agreement\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -49,42 +49,38 @@ OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ \n\ Applicable Licenses\n\ \n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ For purposes of the EPL, "Program" will mean the Content.\n\ \n\ Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ as downloadable archives ("Downloads").\n\ \n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ \n\ The terms and conditions governing Plug-ins and Fragments should be\n\ contained in files named "about.html" ("Abouts"). The terms and\n\ @@ -93,47 +89,78 @@ Licenses may be located in any directory of a Download or Module\n\ including, but not limited to the following locations:\n\ \n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ \n\ Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ Included Features, the Feature Update License should either provide you\n\ with the terms and conditions governing the Included Features or inform\n\ you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ \n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ \n\ IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ govern that particular Content.\n\ \n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ Cryptography\n\ \n\ Content may contain encryption software. The country in which you are\n\ currently may have restrictions on the import, possession, and use,\n\ and/or re-export to another country, of encryption software. BEFORE\n\ using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ \n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n ########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/feature.xml 2009-11-05 17:38:09.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,6 @@ - -March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:17:05.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:15:05.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 @@ -25,5 +25,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright MontaVista Software, Inc. and others 2002, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright MontaVista Software, Inc. and others 2002, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties 2009-05-26 11:41:30.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2008, 2011 Wind River Systems, Inc. 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 @@ -8,5 +8,5 @@ # Contributors: # Martin Oberhuber (Wind River) - initial API and implementation ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties 2009-05-26 11:41:30.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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 @@ -13,4 +13,4 @@ # NLS_ENCODING=UTF-8 pluginName=RSE Terminals UI Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/.cvsignore eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/.cvsignore 2008-04-16 20:56:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -bin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF 2009-07-10 12:48:08.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.terminals.ui;singleton:=true -Bundle-Version: 1.0.1.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.rse.internal.terminals.ui.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.expressions, @@ -12,7 +12,7 @@ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.ui;bundle-version="[3.1.0,4.0.0)", org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", - org.eclipse.tm.terminal;bundle-version="[3.0.1,3.1.0)" + org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Bundle-Vendor: %providerName @@ -21,5 +21,6 @@ org.eclipse.rse.internal.terminals.ui.actions;x-internal:=true, org.eclipse.rse.internal.terminals.ui.configuration.adapter;x-internal:=true, org.eclipse.rse.internal.terminals.ui.handlers;x-internal:=true, + org.eclipse.rse.internal.terminals.ui.propertypages;x-internal:=true, org.eclipse.rse.internal.terminals.ui.views;x-internal:=true Bundle-Localization: plugin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/about.ini eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/about.ini 2009-05-13 22:17:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/about.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/about.properties 2009-02-01 15:14:48.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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 @@ -25,5 +25,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright MontaVista Software, Inc. and others 2002, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright MontaVista Software, Inc. and others 2002, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/build.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/build.properties 2009-05-14 08:00:17.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2009 IBM Corporation and others. +# Copyright (c) 2005, 2011 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 @@ -16,7 +16,7 @@ about.ini,\ about.mappings,\ about.properties,\ - dsdp32.png,\ + tm32.png,\ plugin.properties,\ plugin.xml,\ icons/ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/plugin.properties 2009-05-26 11:40:58.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008, 2009 MontaVista Software, Inc. and others. +# Copyright (c) 2008, 2011 MontaVista Software, Inc. 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 @@ # NLS_ENCODING=UTF-8 pluginName = RSE Terminals UI -providerName = Eclipse.org - DSDP +providerName = Eclipse TM Project terminalsView.name = Terminals diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.rse.terminals.ui/plugin.xml 2009-07-09 11:00:02.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.terminals.ui/plugin.xml 2013-02-12 20:26:45.000000000 +0000 @@ -1,6 +1,6 @@null
.
+ * @param name The name of the connection to find. Must be not null
.
+ * @return The found connection, or null if failed.
+ */
+ public IHost findConnection(String profileName, String name);
+
+ /**
+ * Copies the connection.
+ *
+ * @param connection The connection to copy. Must be not null
.
+ * @param copyName The name of the new connection. Must be not null
.
+ * @return The copied connection, or null if failed.
+ */
+ public IHost copyConnection(IHost connection, String copyName);
+
+ /**
* Removes the connection given by the specified name/label from the specified
* system profile. The method will do nothing if either the system profile or
* the connection does not exist.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java 2008-11-12 12:50:35.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestCase.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2011 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
@@ -11,19 +11,14 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* David McKnight (IBM) - [186363] get rid of obsolete calls to SubSystem.connect()
* Martin Oberhuber (Wind River) - organize, enable and tag test cases
+ * Martin Oberhuber (Wind River) - [247908] extract testBug255023
********************************************************************************/
package org.eclipse.rse.tests.core.connection;
import java.util.Properties;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
-import org.eclipse.rse.core.events.SystemResourceChangeEvent;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
@@ -63,59 +58,6 @@
}
/**
- * Creating/disposing elements in the systemView can lead
- * to "Widget is disposed" exception when Refresh is called
- * rarely so there is much to refresh. This might be due to
- * the elementComparer only comparing by absolute name.
- */
- public void testBug255023() throws Exception {
- // -test-author-:MartinOberhuber
- if (isTestDisabled())
- return;
- Job j = new Job("testBug255023") {
-
- protected IStatus run(IProgressMonitor monitor) {
- try {
- ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
- ISystemProfile prof = sr.createSystemProfile("Foo", true);
- IRSESystemType st = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID);
- IHost h1 = sr.createHost("Foo", st, "vxsim0", "localhost", "vxsim0");
- IHost h2 = sr.createHost("Foo", st, "vxsim1", "localhost", "vxsim1");
- IHost h3 = sr.createHost("Foo", st, "vxsim2", "localhost", "vxsim2");
- sr.fireEvent(new SystemResourceChangeEvent(sr, ISystemResourceChangeEvents.EVENT_REFRESH, null));
- // flushEventQueue();
- Thread.sleep(10000);
- sr.deleteHost(h1);
- sr.deleteHost(h2);
- sr.deleteHost(h3);
- // // Firing a refresh event here, after deleting the hosts
- // // but before adding the new one, makes the bug
- // disappear.
- // // Perhaps a correct fix would be that our content
- // provider
- // // refreshes the view right away by means of a listener,
- // // instead of relying on forced manual refresh only.
- // sr.fireEvent(new SystemResourceChangeEvent(sr,
- // ISystemResourceChangeEvents.EVENT_REFRESH, null));
- IHost h4 = sr.createHost("Foo", st, "vxsim1", "localhost", "vxsim1");
- sr.fireEvent(new SystemResourceChangeEvent(sr, ISystemResourceChangeEvents.EVENT_REFRESH, null));
- // flushEventQueue(); // will throw exception in main Thread!
- Thread.sleep(10000);
- sr.deleteSystemProfile(prof);
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- return Status.OK_STATUS;
- }
- };
- j.schedule();
- while (j.getState() != Job.NONE) {
- flushEventQueue();
- }
- }
-
- /**
* Test creation of connections.
*/
public void testConnectionCreation() {
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestSuite.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestSuite.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestSuite.java 2006-12-21 10:58:47.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/RSEConnectionTestSuite.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,11 +1,12 @@
/* *******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2010 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
*
* Contributors:
* David Dykstal (IBM) - initial contribution.
+ * Martin Oberhuber (Wind River) - [247908] extract testBug255023
* *******************************************************************************/
package org.eclipse.rse.tests.core.connection;
@@ -44,6 +45,8 @@
TestSuite suite = new TestSuite("RSE Connection Test Suite"); //$NON-NLS-1$
// add the single test suites to the overall one here.
suite.addTestSuite(RSEConnectionTestCase.class);
+ // TODO currently fails - see bug 255023
+ //suite.addTestSuite(TestBug255023.class);
return suite;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/TestBug255023.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/TestBug255023.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/TestBug255023.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/connection/TestBug255023.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,86 @@
+/********************************************************************************
+ * Copyright (c) 2006, 2010 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
+ *
+ * Contributors:
+ * Martin Oberhuber (Wind River) - [247908] extract from RSEConnectionTestCase
+ ********************************************************************************/
+package org.eclipse.rse.tests.core.connection;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.rse.core.IRSESystemType;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
+import org.eclipse.rse.core.events.SystemResourceChangeEvent;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.ISystemProfile;
+import org.eclipse.rse.core.model.ISystemRegistry;
+
+/**
+ * Basic connection tests.
+ */
+public class TestBug255023 extends RSEBaseConnectionTestCase {
+
+ public TestBug255023(String name) {
+ super(name);
+ }
+
+ /**
+ * Creating/disposing elements in the systemView can lead
+ * to "Widget is disposed" exception when Refresh is called
+ * rarely so there is much to refresh. This might be due to
+ * the elementComparer only comparing by absolute name.
+ */
+ public void testBug255023() throws Exception {
+ // -test-author-:MartinOberhuber
+ if (isTestDisabled())
+ return;
+ Job j = new Job("testBug255023") {
+
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();
+ ISystemProfile prof = sr.createSystemProfile("Foo", true);
+ IRSESystemType st = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID);
+ IHost h1 = sr.createHost("Foo", st, "vxsim0", "localhost", "vxsim0");
+ IHost h2 = sr.createHost("Foo", st, "vxsim1", "localhost", "vxsim1");
+ IHost h3 = sr.createHost("Foo", st, "vxsim2", "localhost", "vxsim2");
+ sr.fireEvent(new SystemResourceChangeEvent(sr, ISystemResourceChangeEvents.EVENT_REFRESH, null));
+ // flushEventQueue();
+ Thread.sleep(10000);
+ sr.deleteHost(h1);
+ sr.deleteHost(h2);
+ sr.deleteHost(h3);
+ // // Firing a refresh event here, after deleting the hosts
+ // // but before adding the new one, makes the bug
+ // disappear.
+ // // Perhaps a correct fix would be that our content
+ // provider
+ // // refreshes the view right away by means of a listener,
+ // // instead of relying on forced manual refresh only.
+ // sr.fireEvent(new SystemResourceChangeEvent(sr,
+ // ISystemResourceChangeEvents.EVENT_REFRESH, null));
+ IHost h4 = sr.createHost("Foo", st, "vxsim1", "localhost", "vxsim1");
+ sr.fireEvent(new SystemResourceChangeEvent(sr, ISystemResourceChangeEvents.EVENT_REFRESH, null));
+ // flushEventQueue(); // will throw exception in main Thread!
+ Thread.sleep(10000);
+ sr.deleteSystemProfile(prof);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ return Status.OK_STATUS;
+ }
+ };
+ j.schedule();
+ while (j.getState() != Job.NONE) {
+ flushEventQueue();
+ }
+ }
+
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/OriginalPasswordPersistenceManager.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/OriginalPasswordPersistenceManager.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/OriginalPasswordPersistenceManager.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/OriginalPasswordPersistenceManager.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,675 @@
+/*
+ * This class copied from org.eclipse.rse.core to use to populate the old password store for
+ * migration testing. No source changes have been made other than those
+ * required to compile in a different package. Class was also renamed to prevent
+ * confusion in the testcase.
+ */
+
+/********************************************************************************
+ * Copyright (c) 2002, 2012 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
+ *
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight, Kushal Munir,
+ * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
+ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+ *
+ * Contributors:
+ * David Dykstal (IBM) - moved from core package in the UI plugin
+ * - updated to use new RSEPreferencesManager
+ * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
+ * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
+ * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
+ * Martin Oberhuber (Wind River) - [218655][api] Provide SystemType enablement info in non-UI
+ * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
+ * David Dykstal (IBM) - [210474] Deny save password function missing
+ ********************************************************************************/
+
+package org.eclipse.rse.tests.core.passwords;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.core.AbstractRSESystemType;
+import org.eclipse.rse.core.IRSESystemType;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.RSEPreferencesManager;
+import org.eclipse.rse.core.model.SystemSignonInformation;
+import org.eclipse.rse.internal.core.RSECoreMessages;
+import org.osgi.framework.Bundle;
+
+
+/**
+ * PasswordPersistenceManager manages the saving and retrieving of user ID /
+ * passwords to the Eclipse keyring for registered system types.
+ *
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients. Use
+ * the {@link #getInstance()} method to get the singleton
+ * instance.
+ */
+public class OriginalPasswordPersistenceManager {
+
+ // Keys used for using the Platform authorization methods
+ // The server url is generic so we can lookup all registered user IDs / passwords
+ // to display to the user in the password information preference page
+ private static final String SERVER_URL = "file://rse"; //$NON-NLS-1$
+
+ private static final String AUTH_SCHEME = ""; // no authorization scheme specified for apis //$NON-NLS-1$
+
+ // Add return codes
+ public static final int RC_OK = 0;
+ public static final int RC_ALREADY_EXISTS = 1;
+ /** @since org.eclipse.rse.core 3.0 */
+ public static final int RC_DENIED = 2;
+ public static final int RC_ERROR = -1;
+
+ // Default System Type, on a lookup if the specified system type and hostname is not found
+ // then the call will automatically lookup the default system type and hostname
+ public static final IRSESystemType DEFAULT_SYSTEM_TYPE = new DefaultSystemType();
+
+ // Default user name
+ public static final String DEFAULT_USER_NAME = "DEFAULT_USER"; //$NON-NLS-1$
+
+ // New URL to store password map
+ private String newURL = null;
+
+ /*
+ * Singleton instance
+ */
+ private static OriginalPasswordPersistenceManager _instance;
+
+ /*
+ * Instance variables
+ */
+ private RegisteredSystemType[] systemTypes;
+
+ /**
+ * Default System Type
+ */
+ private static class DefaultSystemType extends AbstractRSESystemType implements IRSESystemType
+ {
+ private static final String DEFAULT_ID = "DEFAULT"; //$NON-NLS-1$
+ private DefaultSystemType() {
+ super(DEFAULT_ID, DEFAULT_ID, RSECoreMessages.DefaultSystemType_Label, null, null);
+ }
+ public String getId() {
+ //TODO consider a space character at the beginning to ensure uniqueness
+ return DEFAULT_ID;
+ }
+ public String[] getSubsystemConfigurationIds() {
+ return null;
+ }
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+ public boolean isEnabled() {
+ return true;
+ }
+ }
+
+ /**
+ * Inner class used for storing registered system types
+ */
+ private class RegisteredSystemType
+ {
+ private IRSESystemType _systemType;
+ private boolean _userIDCaseSensitive;
+
+ protected RegisteredSystemType(IRSESystemType systemType, boolean caseSensitive)
+ {
+ _systemType = systemType;
+ _userIDCaseSensitive = caseSensitive;
+ }
+
+ /**
+ * Returns the system type.
+ * @return the system type.
+ */
+ public IRSESystemType getSystemType() {
+ return _systemType;
+ }
+
+ /**
+ * Returns whether the user ID is case sensitive.
+ * @return true
if the user ID is case sensitive, false
otherwise.
+ */
+ public boolean isUserIDCaseSensitive() {
+ return _userIDCaseSensitive;
+ }
+ }
+
+ /**
+ * Singleton so private constructor
+ */
+ private OriginalPasswordPersistenceManager(){
+ String userName = System.getProperty("user.name"); //$NON-NLS-1$
+
+ if (userName == null) {
+ userName = DEFAULT_USER_NAME;
+ }
+
+ newURL = SERVER_URL + userName;
+ }
+
+ /**
+ * Tests the existence of the Eclipse authorization API by looking for installation of the bundle containing the API.
+ * This method was added for testing purposes.
+ * @return true if the API is installed.
+ * @since org.eclipse.rse.core 3.4
+ */
+ public static boolean isActive() {
+ Bundle authorizationBundle = Platform.getBundle("org.eclipse.core.runtime.compatibility.auth"); //$NON-NLS-1$
+ boolean result = (authorizationBundle != null);
+ return result;
+ }
+
+ /**
+ * Retrieve the singleton instance of the PasswordPersistenceManger
+ */
+ public static final synchronized OriginalPasswordPersistenceManager getInstance()
+ {
+ if (_instance == null)
+ {
+ _instance = new OriginalPasswordPersistenceManager();
+ _instance.initExtensions();
+ }
+ return _instance;
+ }
+
+ /*
+ * initialization - register system types
+ */
+ private void initExtensions()
+ {
+ IRSESystemType[] sysTypes = RSECorePlugin.getTheCoreRegistry().getSystemTypes();
+ systemTypes = new RegisteredSystemType[sysTypes.length];
+
+ for (int i = 0; i < sysTypes.length; i++) {
+ systemTypes[i] = new RegisteredSystemType(sysTypes[i], true);
+ }
+ }
+
+ /**
+ * Remove the entry from the keyring that matches the systemtype, hostname and
+ * user ID from the SystemSignonInfo parameter.
+ */
+ public void remove(SystemSignonInformation info)
+ {
+ remove(info.getSystemType(), info.getHostname(), info.getUserId());
+ }
+
+ /**
+ * Removes all passwords for a host name for a given system type. Use the
+ * default system type explicitly to remove those entries.
+ *
+ * @param systemType The system type of the host
+ * @param hostName The IP address of the host in canonical format
+ * @return the number of passwords removed from the keyring
+ * @since org.eclipse.rse.core 3.0
+ */
+ public int remove(IRSESystemType systemType, String hostName) {
+ Map passwords = getPasswordMap(systemType);
+ int numberRemoved = 0;
+ if (passwords != null) {
+ String hostPrefix = hostName + "//"; //$NON-NLS-1$
+ Set keys = passwords.keySet();
+ for (Iterator z = keys.iterator(); z.hasNext();) {
+ String key = (String) z.next();
+ if (key.startsWith(hostPrefix)) {
+ z.remove(); // safely removes the key and the entry from the map
+ numberRemoved++;
+ }
+ }
+ if (numberRemoved > 0) {
+ savePasswordMap(systemType.getId(), passwords);
+ }
+ }
+ return numberRemoved;
+ }
+
+ /**
+ * Removes all entries from the keyring that match the hostname, userid, and system type.
+ * Use the default system type explicitly to remove those entries.
+ * @param systemType the systemType
+ * @param hostName the connection name
+ * @param userid the user id
+ */
+ public void remove(IRSESystemType systemType, String hostName, String userid) {
+ String hostname = hostName;//RSEUIPlugin.getQualifiedHostName(hname);
+ // Convert userid to upper case if required
+ if (!isUserIDCaseSensitive(systemType)) {
+ userid = userid.toUpperCase();
+ }
+ Map passwords = getPasswordMap(systemType);
+ if (passwords != null) {
+ if (removePassword(passwords, hostname, userid)) {
+ savePasswordMap(systemType.getId(), passwords);
+ }
+ }
+ }
+
+ /**
+ * Check if a password entry exists for the specified system type, hostname
+ * and userid.
+ */
+ public boolean passwordExists(IRSESystemType systemtype, String hostname, String userid)
+ {
+
+ return passwordExists(systemtype, hostname, userid, true);
+ }
+
+ /**
+ * Check if a password entry exists for the specified system type, hostname
+ * and userid.
+ *
+ * @param systemtype The system type to check for.
+ * @param hname The hostname to check for.
+ * @param userid The user ID to check for.
+ * @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
+ */
+ public boolean passwordExists(IRSESystemType systemtype, String hname, String userid, boolean checkDefault)
+ {
+ String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
+ return (find(systemtype, hostname, userid) != null);
+ }
+
+ /**
+ * Add a password to the password database.
+ * This will not update the entry for the default system type
+ * @param info The signon information to store
+ * @param overwrite Whether to overwrite any existing entry
+ * @return
+ * RC_OK if the password was successfully stored
+ * RC_ALREADY_EXISTS if the password already exists and overwrite was false
+ */
+ public int add(SystemSignonInformation info, boolean overwrite) {
+ return add(info, overwrite, false);
+ }
+
+ /**
+ * Add a password to the password database.
+ * @param info The signon information to store
+ * @param overwrite If true then overwrite the existing entry for this systemtype, hostname, and userid.
+ * @param updateDefault if true then set the entry for the default systemtype, hostname, and user ID, according to the overwrite setting.
+ * @return
+ * RC_OK if the password was successfully stored.
+ * RC_ALREADY_EXISTS if the password already exists and overwrite was false
+ * RC_DENIED if passwords may not be saved for this system type and host
+ */
+ public int add(SystemSignonInformation info, boolean overwrite, boolean updateDefault) {
+ int result = RC_OK;
+ IRSESystemType systemType = info.getSystemType();
+ String hostName = info.getHostname();
+ String userId = info.getUserId();
+ String newPassword = info.getPassword();
+ boolean deny = RSEPreferencesManager.getDenyPasswordSave(systemType, hostName);
+ if (!deny) {
+ if (!isUserIDCaseSensitive(systemType)) {
+ userId = userId.toUpperCase();
+ info.setUserId(userId);
+ }
+ if (updateDefault) {
+ if (systemType != DEFAULT_SYSTEM_TYPE) {
+ SystemSignonInformation newInfo = new SystemSignonInformation(hostName, userId, newPassword, DEFAULT_SYSTEM_TYPE);
+ result = add(newInfo, overwrite, false);
+ }
+ }
+ Map passwords = getPasswordMap(systemType);
+ if (passwords == null) {
+ passwords = new HashMap(5);
+ }
+ String oldPassword = getPassword(passwords, hostName, userId);
+ if (oldPassword != null) {
+ if (overwrite) {
+ removePassword(passwords, hostName, userId);
+ } else {
+ result = RC_ALREADY_EXISTS;
+ }
+ }
+ if (result == RC_OK) {
+ String passwordKey = getPasswordKey(hostName, userId);
+ passwords.put(passwordKey, newPassword);
+ savePasswordMap(systemType.getId(), passwords);
+ }
+ } else {
+ result = RC_DENIED;
+ }
+ return result;
+ }
+
+ /*
+ * Retrieve the password map from the keyring for the specified system type
+ */
+ private Map getPasswordMap(IRSESystemType systemType)
+ {
+ Map passwords = null;
+ String systemTypeId = systemType.getId();
+
+ try
+ {
+ URL serverURL = new URL(newURL);
+ passwords = Platform.getAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME);
+
+ // if no passwords found with new URL, check old URL
+ if (passwords == null) {
+
+ URL oldServerURL1 = new URL(SERVER_URL + ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString());
+ passwords = Platform.getAuthorizationInfo(oldServerURL1, systemTypeId, AUTH_SCHEME);
+
+ // passwords found, so migrate to using new URL
+ if (passwords != null) {
+ savePasswordMap(systemTypeId, passwords);
+ }
+ // if still no passwords found, check with even older URL
+ else {
+ URL oldServerURL2 = new URL(SERVER_URL);
+ passwords = Platform.getAuthorizationInfo(oldServerURL2, systemTypeId, AUTH_SCHEME);
+
+ // passwords found, so migrate to using new URL
+ if (passwords != null) {
+ savePasswordMap(systemTypeId, passwords);
+ }
+ }
+ }
+ }
+ catch (MalformedURLException e) {
+ RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.getPasswordMap", e); //$NON-NLS-1$
+ }
+
+ return passwords;
+ }
+
+ /*
+ * Retrieve the password map from the keyring for the specified system type
+ */
+ private void savePasswordMap(String systemTypeId, Map passwords)
+ {
+ try
+ {
+ URL serverURL = new URL(newURL);
+ Platform.flushAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME);
+ Platform.addAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME, passwords);
+ }
+ catch (MalformedURLException e) {
+ RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
+ }
+ catch (CoreException e) {
+ RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * Find the password for the specified systemtype, hostname and userid.
+ * If one is not found then the default system type is used.
+ * The system type in the signon information returned may not be the same as the system type
+ * specfied in the argument.
+ */
+ public SystemSignonInformation find(IRSESystemType systemtype, String hostname, String userid)
+ {
+ return find(systemtype, hostname, userid, true);
+ }
+
+
+ private boolean removePassword(Map passwords, String hostname, String userid)
+ {
+ boolean removed = false;
+ String password = null;
+
+ String passwordKey = getPasswordKey(hostname, userid);
+ password =(String) passwords.get(passwordKey);
+ if (password != null)
+ {
+ passwords.remove(passwordKey);
+ removed = true;
+ }
+ else
+ {
+ String phostname = hostname.toUpperCase();
+
+ // DKM - fallback for different case uids, hostnames or qualified/unqualified hostnames
+ Iterator keys = passwords.keySet().iterator();
+ while (keys.hasNext() && password == null)
+ {
+ String key = (String)keys.next();
+ if (key.equalsIgnoreCase(passwordKey))
+ {
+ password = (String) passwords.get(key);
+ }
+ else
+ {
+ String khostname = getHostnameFromPasswordKey(key).toUpperCase();
+ String kuid = getUserIdFromPasswordKey(key);
+ if (kuid.equalsIgnoreCase(userid))
+ {
+ // uid matches, check if hosts are the same
+ if (khostname.startsWith(phostname) || phostname.startsWith(khostname))
+ {
+ String qkhost = RSECorePlugin.getQualifiedHostName(khostname);
+ String qphost = RSECorePlugin.getQualifiedHostName(phostname);
+ if (qkhost.equals(qphost))
+ {
+ password = (String)passwords.get(key);
+ }
+ }
+ }
+ }
+ if (password != null)
+ {
+ passwords.remove(key);
+ removed = true;
+
+ }
+ }
+ }
+ return removed;
+
+ }
+
+ private String getPassword(Map passwords, String hostname, String userid)
+ {
+ String password = null;
+
+ String passwordKey = getPasswordKey(hostname, userid);
+ password =(String) passwords.get(passwordKey);
+ if (password != null)
+ return password;
+
+ String phostname = hostname.toUpperCase();
+
+ // DKM - fallback for different case uids, hostnames or qualified/unqualified hostnames
+ Iterator keys = passwords.keySet().iterator();
+ while (keys.hasNext() && password == null)
+ {
+ String key = (String)keys.next();
+ if (key.equalsIgnoreCase(passwordKey))
+ {
+ password = (String) passwords.get(key);
+ }
+ else
+ {
+ String khostname = getHostnameFromPasswordKey(key).toUpperCase();
+ String kuid = getUserIdFromPasswordKey(key);
+ if (kuid.equalsIgnoreCase(userid))
+ {
+ // uid matches, check if hosts are the same
+ if (khostname.startsWith(phostname) || phostname.startsWith(khostname))
+ {
+ String qkhost = RSECorePlugin.getQualifiedHostName(khostname);
+ String qphost = RSECorePlugin.getQualifiedHostName(phostname);
+ if (qkhost.equals(qphost))
+ {
+ password = (String)passwords.get(key);
+ }
+ }
+ }
+ }
+ }
+
+ return password;
+
+ }
+
+ /**
+ * Find the persisted password for the specified systemtype, hostname and userid.
+ *
+ * @param systemtype The system type to check for.
+ * @param hname The hostname to check for.
+ * @param userid The user ID to check for.
+ * @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
+ */
+ public SystemSignonInformation find(IRSESystemType systemtype, String hname, String userid, boolean checkDefault)
+ {
+ String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
+ // Convert userid to upper case if required
+ if (!isUserIDCaseSensitive(systemtype) && userid != null)
+ {
+ userid = userid.toUpperCase();
+ }
+
+ Map passwords = getPasswordMap(systemtype);
+
+ if (passwords != null)
+ {
+ String password = getPassword(passwords, hostname, userid);
+
+ if (password != null)
+ {
+ return new SystemSignonInformation(hostname, userid, password, systemtype);
+ }
+ }
+
+ // yantzi: RSE6.2 check for default system type entry with this hostname and user ID
+ if (checkDefault && !DEFAULT_SYSTEM_TYPE.equals(systemtype))
+ {
+ return find(DEFAULT_SYSTEM_TYPE, hostname, userid, false);
+ }
+
+ return null;
+ }
+
+ /**
+ * Helper class for building the key to lookup the password for a specific
+ * userid and hostname in the Map
+ */
+ private String getPasswordKey(String hname, String userid)
+ {
+ String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
+ StringBuffer buffer = new StringBuffer(hostname);
+ buffer.append("//"); //$NON-NLS-1$
+ buffer.append(userid);
+ return buffer.toString();
+ }
+
+ private String getHostnameFromPasswordKey(String passwordKey)
+ {
+ int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
+ return passwordKey.substring(0,sepIndex);
+ }
+
+ private String getUserIdFromPasswordKey(String passwordKey)
+ {
+ int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
+ return passwordKey.substring(sepIndex + 2, passwordKey.length());
+ }
+
+ /**
+ * Helper method for determining if system type uses case sensitive user IDs
+ */
+ public boolean isUserIDCaseSensitive(IRSESystemType systemType)
+ {
+ // First find the correct provider
+ for (int i = 0; i < systemTypes.length; i++)
+ {
+
+ if (systemTypes[i].getSystemType().equals(systemType))
+ {
+ return systemTypes[i].isUserIDCaseSensitive();
+ }
+ }
+
+ //Not found: Default system type is case sensitive
+ return true;
+ }
+
+ /**
+ * Retrieve the list of registered system types
+ */
+ public IRSESystemType[] getRegisteredSystemTypes()
+ {
+ // yantzi: artemis 6.2, added default system type to list
+ IRSESystemType[] types = new IRSESystemType[systemTypes.length + 1];
+
+ types[0] = DEFAULT_SYSTEM_TYPE;
+
+ for (int i = 0; i < systemTypes.length; i++)
+ {
+ types[i + 1] = systemTypes[i].getSystemType();
+ }
+
+ return types;
+ }
+
+ /**
+ * Retrieve a list of the stored user IDs.
+ *
+ * @return List A list of the stored user IDs as SystemSignonInformation instances
+ * without the saved passwords.
+ */
+ public List getSavedUserIDs()
+ {
+ List savedUserIDs = new ArrayList();
+ Map passwords;
+ String key;
+ int separator;
+
+ for (int i = 0; i < systemTypes.length; i++)
+ {
+ passwords = getPasswordMap(systemTypes[i].getSystemType());
+ if (passwords != null)
+ {
+ Iterator keys = passwords.keySet().iterator();
+ while (keys.hasNext())
+ {
+ key = (String) keys.next();
+ separator = key.indexOf("//"); //$NON-NLS-1$
+ savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
+ key.substring(separator + 2), // userid
+ systemTypes[i].getSystemType())); // system type
+ }
+ }
+ }
+
+ // yantzi: RSE 6.2 Get DEFAULT system types too
+ passwords = getPasswordMap(DEFAULT_SYSTEM_TYPE);
+ if (passwords != null)
+ {
+ Iterator keys = passwords.keySet().iterator();
+ while (keys.hasNext())
+ {
+ key = (String) keys.next();
+ separator = key.indexOf("//"); //$NON-NLS-1$
+ savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator), // hostname
+ key.substring(separator + 2), // userid
+ DEFAULT_SYSTEM_TYPE)); // system type
+ }
+ }
+
+ return savedUserIDs;
+ }
+
+}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/PasswordsTest.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/PasswordsTest.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/PasswordsTest.java 2008-07-14 21:48:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/passwords/PasswordsTest.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,15 +1,18 @@
/********************************************************************************
- * Copyright (c) 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2008, 2013 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
*
* Contributors:
* David Dykstal (IBM) - [210474] Deny save password function missing
+ * David Dykstal (IBM) - [379787] Fix secure storage usage in org.eclipse.rse.tests
********************************************************************************/
package org.eclipse.rse.tests.core.passwords;
+import java.util.List;
+
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.PasswordPersistenceManager;
import org.eclipse.rse.core.RSEPreferencesManager;
@@ -28,6 +31,7 @@
*/
protected void setUp() throws Exception {
super.setUp();
+// System.setProperty("rse.enableSecureStoreAccess", "false");
}
/* (non-Javadoc)
@@ -39,8 +43,8 @@
public void testAddRemove() {
//-test-author-:DavidDykstal
- if (isTestDisabled())
- return;
+ if (isTestDisabled()) return;
+ if ("false".equals(System.getProperty("rse.enableSecureStoreAccess"))) return;
IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_UNIX_ID);
IRSESystemType defaultSystemType = PasswordPersistenceManager.DEFAULT_SYSTEM_TYPE;
String hostAddress = "somesystem.mycompany.com";
@@ -93,8 +97,8 @@
public void testSaveDenial() {
//-test-author-:DavidDykstal
- if (isTestDisabled())
- return;
+ if (isTestDisabled()) return;
+ if ("false".equals(System.getProperty("rse.enableSecureStoreAccess"))) return;
IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_UNIX_ID);
String hostAddress = "somesystem.mycompany.com";
boolean deny = RSEPreferencesManager.getDenyPasswordSave(systemType, hostAddress);
@@ -134,4 +138,122 @@
assertNull("signon info was found but should not be", returnedInfo);
}
+ public void testMigration() {
+ //-test-author-:DavidDykstal
+ if (isTestDisabled()) return;
+ if ("false".equals(System.getProperty("rse.enableSecureStoreAccess"))) return;
+
+ // Setup
+ IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
+ PasswordPersistenceManager newPPM = PasswordPersistenceManager.getInstance();
+ if (OriginalPasswordPersistenceManager.isActive()) {
+ OriginalPasswordPersistenceManager oldPPM = OriginalPasswordPersistenceManager.getInstance();
+
+ // Clear the new manager entries for those system types.
+ newPPM.reset(systemType);
+
+ // Populate the old manager with some entries.
+ oldPPM.add(new SystemSignonInformation("myhost.mycompany.com", "me", "password", systemType), true, false);
+ oldPPM.add(new SystemSignonInformation("yourhost.yourcompany.com", "you", "xxyyzz", systemType), true, false);
+ oldPPM.add(new SystemSignonInformation("LOUDHOST.mycompany.com", "thatguy", "abc", systemType), true, false);
+
+ // Reference the new manager for the entries, these should migrate automatically.
+ SystemSignonInformation foundInfo = null;
+ foundInfo = newPPM.find(systemType, "myhost.mycompany.com", "me");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "password");
+ foundInfo = newPPM.find(systemType, "yourhost.yourcompany.com", "you");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "xxyyzz");
+ foundInfo = newPPM.find(systemType, "LOUDHOST.mycompany.com", "thatguy");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "abc");
+ }
+
+ }
+
+ public void testAliasing() {
+ //-test-author-:DavidDykstal
+ if (isTestDisabled()) return;
+ if ("false".equals(System.getProperty("rse.enableSecureStoreAccess"))) return;
+ IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
+ PasswordPersistenceManager ppm = PasswordPersistenceManager.getInstance();
+ ppm.add(new SystemSignonInformation("LOUDHOST.mycompany.com", "thatguy", "abc", systemType), true, false);
+ SystemSignonInformation foundInfo = ppm.find(systemType, "LOUDHOST.mycompany.com", "thatguy");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "abc");
+ foundInfo = ppm.find(systemType, "loudhost.mycompany.com", "thatguy");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "abc");
+ foundInfo = ppm.find(systemType, "loudhost.MyCompany.com", "thatguy");
+ assertNotNull(foundInfo);
+ assertEquals(foundInfo.getPassword(), "abc");
+ }
+
+ public void testBadArgs() {
+ if (isTestDisabled()) return;
+ if ("false".equals(System.getProperty("rse.enableSecureStoreAccess"))) return;
+ IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_LOCAL_ID);
+ PasswordPersistenceManager ppm = PasswordPersistenceManager.getInstance();
+ ppm.add(new SystemSignonInformation("myhost.mycompany.com", "me", "password", systemType), true, false);
+ SystemSignonInformation info = ppm.find(systemType, "myhost.mycompany.com", null);
+ assertNull(info);
+ }
+
+ public void testDisabledSecureStore() {
+ //-test-author-:DavidDykstal
+ if (isTestDisabled()) return;
+ String key = "rse.enableSecureStoreAccess";
+ String valueOnEntry = System.getProperty(key);
+ System.setProperty(key, "false");
+ PasswordPersistenceManager ppm = PasswordPersistenceManager.getInstance();
+ IRSESystemType systemType = RSECoreRegistry.getInstance().getSystemType(IRSESystemType.SYSTEMTYPE_UNIX_ID);
+ String hostAddress = "somesystem.mycompany.com";
+ String password = "password";
+ String userId = "me";
+ SystemSignonInformation info = new SystemSignonInformation(hostAddress, userId, password, systemType);
+
+ // try saving and retrieving a password
+ int result = ppm.add(info, true);
+ assertEquals("result of first add was not RC_DENIED", PasswordPersistenceManager.RC_DENIED, result);
+ result = ppm.add(info, true, true);
+ assertEquals("result of second add was not RC_DENIED", PasswordPersistenceManager.RC_DENIED, result);
+ SystemSignonInformation returnedInfo = ppm.find(systemType, hostAddress, userId);
+ assertNull("signon info was found and should not be", returnedInfo);
+
+ // test passwords for existence
+ assertFalse("found signon information where none should exist (1)", ppm.passwordExists(systemType, hostAddress, userId));
+ assertFalse("found signon information where none should exist (2)", ppm.passwordExists(systemType, hostAddress, userId, false));
+ assertFalse("found signon information where none should exist (3)", ppm.passwordExists(systemType, hostAddress, userId, true));
+
+ // try finding password info
+ returnedInfo = ppm.find(systemType, hostAddress, userId);
+ assertNull("signon info was found and should not be (1)", returnedInfo);
+ returnedInfo = ppm.find(systemType, hostAddress, userId, false);
+ assertNull("signon info was found but should not be (2)", returnedInfo);
+ returnedInfo = ppm.find(systemType, hostAddress, userId, true);
+ assertNull("signon info was found but should not be (3)", returnedInfo);
+
+ // try removal
+ ppm.remove(info);
+ ppm.remove(systemType, hostAddress, userId);
+ assertEquals("passwords were removed but none should be (2)", 0, ppm.remove(systemType, hostAddress));
+
+ // get system types
+ IRSESystemType[] systemTypes = ppm.getRegisteredSystemTypes();
+ assertNotNull("returned system types is null", systemTypes);
+ assertTrue("no system types were found", systemTypes.length > 0);
+
+ // get saved user ids
+ @SuppressWarnings("rawtypes")
+ List userInfo = ppm.getSavedUserIDs();
+ assertTrue("user info was found where none should exist", userInfo.size() == 0);
+
+ if (valueOnEntry == null) {
+ System.clearProperty(key);
+ } else {
+ System.setProperty(key, valueOnEntry);
+ }
+ }
+
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java 2008-07-25 13:21:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/registries/SubSystemConfigurationProxyTestCase.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2011 Wind River Systems, Inc. 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
@@ -114,7 +114,7 @@
if ("org.eclipse.rse.tests.subsystems.TestSubSystem3".equals(proxy.getId())) { //$NON-NLS-1$
assertEquals("Unexpected return value for proxy.getDescription()!", "Test Subsystem 3", proxy.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$
- assertEquals("Unexpected return value for proxy.getVendor()!", "Eclipse.org", proxy.getVendor()); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Unexpected return value for proxy.getVendor()!", "Eclipse TM Project", proxy.getVendor()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("Unexpected return value for proxy.getName()!", "Tests3", proxy.getName()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("Unexpected return value for proxy.getDeclaredSystemTypeIds()!", "org.eclipse.rse.systemtype.*n?x", proxy.getDeclaredSystemTypeIds()); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse("Unexpected return value true for proxy.supportsAllSystemTypes()!", proxy.supportsAllSystemTypes()); //$NON-NLS-1$
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/decorators/RSEModelObjectTestDecorator.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/decorators/RSEModelObjectTestDecorator.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/decorators/RSEModelObjectTestDecorator.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/decorators/RSEModelObjectTestDecorator.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Wind River Systems, Inc. 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
+ *
+ * Contributors:
+ * Uwe Stieber (Wind River) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.rse.tests.decorators;
+
+import org.eclipse.jface.viewers.ILabelDecorator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * RSE Model Object test decorator.
+ *
+ * @since 3.2
+ */
+public class RSEModelObjectTestDecorator extends LabelProvider implements ILabelDecorator {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
+ */
+ public Image decorateImage(Image image, Object element) {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
+ */
+ public String decorateText(String text, Object element) {
+ return text + " (RSE Test Decoration)";
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java 2009-08-06 20:56:38.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/internal/RSEConnectionManager.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2011 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
@@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [219086] flush event queue to shield tests from each other
* David Dykstal (IBM) - [210474] Deny save password function missing
* Martin Oberhuber (Wind River) - Support REXEC launch type for dstore
+ * Tom Hochstein (Freescale) - [301075] Host copy doesn't copy contained property sets
*******************************************************************************/
package org.eclipse.rse.tests.internal;
@@ -168,6 +169,40 @@
return resultProperties != null ? new RSEConnectionProperties(resultProperties) : (IRSEConnectionProperties)null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.tests.core.connection.IRSEConnectionManager#copyConnection(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public IHost findConnection(String profileName, String name) {
+ assert profileName != null && name != null;
+
+ ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry();
+ Assert.assertNotNull("FAILED(findConnection): RSE system registry unavailable!", systemRegistry); //$NON-NLS-1$
+
+ ISystemProfile profile = systemRegistry.getSystemProfile(profileName);
+ if (profile != null) {
+ return systemRegistry.getHost(profile, name);
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.tests.core.connection.IRSEConnectionManager#copyConnection(java.lang.String, java.lang.String, java.lang.String)
+ */
+ public IHost copyConnection(IHost connection, String copyName) {
+ assert connection != null;
+
+ ISystemRegistry systemRegistry = RSECorePlugin.getTheSystemRegistry();
+ Assert.assertNotNull("FAILED(copyConnection): RSE system registry unavailable!", systemRegistry); //$NON-NLS-1$
+
+ try {
+ return systemRegistry.copyHost(connection, connection.getSystemProfile(), copyName, null);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return null;
+ }
+ }
+
/**
* Delete a host given its name and the name of its profile. If the host is not found then
* do nothing.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java 2008-07-14 21:48:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FTPFileSubsystemTestCase.java 2013-02-12 20:26:45.000000000 +0000
@@ -164,4 +164,13 @@
if (ftpService.isConnected()) ftpService.disconnect();
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.tests.core.RSECoreTestCase#isTestDisabled()
+ */
+ @Override
+ protected boolean isTestDisabled() {
+ // TODO AD:turn this test back on when we figure out why it stopped working headlessly
+ return true;
+ }
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveBaseTest.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveBaseTest.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveBaseTest.java 2008-07-14 21:48:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveBaseTest.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Johnson Ma (Wind River) - [195402] Extracted from FileServiceArchiveTest
+ * Xuan Chen (IBM) [333874] - Added more logging code to track junit failure
*******************************************************************************/
package org.eclipse.rse.tests.subsystems.files;
@@ -17,6 +18,7 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.rse.core.model.ISystemResourceSet;
import org.eclipse.rse.core.model.SystemRemoteResourceSet;
import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
@@ -888,7 +890,7 @@
-
+ /*
public void testOpenFileFromTarArchive() throws Exception {
if (isTestDisabled())
return;
@@ -920,8 +922,10 @@
//now, verify the content of the local file
IFileStore localFile = temp.getChild(fileContentToVerifyName1);
+ File actualFile = localFile.toLocalFile(EFS.NONE, new NullProgressMonitor());
+ assertTrue("The file does not exist", actualFile.exists());
//Check the content of the download file:
- boolean sameContent = compareContent(getContents(fileContentString1), localFile.openInputStream(EFS.NONE, null));
+ boolean sameContent = compareContent1(getContents(fileContentString1), localFile.openInputStream(EFS.NONE, null));
assertTrue(sameContent);
@@ -947,7 +951,7 @@
assertTrue(sameContent);
}
-
+ */
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java 2008-07-14 21:48:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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
@@ -10,6 +10,7 @@
* Martin Oberhuber (Wind River) - Fix Javadoc warnings
* Martin Oberhuber (Wind River) - organize, enable and tag test cases
* Martin Oberhuber (Wind River) - [195402] Add constructor with test name
+ * Xuan Chen (IBM) - [333874] [testing] Spurious NPE during testOpenFileFromTarArchive on hudson.eclipse.org
*******************************************************************************/
package org.eclipse.rse.tests.subsystems.files;
@@ -101,7 +102,7 @@
suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testSuperTransferDStoreWindowsAndDStore"));
suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testSuperTransferDStoreToLocal"));
//open a virtual file in tar archive
- suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testOpenFileFromTarArchive")); //$NON-NLS-1$
+ //suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testOpenFileFromTarArchive")); //$NON-NLS-1$
//copy the virtual folder across connections
suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testCopyVirtualFileFromDStoreToLocal")); //$NON-NLS-1$
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java
--- eclipse-rse-3.1.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java 2008-07-14 21:48:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2011 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
@@ -7,12 +7,13 @@
*
* Contributors:
* Xuan Chen (IBM) - initial API and implementation
- * - March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.tests-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.tests-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and @@ -40,14 +41,14 @@ including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties 2009-05-26 11:44:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@ # Martin Oberhuber - initial API and implementation ################################################################################ pluginName=RSE Unit Tests Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF --- eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF 2009-02-02 02:00:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000 @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.rse.tests.framework;singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.1.100.qualifier Bundle-Activator: org.eclipse.rse.internal.tests.framework.TestFrameworkPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/plugin.properties 2009-05-26 11:45:01.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others. +# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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 @@ -10,7 +10,7 @@ ################################################################################ pluginName = RSE Test Framework -providerName = Eclipse.org - DSDP +providerName = Eclipse TM Project SelectAllHoldersDelegate.label=Select All ResetHolderDelegate.label=Reset diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.rse.tests.framework/plugin.xml 2009-05-14 07:58:30.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests.framework/plugin.xml 2013-02-12 20:26:45.000000000 +0000 @@ -91,7 +91,7 @@June 5, 2007
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.tests.manual/manual_tests.html eclipse-rse-3.4.2/org.eclipse.rse.tests.manual/manual_tests.html --- eclipse-rse-3.1.2/org.eclipse.rse.tests.manual/manual_tests.html 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.tests.manual/manual_tests.html 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,47 @@ + + + +null
+ * @param decorator The label decorator or null
to use the platforms default label decorator.
+ */
+ public SystemViewDecoratingStyledCellLabelProvider(IStyledLabelProvider labelProvider, ILabelDecorator decorator) {
+ this(labelProvider, decorator, DecorationContext.DEFAULT_CONTEXT);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param labelProvider The styled label provider. Must not be null
+ * @param decorator The label decorator or null
to use the platforms default label decorator.
+ * @param decorationContext The decoration context or null
to use default.
+ */
+ public SystemViewDecoratingStyledCellLabelProvider(IStyledLabelProvider labelProvider, ILabelDecorator decorator, IDecorationContext decorationContext) {
+ super(labelProvider,
+ decorator != null ? decorator : PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(),
+ decorationContext);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
+ */
+ public String getText(Object element) {
+ // Apply the styles to the label
+ return getStyledText(element).getString();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.StyledCellLabelProvider#initialize(org.eclipse.jface.viewers.ColumnViewer, org.eclipse.jface.viewers.ViewerColumn)
+ */
+ public void initialize(ColumnViewer viewer, ViewerColumn column) {
+ // Add ourselfs to the color registry to get notified if the
+ // decoration colour is changing
+ JFaceResources.getColorRegistry().addListener(this);
+
+ // There is no preference setting yet dedicated to the RSE remote system view
+ // for showing coloroured label or not. Until available, we hook on the common
+ // navigator preference setting.
+ PlatformUI.getPreferenceStore().addPropertyChangeListener(this);
+ setOwnerDrawEnabled(PlatformUI.getPreferenceStore().getBoolean(IWorkbenchPreferenceConstants.USE_COLORED_LABELS));
+
+ super.initialize(viewer, column);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.DecoratingStyledCellLabelProvider#dispose()
+ */
+ public void dispose() {
+ // Remove ourself as listener from the colour registry
+ JFaceResources.getColorRegistry().removeListener(this);
+ // And remove ourself as listener from the platforms preference store
+ PlatformUI.getPreferenceStore().removePropertyChangeListener(this);
+
+ super.dispose();
+ }
+
+ /**
+ * Returns the column viewer associated with the styled label decorator.
+ *
+ * @return The column viewer.
+ */
+ protected final ColumnViewer getColumnViewer() { return getViewer(); }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+ */
+ public void propertyChange(final PropertyChangeEvent event) {
+ if (event == null) return;
+
+ // flag to set if or if not to refresh the viewer
+ boolean doRefresh = false;
+
+ // We update the viewer if either the decoration colour changed or
+ // the user changed the preference if using coloured labels or not
+ doRefresh |= event.getProperty().equals(IWorkbenchPreferenceConstants.USE_COLORED_LABELS);
+ doRefresh |= event.getProperty().equals(JFacePreferences.DECORATIONS_COLOR);
+
+ // If we do not require to refresh the viewer, we are done here
+ if (!doRefresh || !PlatformUI.isWorkbenchRunning() || PlatformUI.getWorkbench().getDisplay() == null) return;
+
+ // Force the refresh of the viewer itself to be asynchronous and within the display thread.
+ PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ // The associated viewer must be not null
+ if (getColumnViewer() == null) return;
+
+ // Get the current state if or if not to use coloured label
+ boolean useColouredLabels = PlatformUI.getPreferenceStore().getBoolean(IWorkbenchPreferenceConstants.USE_COLORED_LABELS);
+
+ // Update the internal flag if the preference setting has changed
+ // and refresh the viewer
+ if (isOwnerDrawEnabled() != useColouredLabels) { setOwnerDrawEnabled(useColouredLabels); getColumnViewer().refresh(); }
+
+ // If useColouredLabels is switched on and the colour changed,
+ // refresh the viewer
+ else if (useColouredLabels) getColumnViewer().refresh();
+ }
+ });
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java 2008-05-16 02:07:24.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -22,6 +22,7 @@
* Xuan Chen (IBM) - [160775] [api] rename (at least within a zip) blocks UI thread
* David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
* David Dykstal (IBM) - [226761] fix NPE in team view when expanding items
+ * David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -196,6 +197,17 @@
}
/**
+ * Overriding because it's possible for a filter to be promptable while not being a ISystemPromptableObject
+ */
+ public boolean isPromptable(Object element){
+ ISystemFilter filter = getFilter(element);
+ if (filter != null && filter.isPromptable()){
+ return true;
+ }
+ return super.isPromptable(element);
+ }
+
+ /**
* Return the children of this filter.
* This is a combination of nested filters and resolved filter objects.
*/
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java 2008-11-07 19:17:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2010 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
@@ -32,6 +32,7 @@
* David McKnight (IBM) - [244824] filter not refreshed if child is "empty list" or system message node
* David McKnight (IBM) - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc.
* David McKnight (IBM) - [254614] Promptable filter's shouldn't require supportsCommands on the subsystem to be false
+ * Noriaki Takatsu (IBM) - [288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -289,6 +290,7 @@
*/
public Object[] getChildren(IContextObject element, IProgressMonitor monitor) {
Object[] children = getChildren(element.getModelObject(), monitor);
+ if (children == null) return null;
ISubSystem subsystem = element.getSubSystem();
ISubSystemConfiguration configuration = subsystem.getSubSystemConfiguration();
Object adapter = Platform.getAdapterManager().getAdapter(configuration, ISubSystemConfigurationAdapter.class);
@@ -507,6 +509,7 @@
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception resolving filters' strings ", exc); //$NON-NLS-1$
+ return null;
} // message already issued
return checkForEmptyList(children, element, true);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java 2009-05-26 11:44:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewForm.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 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
@@ -17,6 +17,7 @@
* David McKnight (IBM) - [187711] select SystemView APIs exposed by the ISystemTree interface
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding
+ * David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
import java.util.List;
@@ -441,6 +442,9 @@
// for bug 257721, when using system view from a dialog, by default, we don't let adapter handle double-click
tree.allowAdapterToHandleDoubleClick(false);
+
+ // add custom content provider
+ tree.setContentProvider(new SystemViewFormLabelAndContentProvider());
}
protected void addOurMouseListener()
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFormLabelAndContentProvider.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,89 @@
+/********************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ *
+ * Contributors:
+ * David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog
+ ********************************************************************************/
+
+package org.eclipse.rse.internal.ui.view;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.SystemBasePlugin;
+import org.eclipse.rse.ui.view.IContextObject;
+import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
+
+public class SystemViewFormLabelAndContentProvider extends
+ SystemViewLabelAndContentProvider {
+
+ // override to deal with progress monitor
+ public Object[] getChildren(Object object)
+ {
+ Object element = object;
+ if (object instanceof IContextObject)
+ {
+ element = ((IContextObject)object).getModelObject();
+ }
+ ISystemViewElementAdapter adapter = getViewAdapter(element);
+ if (supportsDeferredQueries() && !adapter.isPromptable(element))
+ {
+ IRunnableContext irc = RSEUIPlugin.getTheSystemRegistryUI().getRunnableContext();
+ if (irc == null){
+ irc = SystemBasePlugin.getActiveWorkbenchWindow();
+ }
+ if (irc == null){ // no window - defer to the base behaviour
+ return super.getChildren(object);
+ }
+ final Object fparent = object;
+ final Object felement = element;
+ final ISystemViewElementAdapter fadapter = adapter;
+ class MyRunnable implements IRunnableWithProgress
+ {
+ private Object[] _children = null;
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
+
+ String taskName = NLS.bind(SystemViewResources.RESID_FETCHING_CHILDREN_OF, fadapter.getAbsoluteName(felement));
+ monitor.beginTask(taskName, IProgressMonitor.UNKNOWN);
+ if (fparent instanceof IContextObject){
+ _children = fadapter.getChildren((IContextObject)fparent, monitor);
+ }
+ else {
+ _children = fadapter.getChildren((IAdaptable)fparent, monitor);
+ }
+ monitor.done();
+ }
+
+ public Object[] getChildren(){
+ return _children;
+ }
+ }
+
+ MyRunnable runnable = new MyRunnable();
+ try {
+ irc.run(true, true, runnable);
+ } catch (InvocationTargetException e) {
+ SystemBasePlugin.logError(e.getMessage());
+ } catch (InterruptedException e) {
+ SystemBasePlugin.logError(e.getMessage());
+ }
+ return runnable.getChildren();
+ }
+ else {
+ return super.getChildren(object);
+ }
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java 2009-05-06 16:35:51.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2011 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
@@ -18,6 +18,7 @@
* David McKnight (IBM) - [236505] Remote systems dialog not working
* Martin Oberhuber (Wind River) - [238519][api] Support styled label decorations
* David McKnight (IBM) - [238288] use ImageRegistry to store/retrieve images for RSE label providers
+ * David McKnight (IBM) - [353685] Connection error dialog is not displayed
********************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -28,8 +29,12 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.AbstractTreeViewer;
@@ -43,14 +48,19 @@
import org.eclipse.rse.core.model.ISystemViewInputProvider;
import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.subsystems.ISubSystem;
+import org.eclipse.rse.core.subsystems.SubSystem.SystemMessageDialogRunnable;
+import org.eclipse.rse.internal.ui.SystemResources;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemBasePlugin;
+import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.rse.ui.model.ISystemShellProvider;
import org.eclipse.rse.ui.operations.SystemDeferredTreeContentManager;
import org.eclipse.rse.ui.view.IContextObject;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.progress.PendingUpdateAdapter;
@@ -331,8 +341,45 @@
{
children = adapter.getChildren((IAdaptable)object, new NullProgressMonitor());
}
-
-
+ if (children == null){
+ // make sure connected - the message may have been suppressed
+ ISubSystem ss = null;
+ if (object instanceof IContextObject){
+ ss = ((IContextObject)object).getSubSystem();
+ }
+ else{
+ ss = adapter.getSubSystem(object);
+ }
+ if (ss != null){
+ if (!ss.isConnected()){
+ final ISubSystem fss = ss;
+ // run a connect job so we can get at the error message
+ new Job(SystemResources.ACTION_CONNECT_LABEL) {
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ fss.connect(monitor, false);
+ }
+ catch (SystemMessageException ex){
+ final SystemMessageException fex = ex;
+ Display.getDefault().asyncExec(new Runnable() {
+
+ public void run() {
+ SystemMessageDialog dlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), fex.getSystemMessage());
+ dlg.open();
+ }
+ });
+ }
+ catch (Exception e) {
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
+ }
+ }.schedule();
+ }
+ }
+ }
+
+
if ((filesOnly || foldersOnly) &&
// an array of one SystemMessageObject item implies some kind of error, so don't cache...
((children.length != 1) || !(children[0] instanceof SystemMessageObject)) )
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java 2008-04-03 17:53:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewMenuListener.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -13,9 +13,14 @@
*
* Contributors:
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
+ * Uwe Stieber (Wind River) - [319618] [context-menu] Tool tip not shown in status bar for command contributions items
+ * Martin Oberhuber (Wind River) - [323141] [context-menu] Cleanup introspection code for command contribution items
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
@@ -25,9 +30,11 @@
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.swt.events.ArmEvent;
import org.eclipse.swt.events.MenuEvent;
+import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.menus.CommandContributionItem;
/**
@@ -159,6 +166,21 @@
String tip = null; //data.getClass().getName();
if (data instanceof ActionContributionItem)
tip = ((ActionContributionItem)data).getAction().getToolTipText();
+ else if (data instanceof CommandContributionItem) {
+ try {
+ tip = ((CommandContributionItem) data).getData().tooltip;
+ } catch (Throwable apiNotYetAvailable) {
+ //API was introduced with Eclipse 3.7m3 -- use introspection on older Eclipse
+ try {
+ Field f = data.getClass().getDeclaredField("widget"); //$NON-NLS-1$
+ f.setAccessible(true);
+ Widget widget = (Widget)f.get(data);
+ Method m = data.getClass().getDeclaredMethod("getToolTipText", new Class[] { String.class }); //$NON-NLS-1$
+ m.setAccessible(true);
+ tip = (String)m.invoke(data, new Object[] { widget instanceof Item ? ((Item)widget).getText() : (String)null });
+ } catch (Exception e) { /* ignored on purpose */ }
+ }
+ }
else if (data instanceof SystemSubMenuManager)
tip = ((SystemSubMenuManager)data).getToolTipText();
if (tip != null)
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java 2009-08-24 14:58:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -40,6 +40,11 @@
* David McKnight (IBM) - [250417] Restore from memento flag set to false during restore on startup
* Martin Oberhuber (Wind River) - [286122] Avoid NPE when restoring memento
* David McKnight (IBM) - [286670] TVT35:TCT586: CHS: English Strings Found
+ * Martin Oberhuber (Wind River) - [326910] RSE looses selection when creating a project
+ * David McKnight (IBM) - [330386] RSE SystemView has Focus Problems with Eclipse SDK 4.1M3
+ * David McKnight (IBM) - [238365] Collapsing tree in new window collapses tree in Original window
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
+ * David McKnight (IBM) - [251654] System View Restore doesn't take into account Expand To Filter
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -114,10 +119,10 @@
import org.eclipse.rse.ui.actions.SystemRefreshAllAction;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.view.ContextObject;
+import org.eclipse.rse.ui.view.IContextObject;
import org.eclipse.rse.ui.view.IRSEViewPart;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.IViewLinker;
-import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.ScrollBar;
@@ -231,7 +236,21 @@
*/
public void selectReveal(ISelection selection)
{
- systemView.setSelection(selection, true);
+ ISelection origSel = systemView.getSelection();
+ if (origSel.isEmpty()) {
+ systemView.setSelection(selection, true);
+ } else {
+ // bug check whether the new selection can be set,
+ // before actually setting it. Restore old selection
+ // if the new one does not work.
+ systemView.setSelection(selection, false);
+ ISelection newSel = systemView.getSelection();
+ if (newSel.isEmpty()) {
+ systemView.setSelection(origSel, false);
+ } else {
+ systemView.setSelection(newSel, true);
+ }
+ }
}
/**
@@ -369,12 +388,10 @@
}
// register global edit actions
- Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
-
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
- _copyAction = new SystemCopyToClipboardAction(systemView.getShell(), clipboard);
- _pasteAction = new SystemPasteFromClipboardAction(systemView.getShell(), clipboard);
+ _copyAction = new SystemCopyToClipboardAction(systemView.getShell(), null);
+ _pasteAction = new SystemPasteFromClipboardAction(systemView.getShell(), null);
editorActionHandler.setCopyAction(_copyAction);
editorActionHandler.setPasteAction(_pasteAction);
@@ -524,8 +541,6 @@
public void setFocus()
{
//System.out.println("INSIDE SETFOCUS FOR SYSTEMVIEWPART. SYSTEMVIEW NULL? " + (systemView==null));
- IWorkbench wb = PlatformUI.getWorkbench();
- wb.getActiveWorkbenchWindow().getShell().setFocus();
systemView.getControl().setFocus();
/* the following was an attempt to fix problem with scrollbar needing two clicks to activate. didn't help.
if (!SystemPreferencesGlobal.getGlobalSystemPreferences().getRememberState())
@@ -601,6 +616,7 @@
toolBarMgr.add(new Separator(ISystemContextMenuConstants.GROUP_EXPAND));
SystemCollapseAllAction collapseAllAction = new SystemCollapseAllAction(getShell());
collapseAllAction.setSelectionProvider(systemView);
+ collapseAllAction.setViewer(systemView); // fix for bug 238365 - action needs to know the viewer
toolBarMgr.add(collapseAllAction);
IMenuManager menuMgr = actionBars.getMenuManager();
@@ -1508,6 +1524,51 @@
protected class RestoreRemoteObjects extends Job
{
+ class GetExpandToFilter implements Runnable
+ {
+ private IWorkbenchPart _part;
+ private String _expandToFilter = null;
+ private Object _remoteObject = null;
+
+ public GetExpandToFilter(Object remoteObject){
+ _remoteObject = remoteObject;
+ }
+
+ public void run()
+ {
+ IWorkbenchPart activePart = _part;
+ if (activePart==null) {
+ IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
+ if (win != null){
+ IWorkbenchPage page = win.getActivePage();
+ if (page != null){
+ activePart = page.getActivePart();
+ if (activePart != null){
+ _part = activePart;
+ }
+ }
+ }
+ }
+
+ if (activePart instanceof SystemViewPart){
+ SystemView viewer = ((SystemViewPart)activePart).getSystemView();
+ if (_remoteObject instanceof IContextObject){
+ _expandToFilter = viewer.getExpandToFilter(((IContextObject)_remoteObject).getModelObject());
+ }
+ else {
+ _expandToFilter = viewer.getExpandToFilter(_remoteObject);
+ }
+ }
+ }
+
+ public String getExpandToFilter()
+ {
+ return _expandToFilter;
+ }
+ }
+
+
+
private Vector _remoteObjectsToRestore;
private Vector _remoteObjectsToSelect;
@@ -1587,11 +1648,22 @@
// get the context
ContextObject contextObject = new ContextObject(actualObject, ss, fref);
- // get the children
- Object[] children = adapter.getChildren(contextObject, monitor);
-
- ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(actualObject, children);
- Display.getDefault().asyncExec(showRunnable);
+ Object[] children = null;
+
+ Display dis = Display.getDefault();
+ GetExpandToFilter getExpandTo = new GetExpandToFilter(contextObject);
+ dis.syncExec(getExpandTo);
+ String expandToFilter = getExpandTo.getExpandToFilter();
+ if (expandToFilter != null){
+ children = adapter.getChildrenUsingExpandToFilter(actualObject, expandToFilter);
+ }
+ else {
+ // get the children
+ children = adapter.getChildren(contextObject, monitor);
+ }
+
+ ShowRestoredRemoteObject showRunnable = new ShowRestoredRemoteObject(actualObject, children);
+ Display.getDefault().asyncExec(showRunnable);
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java 2008-03-28 19:44:12.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -16,6 +16,7 @@
* David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
* David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
* Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View
+ * David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -135,6 +136,7 @@
public static String RESID_REMOTE_SCRATCHPAD;
public static String RESID_FETCHING;
+ public static String RESID_FETCHING_CHILDREN_OF;
static {
// load message values from bundle file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties 2008-03-28 19:44:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewResources.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2011 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
@@ -16,6 +16,7 @@
# David McKnight (IBM) - [216252] [nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
# David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
# Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View
+# David McKnight (IBM) - [334295] SystemViewForm dialogs don't display cancellable progress in the dialog
###############################################################################
# NLS_MESSAGEFORMAT_VAR
@@ -115,3 +116,4 @@
RESID_REMOTE_SCRATCHPAD=Remote Scratchpad
RESID_FETCHING = Fetching Remote Resources
+RESID_FETCHING_CHILDREN_OF = Fetching children of {0}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java 2008-04-07 12:49:03.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewScratchpadAdapter.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Xuan Chen (IBM) - [223126] [api][breaking] Remove API related to User Actions in RSE Core/UI
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
*******************************************************************************/
package org.eclipse.rse.internal.ui.view;
@@ -63,7 +64,7 @@
{
if (_pasteToScratchpadAction == null)
{
- _pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard());
+ _pasteToScratchpadAction = new SystemPasteFromClipboardAction(shell, null);
}
menu.add(menuGroup, _pasteToScratchpadAction);
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java 2008-04-03 16:03:34.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2012 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
@@ -18,6 +18,8 @@
* Kevin Doyle (IBM) - [177587] changed wrapped selection provider in setFocus()
* Kevin Doyle (IBM) - [212940] Duplicate Help Context Identifiers
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
+ * David McKnight (IBM) - [372674] Enhancement - Preserve state of Remote Monitor view
********************************************************************************/
package org.eclipse.rse.internal.ui.view.monitor;
@@ -108,12 +110,10 @@
try
{
Thread.sleep(interval);
- doQuery();
- // while (_querying)
- // {
- // Thread.sleep(100);
- // }
- doRedraw();
+ if (isPollingEnabled()){
+ doQuery();
+ doRedraw();
+ }
}
catch (InterruptedException e)
{
@@ -257,11 +257,10 @@
createControl(_tabFolderPage);
// global actions
- Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
- _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard);
+ _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), null);
_copyAction.setEnabled(false);
- _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), clipboard);
+ _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), null);
_pasteAction.setEnabled(false);
editorActionHandler.setCopyAction(_copyAction);
@@ -299,6 +298,14 @@
//setActionHandlers();
}
+ public void setPollingInterval(int interval){
+ _pollingInterval = interval;
+ if (_scale != null){
+ _scaleValue.setText(_pollingInterval + "s"); //$NON-NLS-1$
+ _scale.setSelection(_pollingInterval);
+ }
+ }
+
public int getPollingInterval()
{
return _pollingInterval;
@@ -316,6 +323,16 @@
public void setPollingEnabled(boolean flag)
{
_isPolling = flag;
+ if (_pollCheckbox != null){
+ _pollCheckbox.setSelection(_isPolling);
+ _scale.setEnabled(_isPolling);
+ _scaleValue.setEnabled(_isPolling);
+
+ if (_pollingThread == null){
+ _pollingThread = new PollingThread();
+ _pollingThread.start();
+ }
+ }
}
public void setEnabled(boolean flag)
@@ -490,10 +507,11 @@
public void updateTitle(IAdaptable object)
{
- ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)object.getAdapter(ISystemViewElementAdapter.class);
-
+ ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)object.getAdapter(ISystemViewElementAdapter.class);
+ if (adapter != null){
String title = adapter.getText(object);
_tabFolderPage.setText(title);
+ }
}
public String getTitle()
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java 2009-07-03 15:13:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/MonitorViewWorkbook.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -28,6 +28,8 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -48,7 +50,7 @@
{
super(parent, SWT.NONE);
- _folder = new CTabFolder(this, SWT.NONE);
+ _folder = new CTabFolder(this, SWT.NULL);
_folder.setLayout(new TabFolderLayout());
_folder.setLayoutData(new GridData(GridData.FILL_BOTH));
setLayout(new FillLayout());
@@ -157,8 +159,10 @@
if (_folder.getItemCount() > 0)
{
int index = _folder.getSelectionIndex();
- CTabItem item = _folder.getItem(index);
- return (MonitorViewPage) item.getData();
+ if (index >= 0){
+ CTabItem item = _folder.getItem(index);
+ return (MonitorViewPage) item.getData();
+ }
}
return null;
}
@@ -223,7 +227,7 @@
{
MonitorViewPage monitorViewPage = new MonitorViewPage(_viewPart);
- CTabItem titem = new CTabItem(_folder, SWT.NULL);
+ CTabItem titem = new CTabItem(_folder, SWT.CLOSE);
setTabTitle(root, titem);
titem.setData(monitorViewPage);
@@ -240,6 +244,23 @@
_viewPart.getSite().registerContextMenu(ISystemContextMenuConstants.RSE_CONTEXT_MENU, viewer.getContextMenuManager(), viewer);
}
monitorViewPage.setFocus();
+
+ titem.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ Object source = e.getSource();
+ if (source instanceof CTabItem) {
+ CTabItem currentItem = (CTabItem) source;
+ Object data = currentItem.getData();
+ if (data instanceof MonitorViewPage) {
+ MonitorViewPage page = (MonitorViewPage)data;
+ page.setPollingEnabled(false); // stop polling
+ page.dispose();
+ }
+ updateActionStates();
+ }
+ }
+
+ });
}
private void setTabTitle(IAdaptable root, CTabItem titem)
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java 2009-07-03 15:13:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/monitor/SystemMonitorViewPart.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2012 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
@@ -21,14 +21,25 @@
* David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* Zhou Renjian (Kortide) - [282239] Monitor view does not update icon according to connection status
+ * David McKnight (IBM) - [294663] bad cast in monitor view part refresh action
+ * David McKnight (IBM) - [340912] inconsistencies with columns in RSE table viewers
+ * David McKnight (IBM) - [372674] Enhancement - Preserve state of Remote Monitor view
********************************************************************************/
package org.eclipse.rse.internal.ui.view.monitor;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import java.util.Vector;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
@@ -46,14 +57,19 @@
import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
import org.eclipse.rse.core.events.ISystemResourceChangeListener;
+import org.eclipse.rse.core.filters.ISystemFilterReference;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.IRSECallback;
import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
+import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.internal.ui.SystemPropertyResources;
import org.eclipse.rse.internal.ui.SystemResources;
-import org.eclipse.rse.internal.ui.view.SystemTableTreeViewProvider;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.SystemPreferencesManager;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
@@ -62,7 +78,10 @@
import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.SystemTableView;
+import org.eclipse.rse.ui.view.SystemTableViewProvider;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
@@ -75,12 +94,16 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IMemento;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.CellEditorActionHandler;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
@@ -101,14 +124,290 @@
IRSEViewPart,
ISelectionProvider
{
+ class RestoreStateRunnable extends Job
+ {
+ private IMemento _rmemento;
+ public RestoreStateRunnable(IMemento memento)
+ {
+ super(SystemResources.RESID_RESTORE_RSE_MONITOR_JOB);
+ _rmemento = memento;
+ }
+ public IStatus run(IProgressMonitor monitor)
+ {
+ try {
+ IStatus wstatus = RSECorePlugin.waitForInitCompletion();
+ if (!wstatus.isOK() && wstatus.getSeverity() == IStatus.ERROR){
+ return wstatus;
+ }
+ }
+ catch (InterruptedException e){
+ return Status.CANCEL_STATUS;
+ }
+
+ Integer tabCountInt = _memento.getInteger(TAG_MONITOR_TAB_COUNT_ID);
+ if (tabCountInt != null){
+ int tabCount = tabCountInt.intValue();
+ for (int i = 0; i < tabCount && !monitor.isCanceled(); i++){
+ restoreTab(i, monitor);
+ }
+ }
+ return Status.OK_STATUS;
+ }
+
+ protected void restoreTab(int index, IProgressMonitor monitor){
+ final IMemento memento = _rmemento;
+
+ // matches new format for column width memento
+ // new code - as of RSE 3.1
+ final HashMap cachedColumnWidths = new HashMap();
+
+ // set the cached column widths (for later use)
+ String columnWidths = memento.getString(TAG_MONITOR_TAB_COLUMN_WIDTHS_ID+index);
+ if (columnWidths != null){
+ if (columnWidths.indexOf(";") > 0){ //$NON-NLS-1$
+
+
+ // parse out set of columns
+ String[] columnSets = columnWidths.split(";"); //$NON-NLS-1$
+ for (int i = 0; i < columnSets.length; i++){
+ String columnSet = columnSets[i];
+
+ // parse out columns for set
+ String[] pair = columnSet.split("="); //$NON-NLS-1$
+ String key = pair[0];
+
+ // parse out widths
+ String widthArray = pair[1];
+ String[] widthStrs = widthArray.split(","); //$NON-NLS-1$
+
+ int[] widths = new int[widthStrs.length];
+ for (int w = 0; w < widths.length; w++){
+ widths[w] = Integer.parseInt(widthStrs[w]);
+ }
+ cachedColumnWidths.put(key, widths);
+ }
+ }
+ }
+
+ Boolean pollingOnBool = memento.getBoolean(TAG_MONITOR_TAB_POLLING_ON_ID+index);
+ Integer pollingIntervalInteger = memento.getInteger(TAG_MONITOR_TAB_POLLING_INTERVAL_ID+index);
+ boolean pollingOn = false;
+ int pollingInterval = 100;
+ if (pollingOnBool != null){
+ pollingOn = pollingOnBool.booleanValue();
+ }
+ if (pollingIntervalInteger != null){
+ pollingInterval = pollingIntervalInteger.intValue();
+ }
+
+
+ String profileId = memento.getString(TAG_MONITOR_TAB_PROFILE_ID+index);
+ String connectionId = memento.getString(TAG_MONITOR_TAB_CONNECTION_ID+index);
+ String subsystemId = memento.getString(TAG_MONITOR_TAB_SUBSYSTEM_ID+index);
+ final String filterID = memento.getString(TAG_MONITOR_TAB_FILTER_ID+index);
+ final String objectID = memento.getString(TAG_MONITOR_TAB_OBJECT_ID+index);
+
+ ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
+
+ Object input = null;
+ if (subsystemId == null){
+ if (connectionId != null){
+ ISystemProfile profile = registry.getSystemProfile(profileId);
+ input = registry.getHost(profile, connectionId);
+ }
+ else{
+ // 191288 we now use registry instead of registry ui as input
+ input = registry;
+ }
+ }
+ else {
+ // from the subsystem ID determine the profile, system and subsystem
+ final ISubSystem subsystem = registry.getSubSystem(subsystemId);
+
+ if (subsystem != null) {
+ if (filterID == null && objectID == null) {
+ input = subsystem;
+ }
+ else {
+ if (!subsystem.isConnected()) {
+ try {
+ final Object finInput = input;
+ final boolean fpollingOn = pollingOn;
+ final int fpollingInterval = pollingInterval;
+ subsystem.connect(false, new IRSECallback() {
+ public void done(IStatus status, Object result) {
+ // this needs to be done on the main thread
+ // so doing an asynchExec()
+ runOnceConnected(new NullProgressMonitor(), finInput, subsystem, filterID, objectID, cachedColumnWidths, fpollingOn, fpollingInterval);
+ }
+ });
+ }
+ catch (Exception e) {
+ }
+ }
+ else {
+ runOnceConnected(monitor, input, subsystem, filterID, objectID, cachedColumnWidths, pollingOn, pollingInterval);
+ }
+ return;
+ } // end else
+ } // end if (subsystem != null)
+ } // end else
+ if (input != null){
+ runWithInput(monitor, input, cachedColumnWidths, pollingOn, pollingInterval);
+ }
+ }
+
+
+ public IStatus runOnceConnected(IProgressMonitor monitor, Object input, ISubSystem subsystem, String filterID, String objectID,
+ HashMap cachedColumnWidths, boolean pollingOn, int pollingInterval)
+ {
+ if (monitor.isCanceled()){
+ return Status.CANCEL_STATUS;
+ }
+ if (subsystem.isConnected()) {
+ if (filterID != null) {
+ try {
+ input = subsystem.getObjectWithAbsoluteName(filterID, monitor);
+ }
+ catch (Exception e) {
+ //ignore
+ }
+ }
+ else {
+ if (objectID != null) {
+ try {
+ input = subsystem.getObjectWithAbsoluteName(objectID, monitor);
+ }
+ catch (Exception e) {
+ return Status.CANCEL_STATUS;
+ }
+ }
+ } // end else
+ } // end if (subsystem.isConnected)
+
+ if (input != null){
+ runWithInput(monitor, input, cachedColumnWidths, pollingOn, pollingInterval);
+ return Status.OK_STATUS;
+ }
+ else {
+ return Status.CANCEL_STATUS;
+ }
+ }
+
+ private class WaitForAdapterJob extends Job {
+ private IAdaptable _input;
+ private HashMap _cachedColumnWidths;
+ private boolean _pollingOn;
+ private int _pollingInterval;
+ public WaitForAdapterJob(IAdaptable input, HashMap cachedColumnWidths, boolean pollingOn, int pollingInterval){
+ super(SystemResources.RESID_RESTORE_RSE_MONITOR_JOB);
+ _input = input;
+ _cachedColumnWidths = cachedColumnWidths;
+ _pollingOn = pollingOn;
+ _pollingInterval = pollingInterval;
+ }
+
+ protected IStatus run(IProgressMonitor monitor) {
+ ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)_input.getAdapter(ISystemViewElementAdapter.class);
+ while (adapter == null || monitor.isCanceled()){
+ try {
+ synchronized (_input){
+ _input.wait(1000);
+ }
+ } catch (InterruptedException e) {
+ }
+ adapter = (ISystemViewElementAdapter)_input.getAdapter(ISystemViewElementAdapter.class);
+ }
+ if (monitor.isCanceled()){
+ return Status.CANCEL_STATUS;
+ }
+
+ // got an adapter now
+ // set input needs to be run on the main thread
+ Display.getDefault().asyncExec(new Runnable()
+ {
+ public void run(){
+ addItemToMonitor(_input);
+ MonitorViewPage page = _folder.getCurrentTabItem(); // get the viewer
+
+ // restore column widths
+ page.getViewer().setCachedColumnWidths(_cachedColumnWidths);
+
+ // restoring polling
+ page.setPollingEnabled(_pollingOn);
+ page.setPollingInterval(_pollingInterval);
+ }
+ });
+
+ return Status.OK_STATUS;
+ }
+ }
+
+ public IStatus runWithInput(IProgressMonitor monitor, Object input, HashMap cachedColumnWidths, boolean pollingOn, int pollingInterval)
+ {
+ if (input != null && input instanceof IAdaptable){
+ final IAdaptable mementoInput = (IAdaptable) input;
+ final HashMap fcachedColumnWidths = cachedColumnWidths;
+ final boolean fpollingOn = pollingOn;
+ final int fpollingInterval = pollingInterval;
+ if (mementoInput != null)
+ {
+ // first make sure the adapter factories are ready
+ ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)mementoInput.getAdapter(ISystemViewElementAdapter.class);
+ if (adapter == null){
+ WaitForAdapterJob job = new WaitForAdapterJob(mementoInput, cachedColumnWidths, pollingOn, pollingInterval);
+ job.schedule();
+ }
+ else {
+ // set input needs to be run on the main thread
+ Display.getDefault().asyncExec(new Runnable(){
+ public void run(){
+ addItemToMonitor(mementoInput);
+ MonitorViewPage page = _folder.getCurrentTabItem(); // get the viewer
+
+ // restore column widths
+ page.getViewer().setCachedColumnWidths(fcachedColumnWidths);
+
+ // restoring polling
+ page.setPollingEnabled(fpollingOn);
+ page.setPollingInterval(fpollingInterval);
+ }
+ });
+ }
+ }
+ }
+ return Status.OK_STATUS;
+ }
- class RestoreStateRunnable implements Runnable
- {
- public void run()
- {
- }
}
+
+
+
+
+ // Restore memento tags
+ public static final String TAG_MONITOR_TAB_COUNT_ID = "monitorTabCountID"; //$NON-NLS-1$
+
+ public static final String TAG_MONITOR_TAB_PROFILE_ID = "monitorTabProfileID_"; //$NON-NLS-1$
+ public static final String TAG_MONITOR_TAB_CONNECTION_ID = "monitorTabConnectionID_"; //$NON-NLS-1$
+ public static final String TAG_MONITOR_TAB_SUBSYSTEM_ID = "monitorTabSubsystemID_"; //$NON-NLS-1$
+ public static final String TAG_MONITOR_TAB_OBJECT_ID = "monitorTabObjectID_"; //$NON-NLS-1$
+ public static final String TAG_MONITOR_TAB_FILTER_ID = "monitorTabFilterID_"; //$NON-NLS-1$
+
+ // Subset memento tags
+ public static final String TAG_MONITOR_TAB_SUBSET_ID = "monitorTabSubsetID_"; //$NON-NLS-1$
+
+ // polling
+ public static final String TAG_MONITOR_TAB_POLLING_ON_ID = "monitorTabPollingOnID_"; //$NON-NLS-1$
+ public static final String TAG_MONITOR_TAB_POLLING_INTERVAL_ID= "monitorTabPollingIntervalID_"; // $NON-NLS-1$
+
+ // layout memento tags
+ public static final String TAG_MONITOR_TAB_COLUMN_WIDTHS_ID = "monitorTabColumnWidths_"; //$NON-NLS-1$
+
+
+
+
+
class PositionToAction extends BrowseAction
{
class PositionToDialog extends SystemPromptDialog
@@ -299,7 +598,7 @@
{
((ISystemContainer)inputObject).markStale(true);
}
- ((SystemTableTreeViewProvider) getViewer().getContentProvider()).flushCache();
+ ((SystemTableViewProvider) getViewer().getContentProvider()).flushCache();
getViewer().refresh();
// refresh layout too
@@ -326,20 +625,27 @@
private Button _upButton;
private Button _downButton;
-
- public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
+ private boolean _changed = false;
+
+ public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager, int[] originalOrder)
{
super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
+ setInitialOKButtonEnabledState(_changed);
_adapter = viewAdapter;
_columnManager = columnManager;
_uniqueDescriptors = viewAdapter.getUniquePropertyDescriptors();
IPropertyDescriptor[] initialDisplayedDescriptors = _columnManager.getVisibleDescriptors(_adapter);
+
+ IPropertyDescriptor[] sortedDisplayedDescriptors = new IPropertyDescriptor[initialDisplayedDescriptors.length];
+ for (int i = 0; i < initialDisplayedDescriptors.length; i++){
+ int position = originalOrder[i+1];
+ sortedDisplayedDescriptors[i] = initialDisplayedDescriptors[position-1];
+ }
_currentDisplayedDescriptors = new ArrayList(initialDisplayedDescriptors.length);
- for (int i = 0; i < initialDisplayedDescriptors.length;i++)
- {
- if (!_currentDisplayedDescriptors.contains(initialDisplayedDescriptors[i]))
- _currentDisplayedDescriptors.add(initialDisplayedDescriptors[i]);
+ for (int i = 0; i < sortedDisplayedDescriptors.length;i++)
+ {
+ _currentDisplayedDescriptors.add(sortedDisplayedDescriptors[i]);
}
_availableDescriptors = new ArrayList(_uniqueDescriptors.length);
for (int i = 0; i < _uniqueDescriptors.length;i++)
@@ -352,30 +658,36 @@
}
+
+
public void handleEvent(Event e)
{
Widget source = e.widget;
if (source == _addButton)
{
int[] toAdd = _availableList.getSelectionIndices();
- addToDisplay(toAdd);
+ addToDisplay(toAdd);
+ _changed = true;
}
else if (source == _removeButton)
{
int[] toAdd = _displayedList.getSelectionIndices();
removeFromDisplay(toAdd);
+ _changed = true;
}
else if (source == _upButton)
{
int index = _displayedList.getSelectionIndex();
moveUp(index);
_displayedList.select(index - 1);
+ _changed = true;
}
else if (source == _downButton)
{
int index = _displayedList.getSelectionIndex();
moveDown(index);
_displayedList.select(index + 1);
+ _changed = true;
}
// update button enable states
@@ -429,6 +741,7 @@
_removeButton.setEnabled(enableRemove);
_upButton.setEnabled(enableUp);
_downButton.setEnabled(enableDown);
+ enableOkButton(_changed);
}
@@ -602,13 +915,25 @@
public void run()
{
SystemTableView viewer = getViewer();
+ Table table = viewer.getTable();
+ int[] originalOrder = table.getColumnOrder();
ISystemTableViewColumnManager mgr = viewer.getColumnManager();
ISystemViewElementAdapter adapter = viewer.getAdapterForContents();
- SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
+ SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr, originalOrder);
if (dlg.open() == Window.OK)
{
+ IPropertyDescriptor[] newDescriptors = dlg.getDisplayedColumns();
+
+ // reset column order
+ int n = newDescriptors.length + 1;
+ int[] newOrder = new int[n];
+ for (int i = 0; i < n; i++){
+ newOrder[i] = i;
+ }
+
mgr.setCustomDescriptors(adapter, dlg.getDisplayedColumns());
viewer.computeLayout(true);
+ table.setColumnOrder(newOrder);
viewer.refresh();
}
}
@@ -640,8 +965,15 @@
public static final String ID = "org.eclipse.rse.ui.view.monitorView"; //$NON-NLS-1$
// matches id in plugin.xml, view tag
+ private IMemento _memento = null;
+
public void setFocus()
{
+ if (_folder.getInput() == null){
+ if (_memento != null){
+ restoreState(_memento);
+ }
+ }
_folder.showCurrentPage();
}
@@ -684,10 +1016,6 @@
registry.addSystemResourceChangeListener(this);
registry.addSystemRemoteChangeListener(this);
-
- RestoreStateRunnable restore = new RestoreStateRunnable();
- Display.getCurrent().asyncExec(restore);
-
getSite().setSelectionProvider(this);
selectionListener = new ISelectionChangedListener() {
public void selectionChanged (SelectionChangedEvent event)
@@ -1137,5 +1465,138 @@
menuManager.add(_subsetAction);
}
+ private void restoreState(IMemento memento)
+ {
+ RestoreStateRunnable rsr = new RestoreStateRunnable(memento);
+ rsr.setRule(RSECorePlugin.getTheSystemRegistry());
+ rsr.schedule();
+ }
+
+ /**
+ * Initializes this view with the given view site. A memento is passed to
+ * the view which contains a snapshot of the views state from a previous
+ * session. Where possible, the view should try to recreate that state
+ * within the part controls.
+ *
+ * The parent's default implementation will ignore the memento and initialize
+ * the view in a fresh state. Subclasses may override the implementation to
+ * perform any state restoration as needed.
+ */
+ public void init(IViewSite site, IMemento memento) throws PartInitException
+ {
+ super.init(site, memento);
+
+ if (memento != null && SystemPreferencesManager.getRememberState()){
+ _memento = memento;
+ }
+ }
+
+ protected void saveTabState(IMemento memento, CTabItem item, int index){
+ MonitorViewPage page = (MonitorViewPage) item.getData();
+ Object input = page.getInput();
+
+ if (input != null){
+ if (input instanceof ISystemRegistry){
+ }
+ else if (input instanceof IHost){
+ IHost connection = (IHost) input;
+ String connectionID = connection.getAliasName();
+ String profileID = connection.getSystemProfileName();
+ memento.putString(TAG_MONITOR_TAB_CONNECTION_ID+index, connectionID);
+ memento.putString(TAG_MONITOR_TAB_PROFILE_ID+index, profileID);
+ }
+ else{
+ ISystemViewElementAdapter va = (ISystemViewElementAdapter) ((IAdaptable) input).getAdapter(ISystemViewElementAdapter.class);
+
+ ISubSystem subsystem = va.getSubSystem(input);
+ if (subsystem != null){
+ ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
+ String subsystemID = registry.getAbsoluteNameForSubSystem(subsystem);
+ String profileID = subsystem.getHost().getSystemProfileName();
+ String connectionID = subsystem.getHost().getAliasName();
+ String objectID = va.getAbsoluteName(input);
+
+ memento.putString(TAG_MONITOR_TAB_PROFILE_ID+index, profileID);
+ memento.putString(TAG_MONITOR_TAB_CONNECTION_ID+index, connectionID);
+ memento.putString(TAG_MONITOR_TAB_SUBSYSTEM_ID+index, subsystemID);
+
+ if (input instanceof ISystemFilterReference){
+ memento.putString(TAG_MONITOR_TAB_FILTER_ID+index, objectID);
+ memento.putString(TAG_MONITOR_TAB_OBJECT_ID+index, null);
+ }
+ else if (input instanceof ISubSystem){
+ memento.putString(TAG_MONITOR_TAB_OBJECT_ID+index, null);
+ memento.putString(TAG_MONITOR_TAB_FILTER_ID+index, null);
+ }
+ else {
+ memento.putString(TAG_MONITOR_TAB_OBJECT_ID+index, objectID);
+ memento.putString(TAG_MONITOR_TAB_FILTER_ID+index, null);
+ }
+ }
+ }
+
+
+ boolean isConnected = false;
+ // don't reconnect
+ ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)input).getAdapter(ISystemViewElementAdapter.class);
+ if (adapter != null){
+ ISubSystem ss = adapter.getSubSystem(input);
+ if (ss != null){
+ isConnected = ss.isConnected();
+ }
+ }
+
+ SystemTableView viewer = page.getViewer();
+ if (isConnected){ // calling this requires a connect so only do it if already connected
+ viewer.inputChanged(input, input);
+ }
+ Map cachedColumnWidths = viewer.getCachedColumnWidths();
+ StringBuffer columnWidths = new StringBuffer();
+ Iterator keyIter = cachedColumnWidths.keySet().iterator();
+ while (keyIter.hasNext()){
+ String key = (String)keyIter.next();
+ int[] widths = (int[])cachedColumnWidths.get(key);
+ columnWidths.append(key);
+ columnWidths.append('=');
+
+ for (int w = 0; w < widths.length; w++){
+ columnWidths.append(widths[w]);
+ if (w != widths.length - 1){
+ columnWidths.append(',');
+ }
+ }
+
+ // always append this, even with last item
+ columnWidths.append(';');
+ }
+
+ memento.putString(TAG_MONITOR_TAB_COLUMN_WIDTHS_ID+index, columnWidths.toString());
+ memento.putBoolean(TAG_MONITOR_TAB_POLLING_ON_ID+index, page.isPollingEnabled());
+ memento.putInteger(TAG_MONITOR_TAB_POLLING_INTERVAL_ID+index, page.getPollingInterval());
+ }
+ }
+
+ /**
+ * Method declared on IViewPart.
+ */
+ public void saveState(IMemento memento)
+ {
+ super.saveState(memento);
+
+ if (!SystemPreferencesManager.getRememberState())
+ return;
+
+ if (_folder != null){
+ CTabFolder flder = _folder.getFolder();
+ int itemCount = flder.getItemCount();
+ memento.putInteger(TAG_MONITOR_TAB_COUNT_ID, itemCount);
+
+ for (int i = 0; i < itemCount; i++){
+ CTabItem item = flder.getItem(i);
+ saveTabState(memento, item, i);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java 2008-12-04 18:30:37.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/scratchpad/SystemScratchpadViewPart.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -19,6 +19,7 @@
* Kevin Doyle (IBM) - [193155] Double Clicking on a String in Scratchpad Errors
* Kevin Doyle (IBM) - [194867] Remote Scratchpad should have Refresh Action on toolbar
* Kevin Doyle (IBM) - [242431] Register a new unique context menu id, so contributions can be made to all our views
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
*******************************************************************************/
package org.eclipse.rse.internal.ui.view.scratchpad;
@@ -137,12 +138,11 @@
// register global edit actions
ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
- Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
- _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), clipboard);
- _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), clipboard);
+ _copyAction = new SystemCopyToClipboardAction(_viewer.getShell(), null);
+ _pasteAction = new SystemPasteFromClipboardAction(_viewer.getShell(), null);
_deleteAction = new SystemCommonDeleteAction(_viewer.getShell(), _viewer);
_renameAction = new SystemCommonRenameAction(_viewer.getShell(), _viewer);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java 2009-08-04 15:20:17.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/search/SystemSearchViewPart.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 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
@@ -18,6 +18,8 @@
* David McKnight (IBM) - [250169] Problems with extending the menu's of results in Remote Search View
* David McKnight (IBM) - [214395] Properties View not updated when clicking on Search Results
* David McKnight (IBM) - [190015] [performance] Remove All Match's from Search Results Takes a while
+ * David McKnight (IBM) - [296877] Allow user to choose the attributes for remote search result
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
*******************************************************************************/
package org.eclipse.rse.internal.ui.view.search;
@@ -34,6 +36,7 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -46,6 +49,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
@@ -62,20 +66,27 @@
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
+import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.model.ISystemShellProvider;
import org.eclipse.rse.ui.view.IRSEViewPart;
import org.eclipse.rse.ui.view.ISystemRemoveElementAdapter;
+import org.eclipse.rse.ui.view.ISystemTableViewColumnManager;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.SystemAdapterHelpers;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.swt.widgets.Widget;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewSite;
@@ -83,6 +94,7 @@
import org.eclipse.ui.part.CellEditorActionHandler;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.views.properties.IPropertyDescriptor;
/**
* This class defines the Remote Search view.
@@ -92,6 +104,349 @@
IMenuListener, ISelectionChangedListener,
ISystemMessageLine, IRSEViewPart
{
+ class BrowseAction extends Action
+ {
+
+ public BrowseAction()
+ {
+ }
+
+ public BrowseAction(String label, ImageDescriptor des)
+ {
+ super(label, des);
+
+ setToolTipText(label);
+ }
+
+ public void checkEnabledState()
+ {
+ Viewer viewer = getRSEViewer();
+ if (viewer != null && viewer.getInput() != null)
+ {
+ setEnabled(true);
+ }
+ else
+ {
+ setEnabled(false);
+ }
+ }
+
+ public void run()
+ {
+ }
+ }
+ private class SelectColumnsAction extends BrowseAction
+ {
+
+ class SelectColumnsDialog extends SystemPromptDialog
+ {
+ private ISystemViewElementAdapter _adapter;
+ private ISystemTableViewColumnManager _columnManager;
+ private IPropertyDescriptor[] _uniqueDescriptors;
+ private ArrayList _currentDisplayedDescriptors;
+ private ArrayList _availableDescriptors;
+
+ private List _availableList;
+ private List _displayedList;
+
+ private Button _addButton;
+ private Button _removeButton;
+ private Button _upButton;
+ private Button _downButton;
+
+
+ public SelectColumnsDialog(Shell shell, ISystemViewElementAdapter viewAdapter, ISystemTableViewColumnManager columnManager)
+ {
+ super(shell, SystemResources.RESID_TABLE_SELECT_COLUMNS_LABEL);
+ setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_TOOLTIP);
+ _adapter = viewAdapter;
+ _columnManager = columnManager;
+ _uniqueDescriptors = viewAdapter.getUniquePropertyDescriptors();
+ IPropertyDescriptor[] initialDisplayedDescriptors = _columnManager.getVisibleDescriptors(_adapter);
+ _currentDisplayedDescriptors = new ArrayList(initialDisplayedDescriptors.length);
+ for (int i = 0; i < initialDisplayedDescriptors.length;i++)
+ {
+ if (!_currentDisplayedDescriptors.contains(initialDisplayedDescriptors[i]))
+ _currentDisplayedDescriptors.add(initialDisplayedDescriptors[i]);
+ }
+ _availableDescriptors = new ArrayList(_uniqueDescriptors.length);
+ for (int i = 0; i < _uniqueDescriptors.length;i++)
+ {
+ if (!_currentDisplayedDescriptors.contains(_uniqueDescriptors[i]))
+ {
+ _availableDescriptors.add(_uniqueDescriptors[i]);
+ }
+ }
+ }
+
+
+ public void handleEvent(Event e)
+ {
+ Widget source = e.widget;
+ if (source == _addButton)
+ {
+ int[] toAdd = _availableList.getSelectionIndices();
+ addToDisplay(toAdd);
+ }
+ else if (source == _removeButton)
+ {
+ int[] toAdd = _displayedList.getSelectionIndices();
+ removeFromDisplay(toAdd);
+ }
+ else if (source == _upButton)
+ {
+ int index = _displayedList.getSelectionIndex();
+ moveUp(index);
+ _displayedList.select(index - 1);
+ }
+ else if (source == _downButton)
+ {
+ int index = _displayedList.getSelectionIndex();
+ moveDown(index);
+ _displayedList.select(index + 1);
+ }
+
+ // update button enable states
+ updateEnableStates();
+ }
+
+ public IPropertyDescriptor[] getDisplayedColumns()
+ {
+ IPropertyDescriptor[] displayedColumns = new IPropertyDescriptor[_currentDisplayedDescriptors.size()];
+ for (int i = 0; i< _currentDisplayedDescriptors.size();i++)
+ {
+ displayedColumns[i]= (IPropertyDescriptor)_currentDisplayedDescriptors.get(i);
+ }
+ return displayedColumns;
+ }
+
+ private void updateEnableStates()
+ {
+ boolean enableAdd = false;
+ boolean enableRemove = false;
+ boolean enableUp = false;
+ boolean enableDown = false;
+
+ int[] availableSelected = _availableList.getSelectionIndices();
+ for (int i = 0; i < availableSelected.length; i++)
+ {
+ int index = availableSelected[i];
+ IPropertyDescriptor descriptor = (IPropertyDescriptor)_availableDescriptors.get(index);
+ if (!_currentDisplayedDescriptors.contains(descriptor))
+ {
+ enableAdd = true;
+ }
+ }
+
+ if (_displayedList.getSelectionCount()>0)
+ {
+ enableRemove = true;
+
+ int index = _displayedList.getSelectionIndex();
+ if (index > 0)
+ {
+ enableUp = true;
+ }
+ if (index < _displayedList.getItemCount()-1)
+ {
+ enableDown = true;
+ }
+ }
+
+ _addButton.setEnabled(enableAdd);
+ _removeButton.setEnabled(enableRemove);
+ _upButton.setEnabled(enableUp);
+ _downButton.setEnabled(enableDown);
+
+ }
+
+ private void moveUp(int index)
+ {
+ Object obj = _currentDisplayedDescriptors.remove(index);
+ _currentDisplayedDescriptors.add(index - 1, obj);
+ refreshDisplayedList();
+ }
+
+ private void moveDown(int index)
+ {
+ Object obj = _currentDisplayedDescriptors.remove(index);
+ _currentDisplayedDescriptors.add(index + 1, obj);
+
+ refreshDisplayedList();
+ }
+
+ private void addToDisplay(int[] toAdd)
+ {
+ ArrayList added = new ArrayList();
+ for (int i = 0; i < toAdd.length; i++)
+ {
+ int index = toAdd[i];
+
+ IPropertyDescriptor descriptor = (IPropertyDescriptor)_availableDescriptors.get(index);
+
+ if (!_currentDisplayedDescriptors.contains(descriptor))
+ {
+ _currentDisplayedDescriptors.add(descriptor);
+ added.add(descriptor);
+ }
+ }
+
+ for (int i = 0; i < added.size(); i++)
+ {
+ _availableDescriptors.remove(added.get(i));
+ }
+
+
+ refreshAvailableList();
+ refreshDisplayedList();
+
+ }
+
+ private void removeFromDisplay(int[] toRemove)
+ {
+ for (int i = 0; i < toRemove.length; i++)
+ {
+ int index = toRemove[i];
+ IPropertyDescriptor descriptor = (IPropertyDescriptor)_currentDisplayedDescriptors.get(index);
+ _currentDisplayedDescriptors.remove(index);
+ _availableDescriptors.add(descriptor);
+ }
+ refreshDisplayedList();
+ refreshAvailableList();
+ }
+
+ protected void buttonPressed(int buttonId)
+ {
+ setReturnCode(buttonId);
+
+ close();
+ }
+
+ protected Control getInitialFocusControl()
+ {
+ return _availableList;
+ }
+
+ public Control createInner(Composite parent)
+ {
+ Composite main = SystemWidgetHelpers.createComposite(parent, 1);
+
+
+ Composite c = SystemWidgetHelpers.createComposite(main, 4);
+ c.setLayoutData(new GridData(GridData.FILL_BOTH));
+ _availableList = SystemWidgetHelpers.createListBox(c, SystemResources.RESID_TABLE_SELECT_COLUMNS_AVAILABLE_LABEL, this, true);
+
+ Composite addRemoveComposite = SystemWidgetHelpers.createComposite(c, 1);
+ addRemoveComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
+ _addButton = SystemWidgetHelpers.createPushButton(addRemoveComposite,
+ SystemResources.RESID_TABLE_SELECT_COLUMNS_ADD_LABEL,
+ this);
+ _addButton.setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_ADD_TOOLTIP);
+
+ _removeButton = SystemWidgetHelpers.createPushButton(addRemoveComposite,
+ SystemResources.RESID_TABLE_SELECT_COLUMNS_REMOVE_LABEL,
+ this);
+ _removeButton.setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_REMOVE_TOOLTIP);
+
+ _displayedList = SystemWidgetHelpers.createListBox(c, SystemResources.RESID_TABLE_SELECT_COLUMNS_DISPLAYED_LABEL, this, false);
+
+ Composite upDownComposite = SystemWidgetHelpers.createComposite(c, 1);
+ upDownComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
+ _upButton = SystemWidgetHelpers.createPushButton(upDownComposite,
+ SystemResources.RESID_TABLE_SELECT_COLUMNS_UP_LABEL,
+ this);
+ _upButton.setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_UP_TOOLTIP);
+
+ _downButton = SystemWidgetHelpers.createPushButton(upDownComposite,
+ SystemResources.RESID_TABLE_SELECT_COLUMNS_DOWN_LABEL,
+ this);
+ _downButton.setToolTipText(SystemResources.RESID_TABLE_SELECT_COLUMNS_DOWN_TOOLTIP);
+
+ initLists();
+
+ setHelp();
+ return c;
+ }
+
+ private void initLists()
+ {
+ refreshAvailableList();
+ refreshDisplayedList();
+ updateEnableStates();
+ }
+
+ private void refreshAvailableList()
+ {
+ _availableList.removeAll();
+ // initialize available list
+ for (int i = 0; i < _availableDescriptors.size(); i++)
+ {
+ IPropertyDescriptor descriptor = (IPropertyDescriptor)_availableDescriptors.get(i);
+ _availableList.add(descriptor.getDisplayName());
+ }
+ }
+
+ private void refreshDisplayedList()
+ {
+ _displayedList.removeAll();
+ // initialize display list
+ for (int i = 0; i < _currentDisplayedDescriptors.size(); i++)
+ {
+
+ Object obj = _currentDisplayedDescriptors.get(i);
+ if (obj != null && obj instanceof IPropertyDescriptor)
+ {
+ _displayedList.add(((IPropertyDescriptor)obj).getDisplayName());
+ }
+ }
+ }
+
+ private void setHelp()
+ {
+ setHelp(RSEUIPlugin.HELPPREFIX + "gntc0000"); //$NON-NLS-1$
+ }
+ }
+
+ public SelectColumnsAction()
+ {
+ super(SystemResources.ACTION_SELECTCOLUMNS_LABEL, null);
+ setToolTipText(SystemResources.ACTION_SELECTCOLUMNS_TOOLTIP);
+ setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_FILTER_ID));
+ }
+
+ public void checkEnabledState()
+ {
+ Viewer viewer = getRSEViewer();
+ Object input = viewer.getInput();
+ if (viewer != null && input != null)
+ {
+ boolean flag = getViewAdapter(input).hasChildren((IAdaptable)input);
+ setEnabled(flag);
+ }
+ else
+ {
+ setEnabled(false);
+ }
+ }
+ public void run()
+ {
+ Viewer rviewer = getRSEViewer();
+ if (rviewer instanceof SystemSearchTableView){
+ SystemSearchTableView viewer = (SystemSearchTableView)rviewer;
+ ISystemTableViewColumnManager mgr = viewer.getColumnManager();
+ ISystemViewElementAdapter adapter = viewer.getViewAdapterForContents();
+ SelectColumnsDialog dlg = new SelectColumnsDialog(getShell(), adapter, mgr);
+ if (dlg.open() == Window.OK)
+ {
+ mgr.setCustomDescriptors(adapter, dlg.getDisplayedColumns());
+ viewer.computeLayout(true);
+ viewer.refresh();
+ }
+ }
+ }
+ }
+
+
private PageBook pageBook;
private StructuredViewer currentViewer;
@@ -110,6 +465,7 @@
private SystemSearchClearHistoryAction clearHistoryAction;
private SystemSearchRemoveSelectedMatchesAction removeSelectedAction;
private SystemSearchRemoveAllMatchesAction removeAllAction;
+ private SelectColumnsAction _selectColumnsAction;
private SystemSearchCopyToClipboardAction copyAction;
private SystemPasteFromClipboardAction pasteAction;
@@ -336,6 +692,14 @@
}
}
+ if (_selectColumnsAction == null){
+ _selectColumnsAction = new SelectColumnsAction();
+ if (currentViewer == null){
+ _selectColumnsAction.setEnabled(false);
+ }
+ }
+
+
// add cancel action
tbMgr.add(cancelAction);
@@ -344,13 +708,16 @@
// add remove all action
tbMgr.add(removeAllAction);
+
+
+ tbMgr.add(new Separator("View")); //$NON-NLS-1$
+ tbMgr.add(_selectColumnsAction);
// clipboard
- Clipboard clipboard = RSEUIPlugin.getTheSystemRegistryUI().getSystemClipboard();
Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
- copyAction = new SystemSearchCopyToClipboardAction(shell, clipboard);
- pasteAction = new SystemPasteFromClipboardAction(shell, clipboard);
+ copyAction = new SystemSearchCopyToClipboardAction(shell, null);
+ pasteAction = new SystemPasteFromClipboardAction(shell, null);
CellEditorActionHandler editorActionHandler = new CellEditorActionHandler(getViewSite().getActionBars());
@@ -541,6 +908,10 @@
if (removeAllAction != null) {
removeAllAction.setEnabled(isRemoveAllEnabled(resultSet));
}
+
+ if (_selectColumnsAction != null){
+ _selectColumnsAction.checkEnabledState();
+ }
}
private StructuredViewer createSearchResultsTree(IAdaptable resultSet, ISystemViewElementAdapter adapter)
@@ -724,6 +1095,10 @@
if (removeAllAction != null) {
removeAllAction.setEnabled(isRemoveAllEnabled(resultSet));
}
+
+ if (_selectColumnsAction != null){
+ _selectColumnsAction.checkEnabledState();
+ }
}
/**
@@ -788,6 +1163,10 @@
removeAllAction.setEnabled(isRemoveAllEnabled((IAdaptable)input));
}
+ if (_selectColumnsAction != null){
+ _selectColumnsAction.checkEnabledState();
+ }
+
return true;
}
@@ -822,6 +1201,9 @@
// disable remove all action
removeAllAction.setEnabled(false);
+ // disable column selection
+ _selectColumnsAction.setEnabled(false);
+
// clear the history action list
historyActions.clear();
@@ -919,7 +1301,10 @@
removeSelectedAction.setEnabled(false);
// disable remove all action
- removeAllAction.setEnabled(false);
+ removeAllAction.setEnabled(false);
+
+ // disable the column selection
+ _selectColumnsAction.setEnabled(false);
return true;
}
@@ -992,6 +1377,10 @@
if (removeAllAction != null) {
removeAllAction.setEnabled(isRemoveAllEnabled((IAdaptable)source));
}
+
+ if (_selectColumnsAction != null){
+ _selectColumnsAction.checkEnabledState();
+ }
// find out where the current viewer is in the viewer list
index = viewers.indexOf(currentViewer);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java 2009-05-26 11:44:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2013 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
@@ -34,6 +34,7 @@
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [236505] Remote systems dialog not working
* David McKnight (IBM) - [238288] use ImageRegistry to store/retrieve images for RSE label providers
+ * David Dykstal (IBM) - [397995] RSEInitJob runs too early
********************************************************************************/
package org.eclipse.rse.ui;
@@ -53,6 +54,7 @@
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
+import org.eclipse.rse.internal.core.RSEInitJob;
import org.eclipse.rse.internal.core.model.SystemProfileManager;
import org.eclipse.rse.internal.core.model.SystemRegistry;
import org.eclipse.rse.internal.ui.RSESystemTypeAdapterFactory;
@@ -385,8 +387,8 @@
public void start(BundleContext context) throws Exception
{
super.start(context);
-
- messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
+
+ messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$
//Force load the SystemRegistry - TODO Is this really necessary?
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBasePlugin.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBasePlugin.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBasePlugin.java 2009-07-30 00:02:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBasePlugin.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2010 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
@@ -17,6 +17,7 @@
* David McKnight (IBM) - [244454] SystemBasePlugin.getWorkBench() incorrectly returns null when called during Eclipse startup
* David McKnight (IBM) [246406] [performance] Timeout waiting when loading SystemPreferencesManager$ModelChangeListener during startup
* Martin Oberhuber (Wind River) - [246406] Timeout waiting when loading RSE
+ * David McKnight (IBM) - [314943] Write to the message to log instead of console
********************************************************************************/
package org.eclipse.rse.ui;
@@ -217,7 +218,7 @@
wb.addWorkbenchListener(workbenchListener);
} catch (IllegalStateException e) {
/* will try again later when workbench becomes available */
- System.out.println("Workbench not yet available"); //$NON-NLS-1$
+ logWarning("Workbench not yet available"); //$NON-NLS-1$
}
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java 2008-07-08 18:41:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -24,6 +24,8 @@
* Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
* David McKnight (IBM) - [229610] [api] File transfers should use workspace text file encoding
* David McKnight (IBM) - [238314] Default user ID on host properties page not disabled
+ * David McKnight (IBM) - [353377] Connection name with ":" causes problems
+ * Anna Dushistova (MontaVista) - [352072] RSE attempts to use proxy where it should not
*******************************************************************************/
package org.eclipse.rse.ui;
@@ -40,6 +42,7 @@
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
@@ -59,6 +62,7 @@
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ISystemValidator;
import org.eclipse.rse.ui.validators.ValidatorConnectionName;
+import org.eclipse.rse.ui.validators.ValidatorFileName;
import org.eclipse.rse.ui.validators.ValidatorUserId;
import org.eclipse.rse.ui.widgets.InheritableEntryField;
import org.eclipse.rse.ui.wizards.AbstractSystemWizardPage;
@@ -80,9 +84,12 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.dialogs.PropertyPage;
import org.eclipse.ui.ide.IDEEncoding;
@@ -126,6 +133,7 @@
protected ISystemValidator[] nameValidators;
protected ISystemValidator hostValidator;
protected ISystemValidator userIdValidator;
+ private ISystemValidator fileNameValidator;
// other inputs
protected ISystemMessageLine msgLine;
@@ -178,6 +186,8 @@
userIdValidator = new ValidatorUserId(true); // false => allow empty? Yes.
defaultUserId = ""; //$NON-NLS-1$
+
+ fileNameValidator = new ValidatorFileName();
}
// -------------------------------------------------------------
@@ -773,6 +783,18 @@
SystemWidgetHelpers.setHelp(workOfflineCB, RSEUIPlugin.HELPPREFIX + "wofp0000"); //$NON-NLS-1$
}
+ //AD: link to a network preference page
+ Link proxyLink = new Link(composite_prompts,SWT.NONE);
+ proxyLink.setText(""+SystemResources.SystemConnectionForm_0+""); //$NON-NLS-1$ //$NON-NLS-2$
+ proxyLink.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent evt) {
+ PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(
+ PlatformUI.getWorkbench().getDisplay().getActiveShell(), "org.eclipse.ui.net.NetPreferences", //$NON-NLS-1$
+ null, null);
+ dialog.open();
+ }
+ });
+ //
connectionNameEmpty = (textConnectionName.getText().trim().length() == 0); // d43191
textConnectionName.setFocus();
@@ -964,7 +986,7 @@
}
else {
String workspaceDefault = SystemEncodingUtil.getInstance().getLocalDefaultEncoding();
- otherEncodingCombo.setText(workspaceDefault); //$NON-NLS-1$
+ otherEncodingCombo.setText(workspaceDefault);
}
}
@@ -1329,10 +1351,18 @@
if (nameValidator != null) {
errorMessage = nameValidator.validate(connName);
}
+
+ if (errorMessage == null){
+ // bug 353377
+ // also validate file name - deals with ':' problem
+ errorMessage = fileNameValidator.validate(connName);
+ }
+
showErrorMessage(errorMessage);
setPageComplete();
if (userTyped)
connectionNameEmpty = (connName.length() == 0); // d43191
+
return errorMessage;
}
@@ -1358,7 +1388,11 @@
final String hostName = textHostName.getText().trim();
// d43191
- if (connectionNameEmpty && contentsCreated) internalSetConnectionName(hostName);
+ if (connectionNameEmpty && contentsCreated) {
+ // make sure connection name doesn't use ':' - bug 353377
+ String newConnectionName = hostName.replace(':', '_');
+ internalSetConnectionName(newConnectionName);
+ }
errorMessage = null;
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java 2008-09-29 22:10:02.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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
@@ -17,6 +17,8 @@
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* David McKnight (IBM) - [223103] [cleanup] fix broken externalized strings
* David McKnight (IBM) - [248339] [dnd][encodings] Cannot drag&drop / copy&paste files or folders with turkish or arabic names
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
+ * David McKnight (IBM) - [368304] Copy paste from Remote System Explorer view has CR/LF
*******************************************************************************/
package org.eclipse.rse.ui.actions;
@@ -40,6 +42,7 @@
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.internal.model.SystemRegistryUI;
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
@@ -62,19 +65,24 @@
public class SystemCopyToClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection
{
private IStructuredSelection _selection;
- private Clipboard _clipboard;
private boolean _doResourceTransfer = false; // determines whether or not to download on copy
/**
* Constructor
+ * -will deprecate this later since we don't use this clipboard now
*/
- public SystemCopyToClipboardAction(Shell shell, Clipboard clipboard)
+ public SystemCopyToClipboardAction(Shell shell, Clipboard clipboard){
+ this(shell);
+ }
+
+ /**
+ * Constructor
+ */
+ private SystemCopyToClipboardAction(Shell shell)
{
super(SystemResources.ACTION_COPY_LABEL,
PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY),
shell);
-
- _clipboard = clipboard;
setToolTipText(SystemResources.ACTION_COPY_TOOLTIP);
allowOnMultipleSelection(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
@@ -171,9 +179,13 @@
if (adapter != null)
{
String text = adapter.getAlternateText(dragObject);
+ if (textStream.length() > 0){
+ // append new line only if we've already got previous lines
+ textStream.append(getTextTransferAppend(dragObject, adapter));
+ }
+
textStream.append(getTextTransferPrepend(dragObject, adapter));
- textStream.append(text);
- textStream.append(getTextTransferAppend(dragObject, adapter));
+ textStream.append(text);
if (adapter.canDrag(dragObject))
{
@@ -247,9 +259,10 @@
{
fn[j] = (String)fileNames.get(j);
}
-
- _clipboard.setContents(new Object[] { data, ft, fn, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), ResourceTransfer.getInstance(), FileTransfer.getInstance(), TextTransfer.getInstance()});
-
+
+ Clipboard clipboard = SystemRegistryUI.getInstance().getSystemClipboard();
+ clipboard.setContents(new Object[] { data, ft, fn, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), ResourceTransfer.getInstance(), FileTransfer.getInstance(), TextTransfer.getInstance()});
+ clipboard.dispose();
}
else
{
@@ -259,14 +272,17 @@
ft[i] = (String) fileNames.get(i);
}
+ Clipboard clipboard = SystemRegistryUI.getInstance().getSystemClipboard();
+
if (ft.length > 0)
{
- _clipboard.setContents(new Object[] { data, ft, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), FileTransfer.getInstance(), TextTransfer.getInstance()});
+ clipboard.setContents(new Object[] { data, ft, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), FileTransfer.getInstance(), TextTransfer.getInstance()});
}
else
{
- _clipboard.setContents(new Object[] { data, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance()});
+ clipboard.setContents(new Object[] { data, textStream.toString() }, new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance()});
}
+ clipboard.dispose();
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java 2009-07-03 15:01:29.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2013 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
@@ -15,6 +15,8 @@
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Kenya Ishimoto (IBM) - [241197] Paste action causes IllegalArgumentException at Resource.copy
* Zhou Renjian (Kortide) - [282241] "Paste" is enabled on file system when text is in clipboard
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
+ * David McKnight (IBM) - [398324] cross systems folder transfer breaks due to scoping rule
********************************************************************************/
package org.eclipse.rse.ui.actions;
@@ -36,6 +38,7 @@
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
+import org.eclipse.rse.ui.internal.model.SystemRegistryUI;
import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.swt.dnd.Clipboard;
@@ -54,21 +57,27 @@
*/
public class SystemPasteFromClipboardAction extends SystemBaseAction implements IValidatorRemoteSelection
{
-
-
private int _srcType;
private Object _selection;
- private Clipboard _clipboard;
+
/**
* Constructor
+ * -will deprecate this later since we don't use this clipboard now
*/
public SystemPasteFromClipboardAction(Shell shell, Clipboard clipboard)
{
+ this(shell);
+ }
+
+ /**
+ * Constructor
+ */
+ private SystemPasteFromClipboardAction(Shell shell)
+ {
super(SystemResources.ACTION_PASTE_LABEL,
PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_PASTE),
//RSEUIPlugin.getDefault().getImageDescriptor(ISystemConstants.ICON_SYSTEM_PASTE_ID),
shell);
- _clipboard = clipboard;
_srcType = SystemDNDTransferRunnable.SRC_TYPE_RSE_RESOURCE;
setEnabled(false);
@@ -93,66 +102,9 @@
{
// do the transfer
SystemDNDTransferRunnable runnable = new SystemDNDTransferRunnable(target, (ArrayList)srcObjects, getViewer(), _srcType);
- if (target instanceof IAdaptable)
- {
- ISystemDragDropAdapter targetAdapter = (ISystemDragDropAdapter) ((IAdaptable) target).getAdapter(ISystemDragDropAdapter.class);
-
- if (targetAdapter != null)
- {
- List rulesList = new ArrayList();
-
- if (target instanceof ISchedulingRule) {
- rulesList.add(target);
- }
-
- int j = 0;
- for (int i = 0; i < srcObjects.size(); i++)
- {
- if (srcObjects.get(i) instanceof ISchedulingRule)
- {
- rulesList.add(srcObjects.get(i));
- j++;
- }
- /** FIXME - IREmoteFile is systems.core independent now
- else if (srcObjects.get(i) instanceof IRemoteFile)
- {
- rulesList.add(new RemoteFileSchedulingRule((IRemoteFile)srcObjects.get(i)));
- j++;
- }
- **/
- }
- /*
- if (target instanceof ISchedulingRule)
- {
- rulesList.add(target);
- }
- */
- /** FIXME - IREmoteFile is systems.core independent now
- else if (target instanceof IRemoteFile)
- {
- rulesList.add(new RemoteFileSchedulingRule((IRemoteFile)target));
- }
- */
- /*
- else
- {
- rulesList.add(targetSubSystem);
- }
- */
- if (rulesList.size() > 0)
- {
- ISchedulingRule[] rules = (ISchedulingRule[])rulesList.toArray(new ISchedulingRule[rulesList.size()]);
- MultiRule rule = new MultiRule(rules);
- runnable.setRule(rule);
- }
- }
- }
runnable.schedule();
RSEUIPlugin.getTheSystemRegistryUI().clearRunnableContext();
}
- // clear clipboard
- // _clipboard.setContents(new Object[] { null }, new Transfer[] { PluginTransfer.getInstance()});
- // setEnabled(false);
}
@@ -168,12 +120,13 @@
}
public boolean hasSource()
- {
- synchronized (_clipboard)
+ {
+ Clipboard clipboard = SystemRegistryUI.getInstance().getSystemClipboard();
+ try
{
- try
+ synchronized (clipboard)
{
- Object object = _clipboard.getContents(PluginTransfer.getInstance());
+ Object object = clipboard.getContents(PluginTransfer.getInstance());
if (object != null)
{
if (object instanceof PluginTransferData)
@@ -191,7 +144,7 @@
{
// clipboard must have resources or files
ResourceTransfer resTransfer = ResourceTransfer.getInstance();
- object = _clipboard.getContents(resTransfer);
+ object = clipboard.getContents(resTransfer);
if (object != null)
{
IResource[] resourceData = (IResource[]) object;
@@ -204,7 +157,7 @@
else
{
FileTransfer fileTransfer = FileTransfer.getInstance();
- object = _clipboard.getContents(fileTransfer);
+ object = clipboard.getContents(fileTransfer);
if (object != null)
{
@@ -218,7 +171,7 @@
else
{
TextTransfer textTransfer = TextTransfer.getInstance();
- object = _clipboard.getContents(textTransfer);
+ object = clipboard.getContents(textTransfer);
if (object != null)
{
@@ -230,9 +183,12 @@
}
}
}
- catch (Exception e)
- {
- }
+ }
+ catch (Exception e)
+ {
+ }
+ finally {
+ clipboard.dispose();
}
return false;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java 2009-07-29 20:13:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2009 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
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java 2008-08-25 02:35:33.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPasswordPromptDialog.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2012 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
@@ -17,6 +17,8 @@
* David Dykstal (IBM) - [210474] Deny save password function missing
* David Dykstal (IBM) - [210242] Credentials dialog should look different if password is not supported or optional
* Richie Yu (IBM) - [241716] Handle change expired password
+ * David McKnight (IBM) - [342615] when user checks "Save password" box, "Save User ID" box should automatically get checked
+ * David McKnight (IBM) - [309371] Include connection name in the password prompt dialog
********************************************************************************/
package org.eclipse.rse.ui.dialogs;
@@ -40,6 +42,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
@@ -73,6 +76,7 @@
private ISystemValidator passwordValidator;
private ICredentialsValidator signonValidator;
private IConnectorService connectorService = null;
+ private boolean wasPasswordSaved = false;
/**
* Constructor for SystemPasswordPromptDialog
@@ -195,6 +199,16 @@
label = SystemWidgetHelpers.createLabel(composite_prompts, connectorService.getHostName());
gd = new GridData();
label.setLayoutData(gd);
+
+ // Connection name
+ text = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_CONNECTIONNAME_LABEL);
+ label = SystemWidgetHelpers.createLabel(composite_prompts, text);
+ gd = new GridData();
+ label.setLayoutData(gd);
+ label = SystemWidgetHelpers.createLabel(composite_prompts, connectorService.getHost().getAliasName());
+ gd = new GridData();
+ label.setLayoutData(gd);
+
// UserId
if (connectorService.supportsUserId()) {
@@ -286,6 +300,14 @@
textPassword.setText(password);
textPassword.setSelection(0, password.length());
}
+
+ String defaultUserId = connectorService.getHost().getDefaultUserId();
+ wasPasswordSaved = defaultUserId.equals(userId);
+
+ if (wasPasswordSaved && userIdPermanentCB != null){
+ userIdPermanentCB.setSelection(true);
+ }
+
}
/**
@@ -345,8 +367,8 @@
} else {
userIdChanged = !userId.equals(originalUserId);
}
- if (userIdPermanentCB != null) {
- userIdPermanentCB.setEnabled(userIdChanged);
+ if (userIdPermanentCB != null) {
+ userIdPermanentCB.setEnabled(userIdChanged || !wasPasswordSaved);
}
}
@@ -512,4 +534,15 @@
boolean closeDialog = (getErrorMessage() == null);
return closeDialog;
}
+
+ // override of super method
+ public void handleEvent(Event e){
+ if (e.widget == savePasswordCB){
+ if (savePasswordCB.getSelection() && userIdPermanentCB != null){
+ // make sure the user is saved too - otherwise uid/password might not be retrieved on restart
+ userIdPermanentCB.setSelection(true);
+ }
+ }
+ super.handleEvent(e);
+ }
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java 2009-05-26 11:44:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2012 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
@@ -18,6 +18,7 @@
* Xuan Chen (IBM) - [220999] [api] Need to change class SystemSelectRemoteFileAction to use SystemRemoteFileDialog
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [267061] resource dialog/form to allow custom host combo label
+ * David McKnight (IBM) - [370007] potential NPEs in table-tree provider and remote resource dialog
*******************************************************************************/
package org.eclipse.rse.ui.dialogs;
@@ -64,7 +65,9 @@
{
_form = new SystemResourceSelectionForm(getShell(), parent, this, _inputProvider, getVerbiage(), _multipleSelectionMode, getMessageLine());
initForm();
- _form.setPreSelection(_preSelection);
+ if (_preSelection != null){
+ _form.setPreSelection(_preSelection);
+ }
createMessageLine(parent);
return _form.getInitialFocusControl();
}
@@ -91,7 +94,9 @@
_form.applyViewerFilter(getViewerFilter());
}
_form.setSelectionValidator(_selectionValidator);
- _form.setPreSelection(_preSelection);
+ if (_preSelection != null){
+ _form.setPreSelection(_preSelection);
+ }
_form.setShowPropertySheet(_showPropertySheet);
_form.setSelectionTreeToolTipText(getTreeTip());
if (_message != null)
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java 2008-10-16 23:41:38.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2013 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
@@ -15,6 +15,7 @@
* Rupen Mardirossian (IBM) - [208435] When validating name, check for previously used names for multiple renaming instances
* David Dykstal (IBM) - [231828] make rename dialog a bit wider
* David McKnight (IBM) - [251148] {0} appears in Collision Dialog
+ * David McKnight (IBM) - [399083] Rename of workstation file name not possibleby lowering the case of one character of the initial name
********************************************************************************/
package org.eclipse.rse.ui.dialogs;
@@ -626,6 +627,7 @@
*/
protected SystemMessage validateNameInput(String theNewName)
{
+ boolean windowsDiffersByCase = false;
errorMessage= null;
if (theNewName == null)
@@ -640,13 +642,28 @@
errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_NAME_EMPTY);
if (errorMessage == null)
{
- if (adapter != null && adapter.namesAreEqual(inputElement, theNewName))
- errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName);
- }
+ if (adapter != null && adapter.namesAreEqual(inputElement, theNewName)){
+ errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_RENAME_OLDEQUALSNEW).makeSubstitution(inputName);
+ // need to allow changes in case though on Windows
+ IHost host = adapter.getSubSystem(inputElement).getHost();
+ if (host.getSystemType().isWindows()){
+ String originalName = adapter.getName(inputElement);
+ if (!originalName.equals(theNewName)){ // doesn't match case
+ // therefore this is legal
+ windowsDiffersByCase = true;
+ errorMessage = null;
+ }
+ }
+ }
+ }
}
- if ((errorMessage == null) && (uniqueNameValidator != null))
+ if ((errorMessage == null) && (uniqueNameValidator != null)){
errorMessage = uniqueNameValidator.validate(theNewName);
+ if (errorMessage != null && windowsDiffersByCase){
+ errorMessage = null;
+ }
+ }
if(_namesInUse != null && _namesInUse.size()>0)
{
for(int i=0;i<_namesInUse.size();i++)
@@ -689,6 +706,16 @@
pageComplete = !adapter.namesAreEqual(inputElement, theNewName);
//System.out.println("back from namesAreEqual: " + pageComplete);
+ if (!pageComplete){
+ IHost host = adapter.getSubSystem(inputElement).getHost();
+ boolean isWindows = host.getSystemType().isWindows();
+ if (isWindows){
+ String originalName = adapter.getName(inputElement);
+ if (!originalName.equals(theNewName)){ // doesn't match case
+ pageComplete = true;
+ }
+ }
+ }
}
}
return pageComplete;
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java 2008-05-29 21:50:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2010 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
@@ -13,6 +13,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
+ * Xuan Chen (IBM) - [312171] TVT36:TCT186: TVT_KOR: Truncation on button
*******************************************************************************/
package org.eclipse.rse.ui.dialogs;
@@ -228,6 +229,9 @@
Button deselectButton = createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID,
SystemResources.RESID_SELECTFILES_DESELECTALL_BUTTON_ROOT_LABEL, false);
+ GridData buttonData = (GridData)deselectButton.getLayoutData();
+ buttonData.widthHint = buttonData.widthHint * 130 / 100;
+
listener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
listViewer.setAllChecked(false);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java 2008-11-07 13:28:33.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemChangeFilterPane.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2011 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
@@ -16,6 +16,7 @@
* David McKnight(IBM) - [239257] Tooltip for Filter Pool label is incorrect
* Kevin Doyle (IBM) - [235223] Duplicate Filter Strings
* David McKnight (IBM) - [252708] Saving Profile Job happens when not changing Property Values on Connections
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
*******************************************************************************/
package org.eclipse.rse.ui.filters;
@@ -48,6 +49,7 @@
import org.eclipse.rse.ui.SystemBaseForm;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.actions.ISystemAction;
+import org.eclipse.rse.ui.internal.model.SystemRegistryUI;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.messages.SystemMessageDialog;
import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -98,7 +100,6 @@
private SystemChangeFilterActionMoveStringUp moveUpAction;
private SystemChangeFilterActionMoveStringDown moveDownAction;
private MenuManager menuMgr;
- private Clipboard clipboard;
private boolean menuListenerAdded;
// inputs
@@ -1364,12 +1365,12 @@
*/
public void doCopy()
{
- if (clipboard == null)
- clipboard = new Clipboard(getShell().getDisplay());
+ Clipboard clipboard = new Clipboard(getShell().getDisplay());
String selection = getCurrentSelection();
TextTransfer transfer = TextTransfer.getInstance();
clipboard.setContents(new Object[] {selection}, new Transfer[] {transfer});
+ clipboard.dispose();
}
/**
* Decide if we can do the paste or not.
@@ -1377,11 +1378,11 @@
*/
public boolean canPaste()
{
- if (clipboard == null)
- return false;
- TextTransfer textTransfer = TextTransfer.getInstance();
- String textData = (String)clipboard.getContents(textTransfer);
- return ((textData != null) && (textData.length() > 0));
+ Clipboard clipboard = new Clipboard(getShell().getDisplay());
+ TextTransfer textTransfer = TextTransfer.getInstance();
+ String textData = (String)clipboard.getContents(textTransfer);
+ clipboard.dispose();
+ return ((textData != null) && (textData.length() > 0));
}
/**
* Actually do the copy of the current filter string to the clipboard.
@@ -1389,8 +1390,7 @@
*/
public void doPaste()
{
- if (clipboard == null)
- return;
+ Clipboard clipboard = SystemRegistryUI.getInstance().getSystemClipboard();
TextTransfer textTransfer = TextTransfer.getInstance();
String textData = (String)clipboard.getContents(textTransfer);
@@ -1409,6 +1409,7 @@
}
processListSelect(); // defect 45790...
setPageComplete(verify(false));
+ clipboard.dispose();
}
// --------------
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java 2008-11-25 19:02:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2010 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
@@ -16,6 +16,7 @@
* David McKnight (IBM) - [225506] [api][breaking] RSE UI leaks non-API types
* David McKnight (IBM) - [226948] [api][regression] SystemNewFilterWizard.createNamePage() is no longer available
* David McKnight (IBM) - [249482] Duplicate Filters can be created if changing the filter pool
+ * David Dykstal (IBM) - [148977] New Filter dialog should propose a default filter name on the 2nd page
*******************************************************************************/
package org.eclipse.rse.ui.filters.dialogs;
@@ -160,8 +161,8 @@
SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2NameVerbiage(), nbrColumns, false, 200);
nameText = SystemWidgetHelpers.createLabeledTextField(composite_prompts, null, configurator.getPage2NamePromptLabel(), configurator.getPage2NamePromptTooltip());
-
- addSeparatorLine(composite_prompts, nbrColumns);
+
+ addSeparatorLine(composite_prompts, nbrColumns);
addFillerLine(composite_prompts, nbrColumns);
// allow the user to create this filter uniquely for this connection, which means putting it in a
@@ -537,10 +538,26 @@
if (!userEditedName && (nameText!=null))
{
String defaultName = ((SystemNewFilterWizard)getWizard()).getDefaultFilterName();
- if (defaultName != null)
- {
+ if (defaultName != null) {
+ if (defaultName.length() > 0) {
+ if (nameValidator != null) {
+ String nameProposal = defaultName;
+ boolean invalid = true;
+ int times = 0;
+ while (invalid && times < 20) { // try only 20 times
+ if (nameValidator.validate(nameProposal) != null) {
+ times++;
+ nameProposal = defaultName + " " + times; //$NON-NLS-1$
+ } else {
+ invalid = false;
+ defaultName = nameProposal;
+ }
+ }
+ }
+ }
ignoreChanges = true;
nameText.setText(defaultName);
+ nameText.selectAll();
ignoreChanges = false;
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java 2009-08-10 13:55:32.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2011 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
@@ -25,6 +25,8 @@
* David McKnight (IBM) - [243263] NPE on expanding a filter
* David McKnight (IBM) - [260777] [ssh] Deadlock when changing selection after multiple hibernate/resume cycles
* David McKnight (IBM) - [283793] [dstore] Expansion indicator(+) does not reset after no connect
+ * David McKnight (IBM) - [316565] Failed to resolve the filter for a non-connected subsystem
+ * David McKnight (IBM) - [325923] SystemFetchOperation Cancel message not suitable
*******************************************************************************/
package org.eclipse.rse.ui.operations;
@@ -270,6 +272,10 @@
private boolean ensureConnected(SubSystem ss, IProgressMonitor monitor) throws InterruptedException {
+ if (!ss.getSubSystemConfiguration().supportsSubSystemConnect()){
+ return true;
+ }
+
if (!ss.isConnected() &&
!ss.isOffline()) // skip the connect if offline, but still follow through because we need to follow through in the subsystem
{
@@ -312,8 +318,11 @@
return false;
}
catch (Exception e)
- {
- showOperationErrorMessage(null, e, ss);
+ {
+ // bug 325923 - it's inappropriate to display such messages on cancel
+ if (!(e instanceof InterruptedException) && !(e instanceof OperationCanceledException)){
+ showOperationErrorMessage(null, e, ss);
+ }
return false;
}
finally {
@@ -467,7 +476,7 @@
{
String excMsg = exc.getMessage();
if ((excMsg == null) || (excMsg.length()==0))
- exc.getClass().getName();
+ excMsg = exc.getClass().getName();
else
excMsg = exc.getClass().getName() + ": " + excMsg; //$NON-NLS-1$
sysMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_FAILED);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java 2007-06-05 11:36:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/validators/ValidatorUniqueString.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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,6 +15,8 @@
* David Dykstal (IBM) - generalized Vector argumnents to Collections
* Kevin Doyle (IBM) - 174776: perform required sorting of Collection arguments
* David Dykstal (IBM) - 174776: disallowed sorting of input arguments, used copies
+ * David McKnight (IBM) [373326] When one of Duplicate Filter Names is deleted, both filters are deleted.
+ * David McKnight (IBM) [388592] Renaming a file is case insensitive for Linux on remote systems
*******************************************************************************/
package org.eclipse.rse.ui.validators;
@@ -297,8 +299,27 @@
else if (caseSensitive && (existingList!=null) && (Arrays.binarySearch(existingList,newText) >= 0))
return msg_NonUnique.getLevelOneText();
*/
- if ((existingList!=null) && (Arrays.binarySearch(existingList,newText) >= 0))
- currentMessage = msg_NonUnique;
+ if (existingList != null){
+ if (!caseSensitive){
+ if (Arrays.binarySearch(existingList,newText) >= 0){
+ currentMessage = msg_NonUnique;
+ }
+ }
+ else { // caseSensitive
+ boolean match = false;
+ for (int i = 0; i < existingList.length && !match; i++){
+ String existing = existingList[i];
+ if (existing != null){
+ match = newText.equals(existing);
+ }
+ }
+ if (match){
+ currentMessage = msg_NonUnique;
+ }
+ }
+ }
+
+
else if (syntaxValidator!=null)
{
String msg = syntaxValidator.isValid(newText);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java 2009-09-15 21:44:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2013 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
@@ -24,6 +24,15 @@
* David McKnight (IBM) - [187058] Incorrect Right Click Menu in Remote System Details View with no selection
* David McKnight (IBM) - [260346] RSE view for jobs does not remember resized columns
* Martin Oberhuber (Wind River) - [289533] NPE on "Show in Table"
+ * Noriaki Takatsu (IBM) - [288894] CANCEL has to be pressed 3 times in Userid/Password prompt window in Remote System Details view
+ * David McKnight (IBM) - [329170] Show in table does not work after showing empty folder in table
+ * David McKnight (IBM) - [308783] Value in Properties view remains "Pending..."
+ * David McKnight (IBM) - [215814] [performance] Duplicate Queries between Table and Remote Systems View
+ * David McKnight (IBM) - [340912] inconsistencies with columns in RSE table viewers
+ * David McKnight (IBM) - [357587] Custom sorter is changed to SystemTableViewSorter
+ * David McKnight (IBM) - [363392] system table views shows open view actions when they shouldn't
+ * David McKnight (IBM) - [388947] column sort icon issue with Remote Systems Details view
+ * David McKnight (IBM) - [398306] table sorting of RSE table views inconsistent with Eclipse
********************************************************************************/
package org.eclipse.rse.ui.view;
@@ -198,6 +207,7 @@
{
_upI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_MOVEUP_ID);
_downI = RSEUIPlugin.getDefault().getImage(ISystemIconConstants.ICON_SYSTEM_MOVEDOWN_ID);
+
}
@@ -219,18 +229,24 @@
TableColumn tcolumn = (TableColumn)e.widget;
int column = table.indexOf(tcolumn);
SystemTableViewSorter oldSorter = (SystemTableViewSorter) getSorter();
- if (oldSorter != null && column == oldSorter.getColumnNumber())
+ if (oldSorter != null)
{
- oldSorter.setReversed(!oldSorter.isReversed());
- if (tcolumn.getImage() == _upI)
- {
- tcolumn.setImage(_downI);
+ if (column == oldSorter.getColumnNumber()){
+ boolean isReversed = !oldSorter.isReversed();
+ oldSorter.setReversed(isReversed);
+ if (isReversed) {
+ tcolumn.setImage(_downI);
+ }
+ else {
+ tcolumn.setImage(_upI);
+ }
}
- else
- {
- tcolumn.setImage(_upI);
+ else {
+ oldSorter.setColumnNumber(column);
+ oldSorter.setReversed(false);
+ tcolumn.setImage(_upI);
}
- }
+ }
else
{
setSorter(new SystemTableViewSorter(column, SystemTableView.this, _columnManager));
@@ -379,7 +395,7 @@
/**
* @since 3.0 Moved SystemTableViewProvider from internal to API
- * @return
+ * @return returns the table view provider
*/
protected SystemTableViewProvider getProvider()
{
@@ -438,6 +454,8 @@
{
if (newObject instanceof IAdaptable)
{
+ boolean wasShowColumns = _showColumns;
+ _showColumns = true; // bug 329170 - always reset to ensure columns are available
getTable().setVisible(true);
// columns may change so we want to keep track of the current ones
@@ -459,7 +477,9 @@
// reset the filter
//setViewFilters(null);
- super.inputChanged(newObject, oldObject);
+ if (_showColumns || wasShowColumns) {
+ super.inputChanged(newObject, oldObject);
+ }
}
else if (newObject == null)
@@ -654,6 +674,17 @@
}
}
+ private Object[] internalGetSampleChildren(){
+ SystemTableViewProvider provider = (SystemTableViewProvider) getContentProvider();
+ Object lastObj = provider._lastObject;
+ if (lastObj != getInput() || provider._lastResults == null){
+ Object[] children = provider.getChildren(_objectInput);
+ return children;
+ }
+ else {
+ return provider._lastResults;
+ }
+ }
/**
* Determines what columns should be shown in this view. The columns may change
* anytime the view input changes. The columns in the control are modified and
@@ -668,11 +699,12 @@
return;
SystemTableViewProvider provider = (SystemTableViewProvider) getContentProvider();
- Object[] children = provider.getChildren(_objectInput);
+ Object[] children = internalGetSampleChildren();
// if no children, don't update
if (children == null || children.length == 0)
{
+ _showColumns = false;
return;
}
@@ -868,10 +900,20 @@
Table table = getTable();
if (table != null && !table.isDisposed())
{
+ int[] colOrder = table.getColumnOrder();
TableColumn[] columns = table.getColumns();
- for (int i = 0; i < columns.length && i < widths.length; i++)
+ for (int i = 0; i < columns.length; i++)
{
- columns[i].setWidth(widths[i]);
+ TableColumn column = columns[i];
+ int position = colOrder[i];
+ if (position < widths.length){
+ column.setWidth(widths[position]);
+ }
+ else {
+ if (column.getWidth() == 0){ // don't hide this column
+ column.setWidth(100);
+ }
+ }
}
}
}
@@ -965,6 +1007,14 @@
{
updateItem(w, child);
}
+
+ ISelection selection = getSelection();
+ if (selection instanceof IStructuredSelection){
+ Object first = ((IStructuredSelection)selection).getFirstElement();
+ if (first.equals(child)){
+ updatePropertySheet(true);
+ }
+ }
}
catch (Exception e)
{
@@ -1073,6 +1123,36 @@
}
}
+ private void updatePropertySheet(boolean force) {
+ ISelection selection = getSelection();
+ if (selection == null) return;
+
+ // only fire this event if the view actually has focus
+ if (force || getControl().isFocusControl())
+ {
+ IStructuredSelection parentSelection = null;
+ // create events in order to update the property sheet
+ if (selection instanceof IStructuredSelection){
+ Object first = ((IStructuredSelection)selection).getFirstElement();
+ ISystemViewElementAdapter adapter = getViewAdapter(first);
+
+ Object parent = adapter.getParent(first);
+ if (parent != null){
+ parentSelection = new StructuredSelection(parent);
+ }
+ }
+
+ SelectionChangedEvent dummyEvent = new SelectionChangedEvent(this, parentSelection);
+ SelectionChangedEvent event = new SelectionChangedEvent(this, selection);
+
+ // first change the selection, then change it back (otherwise the property sheet ignores the event)
+ fireSelectionChanged(dummyEvent);
+
+ // fire the event
+ fireSelectionChanged(event);
+ }
+ }
+
/**
* This is the method in your class that will be called when a remote resource
* changes. You will be called after the resource is changed.
@@ -1972,10 +2052,12 @@
SystemShowInTableAction showInTableAction = getShowInTableAction();
openToPerspectiveAction.setSelection(selection);
showInTableAction.setSelection(selection);
- //menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, openToAction.getSubMenu());
- menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, openToPerspectiveAction);
- menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, showInTableAction);
-
+
+ if (_selectionShowOpenViewActions){
+ //menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, openToAction.getSubMenu());
+ menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, openToPerspectiveAction);
+ menu.appendToGroup(ISystemContextMenuConstants.GROUP_OPEN, showInTableAction);
+ }
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java 2008-12-04 18:30:36.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
+ * Copyright (c) 2002, 2012 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,6 +15,7 @@
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Justin Lin (IBM) - [244051] JJ: Environment Variables property page allows duplicates...
+ * David McKnight (IBM) - [370883] [api] Environment variables form should allow setting the message text
*******************************************************************************/
package org.eclipse.rse.ui.widgets;
@@ -54,6 +55,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
@@ -82,7 +84,8 @@
private String invalidNameChars;
private Button addButton, changeButton, removeButton, moveUpButton, moveDownButton;
-
+ private Label formLabel;
+
// Temporary class for storing environment variable information
// until we pass it to the commands subsystem.
public class EnvironmentVariable {
@@ -253,14 +256,22 @@
systemType = ((ISubSystem) selectedObject).getHost().getSystemType();
}
- }
+ }
/**
+ * Use this method to customize the label for this form.
+ * @since 3.3
+ */
+ public void setLabel(String label){
+ formLabel.setText(label);
+ }
+
+ /**
* @see org.eclipse.rse.ui.SystemBaseForm#createContents(Composite)
*/
public Control createContents(Composite parent) {
- SystemWidgetHelpers.createLabel(parent, SystemResources.RESID_SUBSYSTEM_ENVVAR_DESCRIPTION);
+ formLabel = SystemWidgetHelpers.createLabel(parent, SystemResources.RESID_SUBSYSTEM_ENVVAR_DESCRIPTION);
// Environment Variables List
envVarTable = new Table(parent, SWT.FULL_SELECTION |SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemCollapsableSection.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemCollapsableSection.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemCollapsableSection.java 2006-12-06 19:03:51.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemCollapsableSection.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2011 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@
*
* Contributors:
* {Name} (company) - description of contribution.
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
********************************************************************************/
package org.eclipse.rse.ui.widgets;
@@ -139,11 +140,6 @@
super(compositeParent, SWT.NULL);
- if (_colorCollapsable == null)
- {
- Display display = Display.getCurrent();
- _colorCollapsable = new Color(display, 0, 140, 140);
- }
setLayout(new RTwisteeLayout());
@@ -157,6 +153,14 @@
addPaintListener(this);
addMouseListener(this);
}
+
+ private static Color getCollapsableColour(){
+ if (_colorCollapsable == null || _colorCollapsable.isDisposed()){
+ Display display = Display.getCurrent();
+ _colorCollapsable = new Color(display, 0, 140, 140);
+ }
+ return _colorCollapsable;
+ }
/**
* Get the actual composite inside the collapsible section to
@@ -298,13 +302,14 @@
int iY,
boolean bCollapsed)
{
+ Color ccolour = getCollapsableColour();
// Not collapsed: v
//-----------------
if (bCollapsed == false)
{
- gc.setForeground(_colorCollapsable);
+ gc.setForeground(ccolour);
int iA = iX;
int iB = iY + 3;
@@ -333,7 +338,7 @@
//-------------
else
{
- gc.setForeground(_colorCollapsable);
+ gc.setForeground(ccolour);
int iA = iX + 2;
int iB = iY;
@@ -355,6 +360,7 @@
iB++;
gc.drawLine(iA, iB, iA, iB);
}
+ ccolour.dispose();
}
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java 2006-08-31 17:37:24.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/RSEModelServiceElement.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2010 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,7 +11,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight (IBM) - [306187] cancel in properties of remote system view doesn't work
********************************************************************************/
package org.eclipse.rse.ui.widgets.services;
@@ -124,13 +124,19 @@
public void revert()
{
PropertySetServiceElement[] sets = getPropertySets();
+ IPropertySet[] origSets = new IPropertySet[sets.length];
for (int i = 0; i < sets.length; i++)
{
IPropertySet newSet = sets[i].getPropertySet();
IPropertySet originalSet = sets[i].getOriginalProperySet();
+ origSets[i] = originalSet;
+
_modelObject.removePropertySet(newSet.getName());
_modelObject.addPropertySet(originalSet);
}
+ _propertySetElements = null;
+ _propertySets = origSets;
+ getPropertySets();
}
public void refreshProperties()
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServerLauncherPropertiesServiceElement.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServerLauncherPropertiesServiceElement.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServerLauncherPropertiesServiceElement.java 2007-06-05 11:36:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServerLauncherPropertiesServiceElement.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 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
@@ -12,7 +12,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
*
* Contributors:
- * {Name} (company) - description of contribution.
+ * David McKnight (IBM) - [306187] cancel in properties of remote system view doesn't work
*******************************************************************************/
package org.eclipse.rse.ui.widgets.services;
@@ -82,7 +82,11 @@
public void revert()
{
- super.revert();
+ super.revert();
+
+ _launcherProperties = _launcherProperties.getConnectorService().getRemoteServerLauncherProperties();
+ _launcherProperties.restoreFromProperties();
+ _launcherProperties.commit();
}
public IServerLauncherProperties getServerLauncherProperties()
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizardMainPage.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizardMainPage.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizardMainPage.java 2007-04-25 20:24:04.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEDefaultNewConnectionWizardMainPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2002, 2010 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
@@ -13,6 +13,7 @@
* Contributors:
* Uwe Stieber (Wind River) - Reworked new connection wizard extension point.
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
+ * Uwe Stieber (Wind River) - Fix stack overflow in canFlipToNextPage() and getNextPage()
********************************************************************************/
package org.eclipse.rse.ui.wizards.newconnection;
@@ -49,6 +50,13 @@
private SystemConnectionForm form;
private final RSEDialogPageMessageLine messageLine;
+ // Remember in getNextPage() if we called form.verify(...) already once.
+ // As the form is coming back to this page to invoke setPageComplete(boolean),
+ // form.verify(...) triggers an update of the wizard buttons, which in turn invoke
+ // canFlipToNextPage(...) which does call getNextPage(...). If the page is not used
+ // with a RSEDefaultNewConnectionWizard, this will end up in a StackOverflowError.
+ private boolean formVerificationGateKeeper = false;
+
/**
* Constructor. Use this when you want to supply your own title and
* description strings.
@@ -138,7 +146,11 @@
// verify contents of page before going to main page
// this is done because the main page may have input that is not valid, but can
// only be verified when next is pressed since it requires a long running operation
- if (!getSystemConnectionForm().verify(true)) return null;
+ if (!formVerificationGateKeeper) {
+ formVerificationGateKeeper = true;
+ if (!getSystemConnectionForm().verify(true)) return null;
+ formVerificationGateKeeper = false;
+ }
RSEDefaultNewConnectionWizard newConnWizard = getWizard() instanceof RSEDefaultNewConnectionWizard ? (RSEDefaultNewConnectionWizard)getWizard() : null;
if (newConnWizard != null) {
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java 2009-08-06 15:30:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSEMainNewConnectionWizard.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 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
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java eclipse-rse-3.4.2/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java 2008-09-29 22:10:03.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistryUI.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2006, 2011 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
@@ -19,6 +19,7 @@
* Martin Oberhuber (Wind River) - [] Move SystemRegistry impl into Core
* Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
* David McKnight (IBM) - [248339] [dnd][encodings] Cannot drag&drop / copy&paste files or folders with turkish or arabic names
+ * David McKnight (IBM) - [330398] RSE leaks SWT resources
********************************************************************************/
package org.eclipse.rse.ui.internal.model;
@@ -80,7 +81,6 @@
private Vector previousRunnableContexts = new Vector();
private Vector previousRunnableContextShells = new Vector();
- private Clipboard clipboard = null;
private SystemScratchpad scratchpad = null;
/**
@@ -277,22 +277,17 @@
*/
public Clipboard getSystemClipboard()
{
- if (clipboard == null)
+ Display display = null;
+ Shell shell = getShell();
+ if (shell == null)
{
- Display display = null;
- Shell shell = getShell();
- if (shell == null)
- {
- display = Display.getDefault();
- }
- else
- {
- display = shell.getDisplay();
- }
- clipboard = new Clipboard(display);
+ display = Display.getDefault();
}
-
- return clipboard;
+ else
+ {
+ display = shell.getDisplay();
+ }
+ return new Clipboard(display);
}
/**
@@ -442,6 +437,7 @@
srcObjects.add(textData);
}
}
+ clipboard.dispose();
return srcObjects;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.ui/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/plugin.properties 2009-05-26 11:44:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.
+# Copyright (c) 2000, 2011 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
@@ -23,7 +23,7 @@
# NLS_ENCODING=UTF-8
pluginName = RSE UI
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
extPoint.newConnectionWizards = New Connection Wizards
#extPoint.compile = Remote Compile Commands
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.ui/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.rse.ui/plugin.xml 2009-02-01 17:01:51.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.rse.ui/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -21,6 +21,7 @@
David McKnight (IBM) - [160105] [usability] Universal action needed to locate a resource in the Remote Systems View
David McKnight (IBM) - [260792] Default prompt text color/background color for Remote Shell view is difficult to see
Uwe Stieber (Wind River) - [245039] [contributions][api] Provide property tester implementations in parallel to the older action filters
+David Dykstal (IBM) - [397995] RSEInitJob runs too early
-->
June 8, 2009
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/build.properties eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,14 @@ +################################################################################ +# Copyright (c) 2009 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +################################################################################ +bin.includes = META-INF/,\ + about.html,\ + plugin.properties,\ + plugin.xml diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/plugin.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,17 @@ +################################################################################ +# Copyright (c) 2009, 2010 Wind River Systems, Inc. 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +################################################################################ +providerName=Eclipse TM Project +bundleName=RSE Capabilities Plug-in + +activity.rse=Remote System Explorer +activity.rse.desc=Enable features of the Remote System Explorer (RSE). +activity.tm.terminal=Terminal +activity.tm.terminal.desc=Enables the TM Terminal View. \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/plugin.xml eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.rse.ui.capabilities/plugin.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.ui.capabilities/plugin.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,73 @@ + + + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +March 17, 2005
+February 1, 2011
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:
Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the + +
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in @@ -57,23 +58,51 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:21:08.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -11,7 +11,7 @@ # needed for primary features only # Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png +featureImage=tm32.png # Property "aboutImage" contains path to product image (500x330 or 115x164) # needed for primary features only diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties 2009-02-10 22:34:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2012 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 @@ -22,5 +22,5 @@ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright IBM Corporation and others 2000, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties 2009-05-14 07:56:19.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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,5 +9,5 @@ # IBM Corporation - initial API and implementation # Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature ############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ +bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/ sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:21:06.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. +# Copyright (c) 2000, 2011 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 @@ -10,4 +10,4 @@ # Martin Oberhuber (Wind River) - Adapted from rse.dstore-feature ############################################################################### pluginName=Remote System Explorer User Actions Source -providerName=Eclipse.org - DSDP +providerName=Eclipse TM Project Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.useractions-feature/sourceTemplatePlugin/tm32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/.classpath eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/.classpath --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/.classpath 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/.classpath 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,6 @@ + +June 5, 2007
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.ini eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.ini 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.ini 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,27 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. + +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=tm32.png + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (not translated) +# needed for primary features only + +# Property "welcomePage" contains path to welcome page (special XML-based format) +# optional + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.mappings eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.mappings --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.mappings 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.mappings 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,6 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + +0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/about.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/about.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,32 @@ +################################################################################ +# Copyright (c) 2006, 2012 Wind River Systems, Inc 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 +# +# Contributors: +# Martin Oberhuber - initial API and implementation +# David Dykstal (IBM) - [232198] remove NLS MESSAGEFORMAT NONE +################################################################################ + +# NLS_ENCODING=UTF-8 + +# about.properties +# contains externalized strings for about.ini +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# fill-ins are supplied by about.mappings +# This file should be translated. +# +# Do not translate any values surrounded by {} + +blurb=Remote System Explorer User Actions SDK\n\ +\n\ +Version: {featureVersion}\n\ +Build id: {0}\n\ +\n\ +(c) Copyright IBM Corporation and others 2000, 2012. All rights reserved.\n\ +Visit http://www.eclipse.org/tm\n\ +\n\ +This product includes software developed by the\n\ +Apache Software Foundation http://www.apache.org/ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/build.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/build.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,22 @@ +############################################################################### +# Copyright (c) 2005, 2011 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 +# +# Contributors: +# IBM Corporation - initial API and implementation +# Martin Oberhuber (Wind River) - Use eclipse32.png feature image +############################################################################### +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + about.html,\ + about.ini,\ + about.mappings,\ + about.properties,\ + tm32.png,\ + plugin.properties +src.includes = about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/plugin.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/plugin.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,16 @@ +############################################################################### +# Copyright (c) 2000, 2011 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 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +pluginName = Remote System Explorer User Actions SDK +providerName = Eclipse TM Project \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +Eclipse Public License - v 1.0
+ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.
+ +1. DEFINITIONS
+ +"Contribution" means:
+ +a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.
+ +"Contributor" means any person or entity that distributes +the Program.
+ +"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.
+ +"Program" means the Contributions distributed in accordance +with this Agreement.
+ +"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.
+ +2. GRANT OF RIGHTS
+ +a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.
+ +b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.
+ +c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.
+ +d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.
+ +3. REQUIREMENTS
+ +A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:
+ +a) it complies with the terms and conditions of this +Agreement; and
+ +b) its license agreement:
+ +i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;
+ +ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;
+ +iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and
+ +iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.
+ +When the Program is made available in source code form:
+ +a) it must be made available under this Agreement; and
+ +b) a copy of this Agreement must be included with each +copy of the Program.
+ +Contributors may not remove or alter any copyright notices contained +within the Program.
+ +Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.
+ +4. COMMERCIAL DISTRIBUTION
+ +Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.
+ +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.
+ +5. NO WARRANTY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.
+ +6. DISCLAIMER OF LIABILITY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ +7. GENERAL
+ +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.
+ +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.
+ +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.
+ +Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.
+ +This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. No party +to this Agreement will bring a legal action under this Agreement more +than one year after the cause of action arose. Each party waives its +rights to a jury trial in any resulting litigation.
+ + \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,168 @@ +############################################################################### +# Copyright (c) 2006, 2013 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 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### + +# NLS_MESSAGEFORMAT_NONE +# NLS_ENCODING=UTF-8 + +# "featureName" property - name of the feature +featureName=RSE User Actions SDK + +# "description" property - description of the feature +description=Install this if you plan to develop applications or tools \ +based user actions. This SDK contains runtimes, documentation and sources \ +for the user actions framework. + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse TM Project + +# "tmUpdateSiteName" property - label for the update site +tmUpdateSiteName=Target Management 3.4 Updates + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2013 IBM Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html +################ end of copyright property #################################### + +# "licenseURL" property - URL of the "Feature License" +# do not translate value - just change to point to a locale-specific HTML page +licenseURL=license.html + +# "license" property - text of the "Feature Update License" +# should be plain text version of license agreement pointed to be "licenseURL" +license=\ +Eclipse Foundation Software User Agreement\n\ +February 1, 2011\n\ +\n\ +Usage Of Content\n\ +\n\ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ +OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ +USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ +AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ +NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ +AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ +AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ +OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ +TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ +OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ +BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ +\n\ +Applicable Licenses\n\ +\n\ +Unless otherwise indicated, all Content made available by the\n\ +Eclipse Foundation is provided to you under the terms and conditions of\n\ +the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\ +provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ +For purposes of the EPL, "Program" will mean the Content.\n\ +\n\ +Content includes, but is not limited to, source code, object code,\n\ +documentation and other files maintained in the Eclipse Foundation source code\n\ +repository ("Repository") in software modules ("Modules") and made available\n\ +as downloadable archives ("Downloads").\n\ +\n\ + - Content may be structured and packaged into modules to facilitate delivering,\n\ + extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ + plug-in fragments ("Fragments"), and features ("Features").\n\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ + in a directory named "plugins".\n\ + - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ + Each Feature may be packaged as a sub-directory in a directory named "features".\n\ + Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ + numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ + - Features may also include other Features ("Included Features"). Within a Feature, files\n\ + named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ +\n\ +The terms and conditions governing Plug-ins and Fragments should be\n\ +contained in files named "about.html" ("Abouts"). The terms and\n\ +conditions governing Features and Included Features should be contained\n\ +in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ +Licenses may be located in any directory of a Download or Module\n\ +including, but not limited to the following locations:\n\ +\n\ + - The top-level (root) directory\n\ + - Plug-in and Fragment directories\n\ + - Inside Plug-ins and Fragments packaged as JARs\n\ + - Sub-directories of the directory named "src" of certain Plug-ins\n\ + - Feature directories\n\ +\n\ +Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ +Provisioning Technology (as defined below), you must agree to a license ("Feature \n\ +Update License") during the installation process. If the Feature contains\n\ +Included Features, the Feature Update License should either provide you\n\ +with the terms and conditions governing the Included Features or inform\n\ +you where you can locate them. Feature Update Licenses may be found in\n\ +the "license" property of files named "feature.properties" found within a Feature.\n\ +Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\ +terms and conditions (or references to such terms and conditions) that\n\ +govern your use of the associated Content in that directory.\n\ +\n\ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ +TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ +SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ +\n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ + - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ + - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ + - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ + - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ + - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ +\n\ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ +TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\ +is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ +govern that particular Content.\n\ +\n\ +\n\Use of Provisioning Technology\n\ +\n\ +The Eclipse Foundation makes available provisioning software, examples of which include,\n\ +but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\ +the purpose of allowing users to install software, documentation, information and/or\n\ +other materials (collectively "Installable Software"). This capability is provided with\n\ +the intent of allowing such users to install, extend and update Eclipse-based products.\n\ +Information about packaging Installable Software is available at\n\ +http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\ +\n\ +You may use Provisioning Technology to allow other parties to install Installable Software.\n\ +You shall be responsible for enabling the applicable license agreements relating to the\n\ +Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\ +in accordance with the Specification. By using Provisioning Technology in such a manner and\n\ +making it available in accordance with the Specification, you further acknowledge your\n\ +agreement to, and the acquisition of all necessary rights to permit the following:\n\ +\n\ + 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\ + the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\ + extending or updating the functionality of an Eclipse-based product.\n\ + 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\ + Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\ + 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\ + govern the use of the Installable Software ("Installable Software Agreement") and such\n\ + Installable Software Agreement shall be accessed from the Target Machine in accordance\n\ + with the Specification. Such Installable Software Agreement must inform the user of the\n\ + terms and conditions that govern the Installable Software and must solicit acceptance by\n\ + the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\ + indication of agreement by the user, the provisioning Technology will complete installation\n\ + of the Installable Software.\n\ +\n\ +Cryptography\n\ +\n\ +Content may contain encryption software. The country in which you are\n\ +currently may have restrictions on the import, possession, and use,\n\ +and/or re-export to another country, of encryption software. BEFORE\n\ +using any encryption software, please check the country's laws,\n\ +regulations and policies concerning the import, possession, or use, and\n\ +re-export of encryption software, to see if this is permitted.\n\ +\n\ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n +########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,51 @@ + + +February 1, 2011
+ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+ +Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.
+ +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+ +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:
+ +Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.
+ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ + +The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html + ("Specification").
+ +You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.
+ +Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ + diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/pom.xml --- eclipse-rse-3.1.2/org.eclipse.rse.useractions.sdk-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.useractions.sdk-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000 @@ -0,0 +1,15 @@ + +Eclipse Public License - v 1.0
- -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.
- -1. DEFINITIONS
- -"Contribution" means:
- -a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.
- -"Contributor" means any person or entity that distributes -the Program.
- -"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.
- -"Program" means the Contributions distributed in accordance -with this Agreement.
- -"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.
- -2. GRANT OF RIGHTS
- -a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.
- -b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.
- -c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.
- -d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.
- -3. REQUIREMENTS
- -A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:
- -a) it complies with the terms and conditions of this -Agreement; and
- -b) its license agreement:
- -i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;
- -ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;
- -iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and
- -iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.
- -When the Program is made available in source code form:
- -a) it must be made available under this Agreement; and
- -b) a copy of this Agreement must be included with each -copy of the Program.
- -Contributors may not remove or alter any copyright notices contained -within the Program.
- -Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.
- -4. COMMERCIAL DISTRIBUTION
- -Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.
- -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.
- -5. NO WARRANTY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, -ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.
- -6. DISCLAIMER OF LIABILITY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- -7. GENERAL
- -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.
- -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.
- -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.
- -Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.
- -This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.
- - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/feature.properties 2009-05-13 22:20:47.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# "featureName" property - name of the feature -featureName=RSE WinCE Services (Incubation) - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - DSDP - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=Windows CE connectivity services for the Remote System Explorer (RSE). \ -Requires Microsoft RAPI libraries installed. Includes Source. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2008, 2009 Radoslav Gerganov and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n -########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/feature.xml 2009-05-14 07:55:27.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ - - -March 17, 2005
- -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
- -Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.
- -Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- -The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:
- -Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.
- -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
- -Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. - - diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/epl-v10.html eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/epl-v10.html --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/epl-v10.html 2008-03-27 20:52:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/epl-v10.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ - - - - - - -Eclipse Public License - v 1.0
- -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.
- -1. DEFINITIONS
- -"Contribution" means:
- -a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.
- -"Contributor" means any person or entity that distributes -the Program.
- -"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.
- -"Program" means the Contributions distributed in accordance -with this Agreement.
- -"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.
- -2. GRANT OF RIGHTS
- -a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.
- -b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.
- -c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.
- -d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.
- -3. REQUIREMENTS
- -A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:
- -a) it complies with the terms and conditions of this -Agreement; and
- -b) its license agreement:
- -i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;
- -ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;
- -iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and
- -iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.
- -When the Program is made available in source code form:
- -a) it must be made available under this Agreement; and
- -b) a copy of this Agreement must be included with each -copy of the Program.
- -Contributors may not remove or alter any copyright notices contained -within the Program.
- -Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.
- -4. COMMERCIAL DISTRIBUTION
- -Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.
- -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.
- -5. NO WARRANTY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, -ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.
- -6. DISCLAIMER OF LIABILITY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- -7. GENERAL
- -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.
- -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.
- -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.
- -Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.
- -This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.
- - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/feature.properties 2009-05-13 22:20:51.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/feature.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# feature.properties -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=RSE WinCE Services Source (Incubation) - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - DSDP - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "description" property - description of the feature -description=Windows CE connectivity services for the Remote System Explorer (RSE). \ -Requires Microsoft RAPI libraries installed. - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2008, 2009 Radoslav Gerganov and others.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/legal/epl-v10.html -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n -########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/license.html --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/license.html 2008-03-27 20:52:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplateFeature/license.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ - - - - -March 17, 2005
- -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
- -Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.
- -Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- -The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:
- -Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.
- -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
- -Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. - - diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.html eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.html --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.html 2008-03-27 20:52:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ - - - - -March 27, 2008
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- -This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license -agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the -src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:20:47.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.ini 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.mappings eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.mappings --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.mappings 2008-03-27 20:52:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.mappings 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.properties 2009-02-10 22:15:13.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/about.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=RSE WinCE Services Source (Incubation)\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright Radoslav Gerganov and others 2008, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties 2009-05-14 07:55:27.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -############################################################################### -# Copyright (c) 2008, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber (Wind River) - initial API and implementation -############################################################################### -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 07:55:27.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.rse.wince-feature/sourceTemplatePlugin/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -# NLS_MESSAGEFORMAT_NONE -# NLS_ENCODING=UTF-8 - -pluginName=RSE WinCE Services Source (Incubation) -providerName=Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.test/.classpath eclipse-rse-3.4.2/org.eclipse.test/.classpath --- eclipse-rse-3.1.2/org.eclipse.test/.classpath 2007-11-06 21:03:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.test/.classpath 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ - -
- |
-
Tests | -Failures | -Errors | -Success rate | -Time | -
---|---|---|---|---|
- |
-
- |
-
-
- Note: failures are anticipated and checked for with assertions while errors are unanticipated. - | -
- | Designed for use with JUnit and Ant. | -
-
-
-
-
-
-
-
-June 2, 2006
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.test/build.properties eclipse-rse-3.4.2/org.eclipse.test/build.properties --- eclipse-rse-3.1.2/org.eclipse.test/build.properties 2007-06-06 18:13:19.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.test/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2007 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 -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### - -source.automated.jar =src/ -bin.includes = plugin.properties,\ - *.jar,\ - *.XSL,\ - library.xml,\ - plugin.xml,\ - doc/,\ - runtests*,\ - test.xml,\ - *.html,\ - META-INF/ diff -Nru eclipse-rse-3.1.2/org.eclipse.test/easymock.psf eclipse-rse-3.4.2/org.eclipse.test/easymock.psf --- eclipse-rse-3.1.2/org.eclipse.test/easymock.psf 2008-10-02 18:20:29.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.test/easymock.psf 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ - -- * -className: the name of the testSuite - * -testPluginName: the name of the containing plugin - * haltOnError: halt test on errors? - * haltOnFailure: halt test on failures? - * -testlistener listenerClass: deprecated - * print a warning that this option is deprecated - * formatter: a JUnitResultFormatter given as classname,filename. - * If filename is ommitted, System.out is assumed. - *- */ - public static void main(String[] args) throws IOException { - System.exit(run(args)); - } - public static int run(String[] args) throws IOException { - String className= null; - String testPluginName= null; - - boolean haltError = false; - boolean haltFail = false; - - Properties props = new Properties(); - - int startArgs= 0; - if (args.length > 0) { - // support the JUnit task commandline syntax where - // the first argument is the name of the test class - if (!args[0].startsWith("-")) { - className= args[0]; - startArgs++; - } - } - for (int i= startArgs; i < args.length; i++) { - if (args[i].toLowerCase().equals("-classname")) { - if (i < args.length-1) - className= args[i+1]; - i++; - } else if (args[i].toLowerCase().equals("-testpluginname")) { - if (i < args.length-1) - testPluginName= args[i+1]; - i++; - } else if (args[i].startsWith("haltOnError=")) { - haltError= Project.toBoolean(args[i].substring(12)); - } else if (args[i].startsWith("haltOnFailure=")) { - haltFail = Project.toBoolean(args[i].substring(14)); - } else if (args[i].startsWith("formatter=")) { - try { - createAndStoreFormatter(args[i].substring(10)); - } catch (BuildException be) { - System.err.println(be.getMessage()); - return ERRORS; - } - } else if (args[i].startsWith("propsfile=")) { - FileInputStream in = new FileInputStream(args[i].substring(10)); - props.load(in); - in.close(); - } else if (args[i].equals("-testlistener")) { - System.err.println("The -testlistener option is no longer supported\nuse the formatter= option instead"); - return ERRORS; - } - } - - if (className == null) - throw new IllegalArgumentException("Test class name not specified"); - - JUnitTest t= new JUnitTest(className); - - // Add/overlay system properties on the properties from the Ant project - Hashtable p= System.getProperties(); - for (Enumeration _enum = p.keys(); _enum.hasMoreElements(); ) { - Object key = _enum.nextElement(); - props.put(key, p.get(key)); - } - t.setProperties(props); - - EclipseTestRunner runner= new EclipseTestRunner(t, testPluginName, haltError, haltFail); - transferFormatters(runner); - runner.run(); - return runner.getRetCode(); - } - - /** - * - */ - public EclipseTestRunner(JUnitTest test, String testPluginName, boolean haltOnError, boolean haltOnFailure) { - fJunitTest= test; - fTestPluginName= testPluginName; - fHaltOnError= haltOnError; - fHaltOnFailure= haltOnFailure; - - try { - fSuite= getTest(test.getName()); - } catch(Exception e) { - fRetCode = ERRORS; - fException = e; - } - } - - /** - * Returns the Test corresponding to the given suite. - */ - protected Test getTest(String suiteClassName) throws TestFailedException { - if (suiteClassName.length() <= 0) { - clearStatus(); - return null; - } - Class testClass= null; - try { - testClass= loadSuiteClass(suiteClassName); - } catch (ClassNotFoundException e) { - if (e.getCause() != null) { - runFailed(e.getCause()); - } - String clazz= e.getMessage(); - if (clazz == null) - clazz= suiteClassName; - runFailed("Class not found \""+clazz+"\""); - return null; - } catch(Exception e) { - runFailed(e); - return null; - } - Method suiteMethod= null; - try { - suiteMethod= testClass.getMethod(SUITE_METHODNAME, new Class[0]); - } catch(Exception e) { - // try to extract a test suite automatically - clearStatus(); - return new TestSuite(testClass); - } - if (!Modifier.isStatic(suiteMethod.getModifiers())) { - runFailed("suite() method must be static"); - return null; - } - Test test= null; - try { - test= (Test)suiteMethod.invoke(null, new Class[0]); // static method - if (test == null) - return test; - } - catch (InvocationTargetException e) { - runFailed("Failed to invoke suite():" + e.getTargetException().toString()); - return null; - } - catch (IllegalAccessException e) { - runFailed("Failed to invoke suite():" + e.toString()); - return null; - } - clearStatus(); - return test; - } - - protected void runFailed(String message) throws TestFailedException { - System.err.println(message); - throw new TestFailedException(message); - } - - protected void runFailed(Throwable e) throws TestFailedException { - e.printStackTrace(); - throw new TestFailedException(e); - } - - protected void clearStatus() { - } - - /** - * Loads the class either with the system class loader or a - * plugin class loader if a plugin name was specified - */ - protected Class loadSuiteClass(String suiteClassName) throws ClassNotFoundException { - if (fTestPluginName == null) - return Class.forName(suiteClassName); - Bundle bundle = Platform.getBundle(fTestPluginName); - if (bundle == null) { - throw new ClassNotFoundException(suiteClassName, new Exception("Could not find plugin \"" - + fTestPluginName + "\"")); - } - - //is the plugin a fragment? - Dictionary headers = bundle.getHeaders(); - String hostHeader = (String) headers.get(Constants.FRAGMENT_HOST); - if (hostHeader != null) { - // we are a fragment for sure - // we need to find which is our host - ManifestElement[] hostElement = null; - try { - hostElement = ManifestElement.parseHeader(Constants.FRAGMENT_HOST, hostHeader); - } catch (BundleException e) { - throw new RuntimeException("Could not find host for fragment:" + fTestPluginName,e); - } - Bundle host = Platform.getBundle(hostElement[0].getValue()); - //we really want to get the host not the fragment - bundle = host; - } - - return bundle.loadClass(suiteClassName); - } - - public void run() { -// IPerformanceMonitor pm = PerfMsrCorePlugin.getPerformanceMonitor(true); - - fTestResult= new TestResult(); - fTestResult.addListener(this); - for (int i= 0; i < formatters.size(); i++) { - fTestResult.addListener((TestListener)formatters.elementAt(i)); - } - - long start= System.currentTimeMillis(); - fireStartTestSuite(); - - if (fException != null) { // had an exception in the constructor - for (int i= 0; i < formatters.size(); i++) { - ((TestListener)formatters.elementAt(i)).addError(null, fException); - } - fJunitTest.setCounts(1, 0, 1); - fJunitTest.setRunTime(0); - } else { - ByteArrayOutputStream errStrm = new ByteArrayOutputStream(); - fSystemError= new PrintStream(errStrm); - - ByteArrayOutputStream outStrm = new ByteArrayOutputStream(); - fSystemOut= new PrintStream(outStrm); - - try { -// pm.snapshot(1); // before - fSuite.run(fTestResult); - } finally { - // pm.snapshot(2); // after - fSystemError.close(); - fSystemError= null; - fSystemOut.close(); - fSystemOut= null; - sendOutAndErr(new String(outStrm.toByteArray()), new String(errStrm.toByteArray())); - fJunitTest.setCounts(fTestResult.runCount(), fTestResult.failureCount(), fTestResult.errorCount()); - fJunitTest.setRunTime(System.currentTimeMillis() - start); - } - } - fireEndTestSuite(); - - if (fRetCode != SUCCESS || fTestResult.errorCount() != 0) { - fRetCode = ERRORS; - } else if (fTestResult.failureCount() != 0) { - fRetCode = FAILURES; - } - -// pm.upload(getClass().getName()); - } - - /** - * Returns what System.exit() would return in the standalone version. - * - * @return 2 if errors occurred, 1 if tests failed else 0. - */ - public int getRetCode() { - return fRetCode; - } - - /* - * @see TestListener.addFailure - */ - public void startTest(Test t) {} - - /* - * @see TestListener.addFailure - */ - public void endTest(Test test) {} - - /* - * @see TestListener.addFailure - */ - public void addFailure(Test test, AssertionFailedError t) { - if (fHaltOnFailure) { - fTestResult.stop(); - } - } - - /* - * @see TestListener.addError - */ - public void addError(Test test, Throwable t) { - if (fHaltOnError) { - fTestResult.stop(); - } - } - - private void fireStartTestSuite() { - for (int i= 0; i < formatters.size(); i++) { - ((JUnitResultFormatter)formatters.elementAt(i)).startTestSuite(fJunitTest); - } - } - - private void fireEndTestSuite() { - for (int i= 0; i < formatters.size(); i++) { - ((JUnitResultFormatter)formatters.elementAt(i)).endTestSuite(fJunitTest); - } - } - - public void addFormatter(JUnitResultFormatter f) { - formatters.addElement(f); - } - - /** - * Line format is: formatter=
Last Modified: June 13, 2007
- Introduction
The testing framework is comprised of the org.eclipse.test plugin and the org.eclipse.ant.optional.junit - fragment.
These two projects are available from the dev.eclipse.org repository and are - included in the eclipse-test-framework-<buildId>.zip from the eclipse.org - downloads page.
Building and Installation
Since the org.eclipse.test plugin is stored in the repository in source-code - form, it needs to be compiled before it can be used. The org.eclipse.ant.optional.junit - fragment does not contain any source and can be used as is from the repository.
Setup
-Follow the steps given above to build and install all of the neccessary plugins - and fragments. Please note that the current version of the test framework is - not compatible with the PDE notion of self-hosting. If you want to run the tests, - you will need to setup a full target Eclipse so that the testing framework can - detect everything that is needed.
-If you are writing tests for one or more Eclipse plugins, then you should -create a separate plugin for tests. The test plugin will contain all of the -tests that will be run on your development plugins, as well as defining how -those tests get run.
- -If you are not writing tests for an Eclipse plugin, then you should look into - using JUnit on its own to test your work. JUnit is designed for testing Java - code, and by default has no knowledge of Eclipse. There are separate mechanisms - for using JUnit on Java code in Eclipse. See the documentation provided here:
-
-JUnit Support in Eclipse
-
- Using JUnit
Once a test plugin has been created, you must then create an Ant script that - will run all of the tests. Create a file called 'test.xml' in the root of your plug-in or bundle. - This is an Ant file that defines how each test is going to be run. The 'test.xml' - file is like a DOS batch file that scripts the entire testing process. Typically, - the 'test.xml' file will contain targets for setting up the test run, executing - the tests, cleaning up afterwards, and running the entire process.
- -Converting existing Test Suites
- -If you are converting an existing set of tests to use the new framework, the -actual tests that have been written should not need much change.
-If you have tests in multiple plugins, move these to a single test plug-in for your component.
- -Make sure that the tests are defined in a plug-in. This is probably the most - common cause of confusion in the entire test process. Your tests need to be - in a plug-in so that Eclipse can find them when it tries to load them.
- -Creating new Test Suites
- -Creating new JUnit tests for an Eclipse plugin should be no more difficult - than writing standard JUnit tests. Since the framework allows tests to be run - inside of a working Eclipse, any tests that you write have available to them - any of the methods supplied by the Eclipse platform, provided that you add the - appropriate dependencies to your tests' manifest.
- -Performance Issues
-You should keep in mind the number of times that Eclipse needs to be -started. Launching Eclipse has a substantial cost in terms of runtime. To -minimize the number of times the platform is started, you should consider -writing a TestSuite called AllTests for each of your test plugins. AllTests -should invoke each of the tests that you want to run for a particular plugin. -The 'test.xml' file can then run the AllTests class, which will run all of your -tests, but the platform will only ever be started once for each of your test -plugins.
Note: Sometimes tests involve shutting down, restarting, and testing the state - of metadata that was written to disk. These session tests will require Eclipse - to be launched several times in sequence, which will increase the runtime of - your tests. This cannot be avoided.
- -
Running the Test Suite from the UI
Right click on the test.xml file and select 'Run Ant...' from the pull-down - menu. The Running Ant dialog box pops up. From the list of targets, select the - one that runs all of your tests. If you are using the example file provided - below, this target is called 'Run', and will be selected by default. Hit the - 'Finish' button to start the test process.
- -Running the Test Suite from the command line
-When the test suites are invoked automatically, they are run from command -line. From the ${eclipse-home} directory, the command to use is:
-java -jar plugins\org.eclipse.equinox.launcher_<version>.jar -application org.eclipse.ant.core.antRunner -buildfile ${test-plugin-path}\test.xml
--Declipse-home=${eclipse-home} -Dos=<operating system> -Dws=<windowing system> -Darch=<architecture>
-
-Individual tests can also be invoked directly. From the ${eclipse-home} -directory, use the command:
java -jar plugins\org.eclipse.equinox.launcher_<version>.jar
- -application ${launcher} -os <operating system> -ws <windowing system> -arch <architecture> -dev bin -testpluginname ${plugin-name}
--classname ${test-classname} formattter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,<path to output file with .xml extension>
-where ${launcher} is one of: org.eclipse.test.uitestapplication or org.eclipse.test.coretestapplication - depending on whether or not you want to run your tests within an active Workbench.
Output
By default, output from each test run is logged as XML. For each test that - is run, the output is logged into the file called ${classname}.xml. The individual - XML files are located in the ${eclipse-home} directory. When the test run is - finished, you can call the "collect" target in the library - file, which will collect the XML into a single file. See below for an example - of how to use this target correctly.
- -Many plugin tests will not need the Workbench active in order to run. Indeed, - only the minimum number of plugins needed to run the plugin being tested need - to be present when testing in a target Eclipse. There are two different Ant - targets provided for running Eclipse plugin tests. One target starts the entire - Workbench. The other starts Eclipse with the minimum number of plugins needed. - It is up to you to decide which target is most appropriate. For examples, look - at the "ui-test" and "core-test" targets below.
- -Some low-level tests for the Eclipse platform take actions that are not -normally possible inside of Eclipse. An example of this behaviour would be -disposing the display. While this action can be performed while running the UI, -it will also kill the UI for the copy of Eclipse that is running, and cause -errors when the Workbench tries to shutdown. If you need to test disposing the -display, or other similar actions, your tests should be running without a UI.
- -It is very easy to forget to define your tests inside of a plugin. If your - tests will not load properly, make sure that a plug-in manifest exists in your - test project, and also that the plugin is being loaded by the platform. Make - sure that all of the dependencies are satisfied for your test plugin.
- -Interface
The org.eclipse.test plugin defines many useful Ant tasks/targets to aid developers - in writing their test.xml scripts. Currently, there is only Ant targets defined, - which can be called using Ant's built-in <ant> task. To use these targets, - add the following line to the top of your script, and reference the ${library-file} - property when calling <ant>:
<property name="library-file"
-value="${eclipse-home}/fragments/org.eclipse.test/library.xml"/>
-
-The targets that are defined are:
For example, the following code will run the test
-org.eclipse.foo.bar.MyTest in the plugin org.eclipse.foo in a new Eclipse
-workbench. It passes the string "-Dbaz=true" to the VM. The Eclipse
-stores its metadata in the directory "data-folder".
-
-
-
-
-<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="data-folder"/>
- <property name="plugin-name" value="org.eclipse.foo"/>
- <property name="classname" value="org.eclipse.foo.bar.MyTest"/>
- <property name="vmargs" value="-Dbaz=true"/>
-</ant>
-
For example, the following code will run the test
-org.eclipse.foo.bar.MyTest in the plugin org.eclipse.foo in a headless Eclipse.
-It passes the string "-Dbaz=true" to the VM. The Eclipse stores its
-metadata in the directory "data-folder".
-
-
-
-
-<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="data-folder"/>
- <property name="plugin-name" value="org.eclipse.foo"/>
- <property name="classname" value="org.eclipse.foo.bar.MyTest"/>
- <property name="vmargs" value="-Dbaz=true"/>
-</ant>
-
For example, the following code collects all of the files
-matching the pattern "org*.xml" in the directory ${eclipse-home},
-into the file named "logfile.xml".
-
-
-
-
-
-<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="logfile.xml"/>
-</ant>
-
Included is the 'test.xml' file from the org.eclipse.jdt.ui.tests.refactoring plugin. This -file controls all of the automated testing that is done for the org.eclipse.jdt.ui.tests.refactoring -plugin. It can be run from inside of Eclipse or from the command line. It is -intended to serve as a template file for testing any other plugin.
Notice that the structure of the file roughly mirrors that of a JUnit test. -Targets are defined for setting up the tests, defining what needs to be done, -cleaning up after the tests, and running everything in the right order.
-
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.jdt.ui.tests.refactoring"/>
- <property name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="refactoring-folder"
- value="${eclipse-home}/refactoring_folder"/>
- <delete dir="${refactoring-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${refactoring-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname"
- value="org.eclipse.jdt.ui.tests.refactoring.all.AllAllRefactoringTests"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
- </project>
-
-
-Ant 1.3 has some issues when used with the <style> tag and absolute
-paths. Also, any tests that use the System.exit()
call will not
-log their output properly when using Ant 1.3.
The test suites need to know where the root of the eclipse install is on the -file system (the ECLIPSE_HOME variable). However, this variable is only defined -in JDT. The ${eclipse-home} property can be set to a reasonable default inside -of the test.xml script. Then tests can be run from the standard Ant window, -without having to specify -Declipse-home=%ECLIPSE_HOME%. If a value for -${eclipse-home} does get passed in, the default (specified in test.xml) gets -overridden. The parameter is passed in by the build mechanism. For most cases, -the value "${basedir}/../.." is a reasonable default.
org.eclipse.test should provide Ant tasks, not template scripts.
When you run a TestSuite using the standard JUnit, it normally outputs a -series of dots to the console so that you can track the TestSuite's progress. -It is not possible to add this feature to the automated testing process at this -point in time.
Ant expects there to be a java executable on the system path. Furthermore, the executable
-must be a real file, not a symbolic link. If the test framework is throwing an exception
-java.io.IOException: java: not found
, ensure that the java executable is on
-your system path.
The testing framework currently has no knowledge of PDE. In order to run the automated -you must be running a self hosting environment with a full development and target Eclipse.
- - - - diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/.project eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/.project --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/.project 2006-09-21 22:10:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/.project 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - -Eclipse Public License - v 1.0
- -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE -PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR -DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS -AGREEMENT.
- -1. DEFINITIONS
- -"Contribution" means:
- -a) in the case of the initial Contributor, the initial -code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program -originate from and are distributed by that particular Contributor. A -Contribution 'originates' from a Contributor if it was added to the -Program by such Contributor itself or anyone acting on such -Contributor's behalf. Contributions do not include additions to the -Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) -are not derivative works of the Program.
- -"Contributor" means any person or entity that distributes -the Program.
- -"Licensed Patents" mean patent claims licensable by a -Contributor which are necessarily infringed by the use or sale of its -Contribution alone or when combined with the Program.
- -"Program" means the Contributions distributed in accordance -with this Agreement.
- -"Recipient" means anyone who receives the Program under -this Agreement, including all Contributors.
- -2. GRANT OF RIGHTS
- -a) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free copyright license to reproduce, prepare derivative works -of, publicly display, publicly perform, distribute and sublicense the -Contribution of such Contributor, if any, and such derivative works, in -source code and object code form.
- -b) Subject to the terms of this Agreement, each -Contributor hereby grants Recipient a non-exclusive, worldwide, -royalty-free patent license under Licensed Patents to make, use, sell, -offer to sell, import and otherwise transfer the Contribution of such -Contributor, if any, in source code and object code form. This patent -license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, -such addition of the Contribution causes such combination to be covered -by the Licensed Patents. The patent license shall not apply to any other -combinations which include the Contribution. No hardware per se is -licensed hereunder.
- -c) Recipient understands that although each Contributor -grants the licenses to its Contributions set forth herein, no assurances -are provided by any Contributor that the Program does not infringe the -patent or other intellectual property rights of any other entity. Each -Contributor disclaims any liability to Recipient for claims brought by -any other entity based on infringement of intellectual property rights -or otherwise. As a condition to exercising the rights and licenses -granted hereunder, each Recipient hereby assumes sole responsibility to -secure any other intellectual property rights needed, if any. For -example, if a third party patent license is required to allow Recipient -to distribute the Program, it is Recipient's responsibility to acquire -that license before distributing the Program.
- -d) Each Contributor represents that to its knowledge it -has sufficient copyright rights in its Contribution, if any, to grant -the copyright license set forth in this Agreement.
- -3. REQUIREMENTS
- -A Contributor may choose to distribute the Program in object code -form under its own license agreement, provided that:
- -a) it complies with the terms and conditions of this -Agreement; and
- -b) its license agreement:
- -i) effectively disclaims on behalf of all Contributors -all warranties and conditions, express and implied, including warranties -or conditions of title and non-infringement, and implied warranties or -conditions of merchantability and fitness for a particular purpose;
- -ii) effectively excludes on behalf of all Contributors -all liability for damages, including direct, indirect, special, -incidental and consequential damages, such as lost profits;
- -iii) states that any provisions which differ from this -Agreement are offered by that Contributor alone and not by any other -party; and
- -iv) states that source code for the Program is available -from such Contributor, and informs licensees how to obtain it in a -reasonable manner on or through a medium customarily used for software -exchange.
- -When the Program is made available in source code form:
- -a) it must be made available under this Agreement; and
- -b) a copy of this Agreement must be included with each -copy of the Program.
- -Contributors may not remove or alter any copyright notices contained -within the Program.
- -Each Contributor must identify itself as the originator of its -Contribution, if any, in a manner that reasonably allows subsequent -Recipients to identify the originator of the Contribution.
- -4. COMMERCIAL DISTRIBUTION
- -Commercial distributors of software may accept certain -responsibilities with respect to end users, business partners and the -like. While this license is intended to facilitate the commercial use of -the Program, the Contributor who includes the Program in a commercial -product offering should do so in a manner which does not create -potential liability for other Contributors. Therefore, if a Contributor -includes the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and -indemnify every other Contributor ("Indemnified Contributor") -against any losses, damages and costs (collectively "Losses") -arising from claims, lawsuits and other legal actions brought by a third -party against the Indemnified Contributor to the extent caused by the -acts or omissions of such Commercial Contributor in connection with its -distribution of the Program in a commercial product offering. The -obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In -order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the -Commercial Contributor to control, and cooperate with the Commercial -Contributor in, the defense and any related settlement negotiations. The -Indemnified Contributor may participate in any such claim at its own -expense.
- -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those -performance claims and warranties, and if a court requires any other -Contributor to pay any damages as a result, the Commercial Contributor -must pay those damages.
- -5. NO WARRANTY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS -OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, -ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely -responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to -the risks and costs of program errors, compliance with applicable laws, -damage to or loss of data, programs or equipment, and unavailability or -interruption of operations.
- -6. DISCLAIMER OF LIABILITY
- -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT -NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED -HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- -7. GENERAL
- -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further action -by the parties hereto, such provision shall be reformed to the minimum -extent necessary to make such provision valid and enforceable.
- -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other -software or hardware) infringes such Recipient's patent(s), then such -Recipient's rights granted under Section 2(b) shall terminate as of the -date such litigation is filed.
- -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of time -after becoming aware of such noncompliance. If all Recipient's rights -under this Agreement terminate, Recipient agrees to cease use and -distribution of the Program as soon as reasonably practicable. However, -Recipient's obligations under this Agreement and any licenses granted by -Recipient relating to the Program shall continue and survive.
- -Everyone is permitted to copy and distribute copies of this -Agreement, but in order to avoid inconsistency the Agreement is -copyrighted and may only be modified in the following manner. The -Agreement Steward reserves the right to publish new versions (including -revisions) of this Agreement from time to time. No one other than the -Agreement Steward has the right to modify this Agreement. The Eclipse -Foundation is the initial Agreement Steward. The Eclipse Foundation may -assign the responsibility to serve as the Agreement Steward to a -suitable separate entity. Each new version of the Agreement will be -given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version -of the Agreement is published, Contributor may elect to distribute the -Program (including its Contributions) under the new version. Except as -expressly stated in Sections 2(a) and 2(b) above, Recipient receives no -rights or licenses to the intellectual property of any Contributor under -this Agreement, whether expressly, by implication, estoppel or -otherwise. All rights in the Program not expressly granted under this -Agreement are reserved.
- -This Agreement is governed by the laws of the State of New York and -the intellectual property laws of the United States of America. No party -to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its -rights to a jury trial in any resulting litigation.
- - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/feature.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/feature.properties 2009-05-13 22:22:14.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -# feature.properties -# contains externalized strings for feature.xml -# "%foo" in feature.xml corresponds to the key "foo" in this file -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file should be translated. - -# "featureName" property - name of the feature -featureName=Target Management Service Discovery - -# "description" property - description of the feature -description=A framework and Zeroconf / DNS-SD based implementation for \ -detecting remote network services. Includes Source. - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse.org - DSDP - -# "tmUpdateSiteName" property - label for the update site -tmUpdateSiteName=Target Management Updates - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2006, 2009 Symbian Software Ltd. and others. All rights reserved.\n\ -This program and the accompanying materials are made available under the terms\n\ -of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\ -available at http://www.eclipse.org/legal/epl-v10.html\n\ -\n\ -Contributors:\n\ -Javier Montalvo Orús (Symbian) - initial API and implementation\n\ -Martin Oberhuber (Wind River) - externalized strings, fixed build.properties, feature.xml\n -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=license.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\ -March 17, 2005\n\ -\n\ -Usage Of Content\n\ -\n\ -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\ -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\ -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\ -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\ -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\ -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\ -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\ -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\ -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\ -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\ -BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\ -\n\ -Applicable Licenses\n\ -\n\ -Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\ -is provided to you under the terms and conditions of the Eclipse Public\n\ -License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\ -Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\ -For purposes of the EPL, "Program" will mean the Content.\n\ -\n\ -Content includes, but is not limited to, source code, object code,\n\ -documentation and other files maintained in the Eclipse.org CVS\n\ -repository ("Repository") in CVS modules ("Modules") and made available\n\ -as downloadable archives ("Downloads").\n\ -\n\ - - Content may be structured and packaged into modules to facilitate delivering,\n\ - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\ - plug-in fragments ("Fragments"), and features ("Features").\n\ - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\ - in a directory named "plugins".\n\ - - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\ - Each Feature may be packaged as a sub-directory in a directory named "features".\n\ - Within a Feature, files named "feature.xml" may contain a list of the names and version\n\ - numbers of the Plug-ins and/or Fragments associated with that Feature.\n\ - - Features may also include other Features ("Included Features"). Within a Feature, files\n\ - named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\ -\n\ -Features may also include other Features ("Included Features"). Files named\n\ -"feature.xml" may contain a list of the names and version numbers of\n\ -Included Features.\n\ -\n\ -The terms and conditions governing Plug-ins and Fragments should be\n\ -contained in files named "about.html" ("Abouts"). The terms and\n\ -conditions governing Features and Included Features should be contained\n\ -in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\ -Licenses may be located in any directory of a Download or Module\n\ -including, but not limited to the following locations:\n\ -\n\ - - The top-level (root) directory\n\ - - Plug-in and Fragment directories\n\ - - Inside Plug-ins and Fragments packaged as JARs\n\ - - Sub-directories of the directory named "src" of certain Plug-ins\n\ - - Feature directories\n\ -\n\ -Note: if a Feature made available by the Eclipse Foundation is installed using the\n\ -Eclipse Update Manager, you must agree to a license ("Feature Update\n\ -License") during the installation process. If the Feature contains\n\ -Included Features, the Feature Update License should either provide you\n\ -with the terms and conditions governing the Included Features or inform\n\ -you where you can locate them. Feature Update Licenses may be found in\n\ -the "license" property of files named "feature.properties". Such Abouts,\n\ -Feature Licenses and Feature Update Licenses contain the terms and\n\ -conditions (or references to such terms and conditions) that govern your\n\ -use of the associated Content in that directory.\n\ -\n\ -THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\ -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ -\n\ - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ - - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\ - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\ - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\ -\n\ -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\ -TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\ -is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\ -govern that particular Content.\n\ -\n\ -Cryptography\n\ -\n\ -Content may contain encryption software. The country in which you are\n\ -currently may have restrictions on the import, possession, and use,\n\ -and/or re-export to another country, of encryption software. BEFORE\n\ -using any encryption software, please check the country's laws,\n\ -regulations and policies concerning the import, possession, or use,\n\ -and re-export of encryption software, to see if this is permitted.\n\ -\n\ -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n -########### end of license property ########################################## diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/feature.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/feature.xml 2009-05-14 07:54:31.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,178 +0,0 @@ - - -March 17, 2005
- -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS - (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND - CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE - OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR - NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND - CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
- -Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.
- -Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS - modules ("Modules") and made available as downloadable archives ("Downloads").
- -The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and -Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations:
- -Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the -installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or -inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in -that directory.
- -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE -OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- -IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please -contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
- -Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is permitted.
- -Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. - - diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html 2007-05-29 20:26:54.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ - - - - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- -This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license -agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the -src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:22:12.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.ini 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings 2006-09-21 22:10:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.mappings 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties 2009-02-10 22:10:29.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/about.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=Target Management Service Discovery Source\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright Symbian Software Ltd. and others 2006, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties 2009-05-14 07:54:31.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/ -sourcePlugin = true Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties 2009-05-14 07:54:31.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery-feature/sourceTemplatePlugin/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -pluginName=Target Management Service Discovery Source -providerName=Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/.cvsignore --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/.cvsignore 2007-06-11 11:01:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -bin -index -build.xml -javadoc.link.location -temp.bin.log -temp.convert.txt -temp.options.txt diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/.project eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/.project --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/.project 2007-06-11 11:01:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/.project 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/book.css eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/book.css --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/book.css 2007-06-11 11:01:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/book.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -P.Code { - display: block; - text-align: left; - text-indent: 0.00pt; - margin-top: 0.000000pt; - margin-bottom: 0.000000pt; - margin-right: 0.000000pt; - margin-left: 15pt; - font-size: 10.000000pt; - font-weight: normal; - font-style: normal; - color: #4444CC; - text-decoration: none; - vertical-align: baseline; - text-transform: none; - font-family: "Courier New", Courier, monospace; -} -H6.CaptionFigColumn { - display: block; - text-align: left; - text-indent: 0.000000pt; - margin-top: 3.000000pt; - margin-bottom: 11.000000pt; - margin-right: 0.000000pt; - margin-left: 0.000000pt; - font-size: 9.000000pt; - font-weight: bold; - font-style: Italic; - color: #000000; - text-decoration: none; - vertical-align: baseline; - text-transform: none; -} -P.Note { - display: block; - text-align: left; - text-indent: 0pt; - margin-top: 19.500000pt; - margin-bottom: 19.500000pt; - margin-right: 0.000000pt; - margin-left: 30pt; - font-size: 11.000000pt; - font-weight: normal; - font-style: Italic; - color: #000000; - text-decoration: none; - vertical-align: baseline; - text-transform: none; -} -EM.UILabel { - font-weight: Bold; - font-style: normal; - text-decoration: none; - vertical-align: baseline; - text-transform: none; -} -EM.CodeName { - font-weight: Bold; - font-style: normal; - text-decoration: none; - vertical-align: baseline; - text-transform: none; - font-family: "Courier New", Courier, monospace; -} - -body, html { border: 0px } - - -/* following font face declarations need to be removed for DBCS */ - -body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000} -pre { font-family: "Courier New", Courier, monospace;} - -/* end font face declarations */ - -/* following font size declarations should be OK for DBCS */ -body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; } -pre { font-size: 10pt} - -/* end font size declarations */ - -body { background: #FFFFFF; margin-bottom: 1em } -h1 { font-size: 18pt; margin-top: 5; margin-bottom: 1 } -h2 { font-size: 14pt; margin-top: 25; margin-bottom: 3 } -h3 { font-size: 11pt; margin-top: 20; margin-bottom: 3 } -h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic } -p { margin-top: 10px; margin-bottom: 10px } -pre { margin-left: 6; font-size: 9pt; color: #4444CC } -a:link { color: #0000FF } -a:hover { color: #000080 } -a:visited { text-decoration: underline } -ul { margin-top: 10px; margin-bottom: 10px; } -li { margin-top: 5px; margin-bottom: 5px; } -li p { margin-top: 5px; margin-bottom: 5px; } -ol { margin-top: 10px; margin-bottom: 10px; } -dl { margin-top: 10px; margin-bottom: 10px; } -dt { margin-top: 5px; margin-bottom: 5px; font-weight: bold; } -dd { margin-top: 5px; margin-bottom: 5px; } -strong { font-weight: bold} -em { font-style: italic} -var { font-style: italic} -div.revision { border-left-style: solid; border-left-width: thin; - border-left-color: #7B68EE; padding-left:5 } -th { font-weight: bold } - -a.command-link { -} -a.command-link img { - border-width: 0px; - border-style: none; - vertical-align: middle; -} diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/build.properties 2008-02-12 22:38:30.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2007 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 -# -# Contributors: -# IBM Corporation - initial API and implementation -# Martin Oberhuber (Wind River) - Declare API provisional -############################################################################### -bin.includes = META-INF/,\ - about.html,\ - book.css,\ - notices.html,\ - plugin.properties,\ - plugin.xml,\ - schema.css,\ - toc.xml,\ - guide/,\ - icons/,\ - index/,\ - reference/,\ - provisional_api.html -customBuildCallbacks = customBuildCallbacks.xml diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/buildDoc.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/buildDoc.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/buildDoc.xml 2009-05-14 07:52:52.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/buildDoc.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ - - -
-Device represents a machine with a unique address in the network.
-It can contain as well a name for easier identification.
-A device contains a list of service types.
-
-
-Service discovery stores the information in a EMF model as following: -
- --
-The service discovery engine will fill this model using the provided protocol and transport implementations, and can be accessed after using the standard EMF methods. -
- - - - diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/guide/network.html eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/guide/network.html --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/guide/network.html 2007-06-11 11:01:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/guide/network.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - - - -
-The Network is the top level or root of the discovered services model.
-It contains a list of devices
-
-
-
-Each service can contain multiple pairs of keys and values to provide extra information about the service.
-
-Using service discovery with the Remote System Explorer requires a "tranport" key matching the transport specified in org.eclipse.rse.core.subsystemConfigurations. -
- --
-It specifies the protocol that will be used to interact with the remote devices.
-Protocols have to be specified as extensions of org.eclipse.tm.discovery.engine.discoveryProtocol.
-
-Examples of discovery protocols are: -
-Service represents a discovered service available in the remote device grouped under a common service type.
-
-
-A service type represents a group of services of the same kind discovered in the parent device.
-Service type names should follow standard service names whenever possible.
-
-
-Transport defines how the remote devices are accessed to be queried for available services.
-Transports have to be specified as extensions of org.eclipse.tm.discovery.engine.discoveryTransport.
-
-Examples of transport are: -
-Perform service discovery session: -
-- -int timeout = 500; // milliseconds -String query = "_services._dns-sd._udp.local."; //DNS-SD query - -//instantiate protocol by name attribute -IProtocol protocol = ProtocolFactory.getProtocol("DNS-SD"); - -//instantiate transport by name attribute -ITransport transport = TransportFactory.getTransport("UDP", "224.0.0.251", timeout); - -//get engine instance and kick off discovery -ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getInstance(); -serviceDiscoveryEngine.doServiceDiscovery(query, protocol,transport); - --
-Access EMF model: -
-- -//get engine instance -ServiceDiscoveryEngine serviceDiscoveryEngine = ServiceDiscoveryEngine.getInstance(); - -//access org.eclipse.emf.ecore.resource.Resource -Resource model = serviceDiscoveryEngine.getResource(); - -- - - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/guide/view.html eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/guide/view.html --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/guide/view.html 2007-06-11 11:01:36.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/guide/view.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ - - - - - - - -
-The Discovery view can be used to test new extensions and discover available services using the existing protocol and transport implementations.
-It can be accessed through the view "Service Discovery" -> "Service Discovery Properties".
-
-In the view, it's possible launching a wizard to select the protocol and transport to be used:
-
-
-And inspect the discovered services and their attributes: -
--
-Since the same model is used, launching multiple times the wizard adds new discovered services to the same model, even using different protocols and transports. -
- - - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/notices.html eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/notices.html --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/notices.html 2007-06-11 11:03:06.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/notices.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - - - - - - --The material in this guide is Copyright (c) 2007 Symbian Software Ltd. and others. -
--Terms and conditions regarding the use of this guide. -
- - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/options.txt eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/options.txt --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.doc.isv/options.txt 2007-06-11 11:03:06.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.doc.isv/options.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ --quiet --encoding "iso-8859-1" --charset "iso-8859-1" --source 1.4 --sourcepath "../org.eclipse.tm.discovery.engine/src -;../org.eclipse.tm.discovery.model/src -;../org.eclipse.tm.discovery.model.edit/src -;../org.eclipse.tm.discovery.protocol.dnssd/src -;../org.eclipse.tm.discovery.transport.udp/src -;../org.eclipse.tm.discovery.view/src -;../org.eclipse.tm.discovery.wizard/src -;../org.eclipse.rse.discovery/src" --d reference/api --bootclasspath @rt@ --classpath @cp@ -;../org.eclipse.rse.core/@dot -;../org.eclipse.rse.core/bin -;../org.eclipse.rse.ui/@dot -;../org.eclipse.rse.ui/bin --breakiterator --tag generated:X --tag lastgen:X --tag model:X --tag ordered:X --use --splitIndex --windowtitle "TM Service Discovery API Specification" --doctitle "TM Service Discovery API Specification" --header "TM Service DiscoveryAlthough Service Discovery API has been reviewed, we want to give the -Open Source Communitiy a chance to provide public -feedback and help further improving the APIs. Therefore,
- -As of Service Discovery 2.0, all API is considered provisional.
- -This means, that we reserve the right to change any API after -Service Discovery 2.0 in a not backward compatible way. -We will make every sensible effort to keep at least Source API -Compatibility intact, but in cases where this would lead to unnecessary -code bloat we will go with API breakage. -All such API changes will be voted on by committers on the -dsdp-tm-dev developer mailing list, and documented in a migration guide -for future releases. We expect that with Community Feedback, we'll reach a -stable, hardened API for Service Discovery 3.0. Please give your feedback on -Eclipse Bugzilla -under category DSDP, Product Target Management.
-The following extension points can be used to extend the capabilities of the - Service Discovery infrastructure:
-June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.ini eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.ini --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.ini 2009-05-13 22:22:08.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.ini 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# about.ini -# contains information about a feature -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# "%key" are externalized strings defined in about.properties -# This file does not need to be translated. - -# Property "aboutText" contains blurb for "About" dialog (translated) -aboutText=%blurb - -# Property "windowImage" contains path to window icon (16x16) -# needed for primary features only - -# Property "featureImage" contains path to feature image (32x32) -featureImage=dsdp32.png - -# Property "aboutImage" contains path to product image (500x330 or 115x164) -# needed for primary features only - -# Property "appName" contains name of the application (not translated) -# needed for primary features only - -# Property "welcomePage" contains path to welcome page (special XML-based format) -# optional - -# Property "welcomePerspective" contains the id of the perspective in which the -# welcome page is to be opened. -# optional \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.mappings eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.mappings --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.mappings 2006-09-28 15:11:26.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.mappings 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# about.mappings -# contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. - -0=@build@ \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/about.properties 2009-02-10 22:10:23.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/about.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ -# about.properties -# contains externalized strings for about.ini -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# fill-ins are supplied by about.mappings -# This file should be translated. -# -# Do not translate any values surrounded by {} - -blurb=Target Management Service Discovery\n\ -\n\ -Version: {featureVersion}\n\ -Build id: {0}\n\ -\n\ -(c) Copyright Symbian Software Ltd. and others 2006, 2009. All rights reserved.\n\ -Visit http://www.eclipse.org/dsdp/tm diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/build.properties 2009-05-25 21:22:02.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2009 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - plugin.xml,\ - .,\ - about.ini,\ - about.mappings,\ - about.properties,\ - dsdp32.png -src.includes = schema/,\ - about.html Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/dsdp32.png differ diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/plugin.properties 2009-05-14 07:53:18.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery Engine -providerName = Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.engine/plugin.xml 2007-02-21 18:52:30.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.engine/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/build.properties 2009-05-25 21:21:51.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - src/,\ - .,\ - plugin.xml -src.includes = ecore/,\ - about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel 2006-09-07 10:55:57.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/ecore/discoveryModel.genmodel 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - -- * The following features are supported: - *
- * The following features are supported: - *
- * The following features are supported: - *
- * The following features are supported: - *
- * The following features are supported: - *
- * The following features are implemented: - *
Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * - * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.tm.discovery.model.ModelPackage#eNS_URI - * @see #init() - * @generated - */ - private ModelPackageImpl() { - super(eNS_URI, ModelFactory.eINSTANCE); - } - - /** - * - * @generated - */ - private static boolean isInited = false; - - /** - * Creates, registers, and initializes the Package for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - *
Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - *
Invocation of this method will not affect any packages that have - * already been initialized. - * @return the model package - * - * @see #eNS_URI - * @see #createPackageContents() - * @see #initializePackageContents() - * @generated - */ - public static ModelPackage init() { - if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI); - - // Obtain or create and register package - ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ModelPackageImpl()); - - isInited = true; - - // Initialize simple dependencies - XMLTypePackage.eINSTANCE.eClass(); - - // Create package meta-data objects - theModelPackage.createPackageContents(); - - // Initialize created meta-data - theModelPackage.initializePackageContents(); - - // Mark meta-data to indicate it can't be changed - theModelPackage.freeze(); - - return theModelPackage; - } - - /** - * - * @generated - */ - public EClass getDevice() { - return deviceEClass; - } - - /** - * - * @generated - */ - public EReference getDevice_ServiceType() { - return (EReference)deviceEClass.getEStructuralFeatures().get(0); - } - - /** - * - * @generated - */ - public EAttribute getDevice_Address() { - return (EAttribute)deviceEClass.getEStructuralFeatures().get(1); - } - - /** - * - * @generated - */ - public EAttribute getDevice_Name() { - return (EAttribute)deviceEClass.getEStructuralFeatures().get(2); - } - - /** - * - * @generated - */ - public EClass getNetwork() { - return networkEClass; - } - - /** - * - * @generated - */ - public EReference getNetwork_Device() { - return (EReference)networkEClass.getEStructuralFeatures().get(0); - } - - /** - * - * @generated - */ - public EClass getPair() { - return pairEClass; - } - - /** - * - * @generated - */ - public EAttribute getPair_Key() { - return (EAttribute)pairEClass.getEStructuralFeatures().get(0); - } - - /** - * - * @generated - */ - public EAttribute getPair_Value() { - return (EAttribute)pairEClass.getEStructuralFeatures().get(1); - } - - /** - * - * @generated - */ - public EClass getService() { - return serviceEClass; - } - - /** - * - * @generated - */ - public EReference getService_Pair() { - return (EReference)serviceEClass.getEStructuralFeatures().get(0); - } - - /** - * - * @generated - */ - public EAttribute getService_Name() { - return (EAttribute)serviceEClass.getEStructuralFeatures().get(1); - } - - /** - * - * @generated - */ - public EClass getServiceType() { - return serviceTypeEClass; - } - - /** - * - * @generated - */ - public EReference getServiceType_Service() { - return (EReference)serviceTypeEClass.getEStructuralFeatures().get(0); - } - - /** - * - * @generated - */ - public EAttribute getServiceType_Name() { - return (EAttribute)serviceTypeEClass.getEStructuralFeatures().get(1); - } - - /** - * - * @generated - */ - public ModelFactory getModelFactory() { - return (ModelFactory)getEFactoryInstance(); - } - - /** - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * - * @generated - */ - public void createPackageContents() { - if (isCreated) return; - isCreated = true; - - // Create classes and their features - deviceEClass = createEClass(DEVICE); - createEReference(deviceEClass, DEVICE__SERVICE_TYPE); - createEAttribute(deviceEClass, DEVICE__ADDRESS); - createEAttribute(deviceEClass, DEVICE__NAME); - - networkEClass = createEClass(NETWORK); - createEReference(networkEClass, NETWORK__DEVICE); - - pairEClass = createEClass(PAIR); - createEAttribute(pairEClass, PAIR__KEY); - createEAttribute(pairEClass, PAIR__VALUE); - - serviceEClass = createEClass(SERVICE); - createEReference(serviceEClass, SERVICE__PAIR); - createEAttribute(serviceEClass, SERVICE__NAME); - - serviceTypeEClass = createEClass(SERVICE_TYPE); - createEReference(serviceTypeEClass, SERVICE_TYPE__SERVICE); - createEAttribute(serviceTypeEClass, SERVICE_TYPE__NAME); - } - - /** - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Obtain other dependent packages - XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI); - - // Add supertypes to classes - - // Initialize classes and features; add operations and parameters - initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getDevice_ServiceType(), this.getServiceType(), null, "serviceType", null, 1, -1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getDevice_Address(), theXMLTypePackage.getString(), "address", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getDevice_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Device.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(networkEClass, Network.class, "Network", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getNetwork_Device(), this.getDevice(), null, "device", null, 1, -1, Network.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(pairEClass, Pair.class, "Pair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getPair_Key(), theXMLTypePackage.getString(), "key", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPair_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Pair.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getService_Pair(), this.getPair(), null, "pair", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getService_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - initEClass(serviceTypeEClass, ServiceType.class, "ServiceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getServiceType_Service(), this.getService(), null, "service", null, 1, -1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getServiceType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, ServiceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - - // Create resource - createResource(eNS_URI); - - // Create annotations - // http:///org/eclipse/emf/ecore/util/ExtendedMetaData - createExtendedMetaDataAnnotations(); - } - - /** - * Initializes the annotations for http:///org/eclipse/emf/ecore/util/ExtendedMetaData. - * - * @generated - */ - protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ - addAnnotation - (deviceEClass, - source, - new String[] { - "name", "Device", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getDevice_ServiceType(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "ServiceType" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getDevice_Address(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "address" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getDevice_Name(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (networkEClass, - source, - new String[] { - "name", "Network", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getNetwork_Device(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "Device" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (pairEClass, - source, - new String[] { - "name", "Pair", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "empty" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getPair_Key(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "key" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getPair_Value(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "value" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (serviceEClass, - source, - new String[] { - "name", "Service", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getService_Pair(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "Pair" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getService_Name(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (serviceTypeEClass, - source, - new String[] { - "name", "ServiceType", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getServiceType_Service(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "Service" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getServiceType_Name(), - source, - new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); - } - -} //ModelPackageImpl diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java 2007-02-21 18:52:22.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/impl/NetworkImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Javier Montalvo Orus (Symbian) - initial API and implementation - ********************************************************************************/ - -package org.eclipse.tm.internal.discovery.model.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.EObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.tm.discovery.model.Device; -import org.eclipse.tm.discovery.model.ModelPackage; -import org.eclipse.tm.discovery.model.Network; - -/** - * - * An implementation of the model object 'Network'. - * - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
- * The following features are implemented: - *
createXXX
method for each class of the model.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- *
- * @generated
- */
- protected static ModelPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- *
- * @generated
- */
- public ModelAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = ModelPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- *
- * This implementation returns true
if the object is either the model's package or is an instance object of the model.
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the createXXX
methods.
- *
- * @generated
- */
- protected ModelSwitch modelSwitch =
- new ModelSwitch() {
- public Object caseDevice(Device object) {
- return createDeviceAdapter();
- }
- public Object caseNetwork(Network object) {
- return createNetworkAdapter();
- }
- public Object casePair(Pair object) {
- return createPairAdapter();
- }
- public Object caseService(Service object) {
- return createServiceAdapter();
- }
- public Object caseServiceType(ServiceType object) {
- return createServiceTypeAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the target
.
- *
- * @param target the object to adapt.
- * @return the adapter for the target
.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Device Device}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Device
- * @generated
- */
- public Adapter createDeviceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Network Network}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Network
- * @generated
- */
- public Adapter createNetworkAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Pair Pair}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Pair
- * @generated
- */
- public Adapter createPairAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.Service Service}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.Service
- * @generated
- */
- public Adapter createServiceAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.tm.discovery.model.ServiceType Service Type}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.tm.discovery.model.ServiceType
- * @generated
- */
- public Adapter createServiceTypeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- *
- * This default implementation returns null.
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //ModelAdapterFactory
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java 2007-02-21 18:52:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceFactoryImpl.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- *
- * The Resource Factory associated with the package.
- *
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceImpl
- * @generated
- */
-public class ModelResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
- *
- * @generated
- */
- public ModelResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- *
- * @generated
- */
- public Resource createResource(URI uri) {
- XMLResource result = new ModelResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //ModelResourceFactoryImpl
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java 2007-02-21 18:52:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelResourceImpl.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- *
- * The Resource associated with the package.
- *
- * @see org.eclipse.tm.internal.discovery.model.util.ModelResourceFactoryImpl
- * @generated
- */
-public class ModelResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource.
- *
- * @param uri the URI of the new resource.
- * @generated
- */
- public ModelResourceImpl(URI uri) {
- super(uri);
- }
-
-} //ModelResourceImpl
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java 2007-02-21 18:52:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelSwitch.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tm.discovery.model.*;
-
-/**
- *
- * The Switch for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the caseXXX
method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- *
- * @see org.eclipse.tm.discovery.model.ModelPackage
- * @generated
- */
-public class ModelSwitch {
- /**
- * The cached model package
- *
- * @generated
- */
- protected static ModelPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- *
- * @generated
- */
- public ModelSwitch() {
- if (modelPackage == null) {
- modelPackage = ModelPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls caseXXX
for each class of the model until one returns a non null result; it yields that result.
- * @param theEObject
- *
- * @return the first non-null result returned by a caseXXX
call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls caseXXX
for each class of the model until one returns a non null result; it yields that result.
- *
- * @return the first non-null result returned by a caseXXX
call.
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls caseXXX
for each class of the model until one returns a non null result; it yields that result.
- *
- * @return the first non-null result returned by a caseXXX
call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case ModelPackage.DEVICE: {
- Device device = (Device)theEObject;
- Object result = caseDevice(device);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.NETWORK: {
- Network network = (Network)theEObject;
- Object result = caseNetwork(network);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.PAIR: {
- Pair pair = (Pair)theEObject;
- Object result = casePair(pair);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.SERVICE: {
- Service service = (Service)theEObject;
- Object result = caseService(service);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case ModelPackage.SERVICE_TYPE: {
- ServiceType serviceType = (ServiceType)theEObject;
- Object result = caseServiceType(serviceType);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Device'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Device'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseDevice(Device object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Network'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Network'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseNetwork(Network object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Pair'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Pair'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePair(Pair object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Service'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Service'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseService(Service object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'Service Type'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'Service Type'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseServiceType(ServiceType object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of 'EObject'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- *
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of 'EObject'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //ModelSwitch
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java 2007-02-21 18:52:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model/src/org/eclipse/tm/internal/discovery/model/util/ModelXMLProcessor.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Javier Montalvo Orus (Symbian) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.tm.internal.discovery.model.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
-import org.eclipse.tm.discovery.model.ModelPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- *
- * @generated
- */
-public class ModelXMLProcessor extends XMLProcessor {
- /**
- * Public constructor to instantiate the helper.
- *
- * @generated
- */
- public ModelXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- ModelPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the ModelResourceFactoryImpl factory.
- *
- * @generated
- */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new ModelResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new ModelResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //ModelXMLProcessor
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/.classpath eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/.classpath
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/.classpath 2007-02-21 18:52:34.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/.classpath 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/build.properties 2006-10-06 09:56:35.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -bin.includes = META-INF/,\ - about.html,\ - plugin.xml,\ - plugin.properties,\ - icons/,\ - . -jars.compile.order = . -source.. = src/ -output.. = bin/ -src.includes = about.html Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/Pair.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/device.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/network.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/service.gif differ Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/icons/full/obj16/serviceType.gif differ diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/plugin.properties 2009-05-25 21:22:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2009 Symbian Software Ltd. 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 -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - - -# ==================================================================== -# To code developer: -# Do NOT change the properties between this line and the -# "%%% END OF TRANSLATED PROPERTIES %%%" line. -# Make a new property name, append to the end of the file and change -# the code to use the new property. -# ==================================================================== - -# ==================================================================== -# %%% END OF TRANSLATED PROPERTIES %%% -# ==================================================================== - -pluginName = Target Management Service Discovery Edit Support -providerName = Eclipse.org - DSDP - - - - - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.model.edit/plugin.xml 2007-04-04 14:11:50.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.model.edit/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - - - - - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/build.properties 2009-05-25 21:22:05.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - .,\ - plugin.xml -src.includes = about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties 2009-05-14 07:53:25.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery DNS-SD Protocol -providerName = Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml 2007-05-11 10:48:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.protocol.dnssd/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ - - - - - -Name | - *Type | - *Class | - *TTL | - *Data Size | - *Domain Name | - *
Name | - *Type | - *Class | - *TTL | - *Data Size | - *Priority | - *Weight | - *Port | - *Target | - *
Name | - *Type | - *Class | - *TTL | - *Data Size | - *Data Pairs | - *
Name | - *Type | - *Class | - *TTL | - *Data Size | - *Address | - *
June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/build.properties 2009-05-25 21:22:12.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - .,\ - plugin.xml -src.includes = about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/plugin.properties 2009-05-14 07:53:15.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery UDP Transport -providerName = Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.transport.udp/plugin.xml 2007-02-21 18:52:38.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.transport.udp/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ - - - - - -June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/build.properties 2006-10-06 09:56:51.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -################################################################################## -# Copyright (c) 2006 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - plugin.xml,\ - icons/,\ - . -src.includes = about.html - Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/icons/system_view.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/icons/system_view.gif differ diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/plugin.properties 2009-05-14 07:53:31.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery View -providerName = Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.view/plugin.xml 2007-02-21 18:52:45.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.view/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - - - - - --
-
-
-
-
June 5, 2007
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - - \ No newline at end of file diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/build.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/build.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/build.properties 2009-05-25 21:21:58.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/build.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -################################################################################## -# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved. -# This program and the accompanying materials are made available under the terms -# of the Eclipse Public License v1.0 which accompanies this distribution, and is -# available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Javier Montalvo Orús (Symbian) - initial API and implementation -################################################################################## - -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - about.html,\ - plugin.properties,\ - .,\ - HelpContexts.xml,\ - SDWizard.html,\ - plugin.xml,\ - toc.xml -src.includes = about.html diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/plugin.properties --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/plugin.properties 2009-05-14 07:51:14.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/plugin.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -################################################################################ -# Copyright (c) 2006, 2009 Wind River Systems, Inc. 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 -# -# Contributors: -# Martin Oberhuber - initial API and implementation -################################################################################ - -pluginName = Target Management Service Discovery Wizard -providerName = Eclipse.org - DSDP diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/plugin.xml --- eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/plugin.xml 2007-06-11 11:25:59.000000000 +0000 +++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/plugin.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ - - - - - objects selected in the tree view from the specified host
- *
- * @param address Address of the host which services are queried
- * @return Vector containing the Service selected
- *
- * @see Service
- */
- public Vector getSelectedServices(String address)
- {
- Vector services = new Vector();
-
- Object[] checkedElements = ((ContainerCheckedTreeViewer) viewerPaneTree.getViewer()).getCheckedElements();
- for(int i=0; i
- * It provides a wizard page with text boxes and combo boxes to gather the following data:
- *
- * - Protocol
- *
- Transport
- *
- Query
- *
- Timeout
- *
- *
- * @see WizardPage
- */
-
-public class ServiceDiscoveryWizardMainPage extends WizardPage {
-
- // settings
- private int timeOut = 500; //ms
-
- // widgets
- private Combo queryCombo, transportCombo, protocolCombo;
- private Text addressText, timeOutText;
- private Button multicastButton;
-
- private String tempAddress;
-
- /**
- * Wizard main page constructor
- */
- public ServiceDiscoveryWizardMainPage() {
- super("wizardPage1"); //$NON-NLS-1$
- setTitle(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageTitle")); //$NON-NLS-1$
- setDescription(Messages.getString("ServiceDiscoveryWizardMainPage.WizardPageDescription")); //$NON-NLS-1$
- setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
-
-
- Composite comp = new Composite(parent,SWT.NULL);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- comp.setLayout(layout);
-
- //GridData
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = SWT.BEGINNING;
- data.grabExcessVerticalSpace = false;
-
- comp.setLayoutData(data);
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.AddressLabel")); //$NON-NLS-1$
-
- addressText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
- addressText.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- if(((Text)e.getSource()).getText().equals("")) //$NON-NLS-1$
- {
- setErrorMessage(Messages.getString("ServiceDiscoveryWizardMainPage.ProvideAddressError")); //$NON-NLS-1$
- setPageComplete(false);
- }
- else
- {
- setErrorMessage(null);
- setPageComplete(true);
- }
-
- }
- });
-
- addressText.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(addressText,"org.eclipse.tm.discovery.wizard.address"); //$NON-NLS-1$
-
- Composite comp2 = new Composite(comp,SWT.NULL);
- GridLayout layout2 = new GridLayout();
- layout2.numColumns = 2;
- comp2.setLayout(layout2);
-
- multicastButton = new Button(comp2,SWT.CHECK);
-
- multicastButton.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {}
-
- public void widgetSelected(SelectionEvent e) {
-
- Object src = e.getSource();
- if(((Button)src).getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- else
- {
- ((Button)src).setSelection(false);
- }
- }
- else
- {
- if(tempAddress!=null)
- addressText.setText(tempAddress);
- }
- }
- });
-
- new Label(comp2,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.MuticastAddressLabel0")); //$NON-NLS-1$
-
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TransportLabel")); //$NON-NLS-1$
-
- transportCombo = new Combo(comp, SWT.READ_ONLY);
- transportCombo.setItems(TransportFactory.getTransportList());
- transportCombo.select(0);
-
- transportCombo.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent event) {
-
- if(multicastButton.getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- }
- }
- });
-
- transportCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(transportCombo,"org.eclipse.tm.discovery.wizard.transport"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.ProtocolLabel")); //$NON-NLS-1$
-
- protocolCombo = new Combo(comp, SWT.READ_ONLY);
- protocolCombo.setItems(ProtocolFactory.getProtocolList());
- protocolCombo.select(0);
-
- protocolCombo.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent event) {
- String selectedProtocol = ((Combo)event.getSource()).getText();
-
- String[] queries = new String[]{};
- try {
- queries = ProtocolFactory.getQueryList(selectedProtocol);
- } catch (CoreException e) {}
- queryCombo.removeAll();
- queryCombo.setItems(queries);
- queryCombo.select(0);
-
- if(multicastButton.getSelection())
- {
- String multicastAddress = null;
-
- try {
- multicastAddress = ProtocolFactory.getMulticastAddress(protocolCombo.getText(), transportCombo.getText());
- } catch (CoreException e1) {}
-
- if(multicastAddress!=null)
- {
- tempAddress = addressText.getText();
- addressText.setText(multicastAddress);
- }
- }
- }
- });
-
- protocolCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(protocolCombo,"org.eclipse.tm.discovery.wizard.protocol"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel")); //$NON-NLS-1$
-
- queryCombo = new Combo(comp, SWT.NONE);
- String[] queries = new String[]{};
- try {
- queries = ProtocolFactory.getQueryList(protocolCombo.getText());
- } catch (CoreException e) {}
- for (int i = 0; i < queries.length; i++) {
- queryCombo.add(queries[i]);
- }
- queryCombo.select(0);
-
- queryCombo.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(queryCombo,"org.eclipse.tm.discovery.wizard.query"); //$NON-NLS-1$
-
- new Label(comp,SWT.NULL).setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutLabel")); //$NON-NLS-1$
-
- timeOutText = new Text(comp, SWT.BORDER | SWT.SINGLE | SWT.WRAP);
- timeOutText.setText(Messages.getString("ServiceDiscoveryWizardMainPage.TimeOutValue")); //$NON-NLS-1$
- timeOutText.redraw();
-
- timeOutText.setLayoutData(data);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(timeOutText,"org.eclipse.tm.discovery.wizard.timeout"); //$NON-NLS-1$
-
- setPageComplete(false);
-
- setControl(comp);
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), "org.eclipse.tm.discovery.wizard.general"); //$NON-NLS-1$
-
-
- }
-
- /**
- * Gets the service discovery command
- * @return command introduced in the settings window
- */
- public String getQuery() {
- return queryCombo.getText();
- }
-
- /**
- * Gets the service discovery address
- * @return address introduced in the settings window
- */
- public String getAddress() {
- return addressText.getText();
- }
-
- /**
- * Gets the service discovery transport
- * @return address introduced in the settings window
- */
- public String getTransport() {
- return transportCombo.getText();
- }
-
- /**
- * Gets the service discovery protocol
- * @return address introduced in the settings window
- */
- public String getProtocol() {
- return protocolCombo.getText();
- }
-
- /**
- * Gets the service discovery timeout
- * @return timeout introduced in the settings window
- */
- public int getTimeOut() {
-
- try{
- timeOut = Integer.parseInt(timeOutText.getText().trim());
- }catch(NumberFormatException e){}
-
- return timeOut;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- public boolean canFlipToNextPage() {
- return isPageComplete();
- }
-
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties 2007-05-10 16:54:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/src/org/eclipse/tm/internal/discovery/wizard/messages.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-##################################################################################
-# Copyright (c) 2006, 2007 Symbian Software Ltd. All rights reserved.
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License v1.0 which accompanies this distribution, and is
-# available at http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Javier Montalvo Orus (Symbian) - initial API and implementation
-##################################################################################
-
-ServiceDiscoveryWizardDisplayPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.WizardPageDescription=Select discovered services.
-ServiceDiscoveryWizardMainPage.AddressLabel=Address:
-ServiceDiscoveryWizardMainPage.TransportLabel=Transport:
-ServiceDiscoveryWizardMainPage.ProtocolLabel=Protocol:
-ServiceDiscoveryWizardMainPage.TimeOutLabel=Timeout (ms):
-ServiceDiscoveryWizardMainPage.TimeOutValue=500
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorTitle=Error
-ServiceDiscoveryWizardMainPage.WizardPageDescription=Discover available services in the target device.
-ServiceDiscoveryWizardMainPage.MuticastAddressLabel0=multicast address
-ServiceDiscoveryWizardDisplayPage.ProtocolErrorMessage=Error loading protocol
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportAddressNotFoundMessage=Error resolving address
-ServiceDiscoveryWizardDisplayPage.TransportErrorTitle=Error
-ServiceDiscoveryWizardDisplayPage.TransportErrorMessage=Error loading transport
-ServiceDiscoveryWizardDisplayPage.RefreshButtonToolTipText=Refresh
-ServiceDiscoveryWizardDisplayPage.ClearButtonToolTipText=Clear
-ServiceDiscoveryWizardDisplayPage.ServicesTreeTitle=\ \ \ \ \ \ \ \ Services
-ServiceDiscoveryWizardDisplayPage.PropertiesTableTitle=\ \ \ \ \ \ \ \ Properties
-ServiceDiscoveryWizardDisplayPage.KeyColumnLabel=Key
-ServiceDiscoveryWizardMainPage.WizardPageTitle=Service Discovery
-ServiceDiscoveryWizardDisplayPage.ValueColumnLabel=Value
-ServiceDiscoveryWizardMainPage.ProvideAddressError=Provide a valid address
-ServiceDiscoveryWizardMainPage.DiscoveryQueryLabel=Discovery Query:
-ServiceDiscoveryWizardDisplayPage.ShowAllServicesButtonText=Show all services
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/toc.xml eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/toc.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.discovery.wizard/toc.xml 2007-06-11 11:25:59.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.discovery.wizard/toc.xml 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/.classpath eclipse-rse-3.4.2/org.eclipse.tm.rapi/.classpath
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/.classpath 2008-03-27 20:06:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/.classpath 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.rapi/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/.cvsignore 2008-05-21 12:56:49.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/.project eclipse-rse-3.4.2/org.eclipse.tm.rapi/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/.project 2008-04-03 08:58:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/.project 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-
-
- org.eclipse.tm.rapi
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
- org.eclipse.pde.api.tools.apiAnalysisBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
- org.eclipse.pde.api.tools.apiAnalysisNature
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/.settings/org.eclipse.jdt.core.prefs eclipse-rse-3.4.2/org.eclipse.tm.rapi/.settings/org.eclipse.jdt.core.prefs
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/.settings/org.eclipse.jdt.core.prefs 2008-03-28 13:22:04.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/.settings/org.eclipse.jdt.core.prefs 1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.rapi/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/META-INF/MANIFEST.MF 2008-06-30 14:48:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.rapi
-Bundle-Version: 0.2.0.qualifier
-Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tm.internal.rapi;x-internal:=true,
- org.eclipse.tm.rapi
-Bundle-NativeCode: /lib/os/win32/x86/jrapi.dll;osname="Win32";processor=x86
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/about.html eclipse-rse-3.4.2/org.eclipse.tm.rapi/about.html
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/about.html 2008-03-27 20:50:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/about.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-March 27, 2008
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/README.txt eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/README.txt
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/README.txt 2008-04-02 11:59:12.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/README.txt 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-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
-
-Environment used for building the committed jrapi.dll:
- Windows 2000 SP4
- Visual Studio 2005 Standard Edition
- Windows Mobile 5.0 Pocket PC SDK
- JDK 1.4.2_10
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/build.xml eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/build.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/build.xml 2008-03-27 19:50:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/build.xml 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-
-
-
-
- Java wrappers for RAPI2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/jrapi.sln eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/jrapi.sln
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/jrapi.sln 2008-03-27 19:50:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/jrapi.sln 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrapi", "jrapi.vcproj", "{7A9CC697-2EEB-40B9-B540-7FFC195B3D4F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7A9CC697-2EEB-40B9-B540-7FFC195B3D4F}.Debug|Win32.ActiveCfg = Debug|Win32
- {7A9CC697-2EEB-40B9-B540-7FFC195B3D4F}.Debug|Win32.Build.0 = Debug|Win32
- {7A9CC697-2EEB-40B9-B540-7FFC195B3D4F}.Release|Win32.ActiveCfg = Release|Win32
- {7A9CC697-2EEB-40B9-B540-7FFC195B3D4F}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/jrapi.vcproj eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/jrapi.vcproj
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/build/jrapi.vcproj 2008-04-09 12:55:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/build/jrapi.vcproj 1970-01-01 00:00:00.000000000 +0000
@@ -1,239 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/build.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/build.properties 2008-03-27 20:50:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/build.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - add about.html
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- lib/,\
- plugin.properties
-src.includes = about.html,\
- build/,\
- native/
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/Rapi.cpp eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/Rapi.cpp
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/Rapi.cpp 2008-04-09 12:55:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/Rapi.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-
-#define _WIN32_DCOM
-#include
-#include
-
-#include "org_eclipse_tm_rapi_Rapi.h"
-
-#define RAPI_NATIVE(func) Java_org_eclipse_tm_rapi_Rapi_##func
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CoInitializeEx)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-{
- return (jint)CoInitializeEx((LPVOID)arg0, arg1);
-}
-
-JNIEXPORT void JNICALL RAPI_NATIVE(CoUninitialize)
- (JNIEnv *env, jclass that)
-{
- CoUninitialize();
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CreateRapiDesktop)
- (JNIEnv *env, jclass that, jintArray arg0)
-{
- jint rc = 0;
- jint *lparg0 = NULL;
- if (arg0) {
- lparg0 = env->GetIntArrayElements(arg0, NULL);
- if (lparg0 == NULL) goto fail;
- }
- rc = CoCreateInstance(CLSID_RAPI, NULL, CLSCTX_INPROC_SERVER,
- IID_IRAPIDesktop, (void**)lparg0);
-fail:
- if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
- return rc;
-}
-
-JNIEXPORT void JNICALL RAPI_NATIVE(ReleaseIUnknown)
- (JNIEnv *env, jclass that, jint arg0)
-{
- if (arg0 == 0) return;
- IUnknown *ptr = (IUnknown*) arg0;
- ptr->Release();
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiDesktop.cpp eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiDesktop.cpp
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiDesktop.cpp 2008-03-27 19:50:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiDesktop.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-
-#include
-#include
-
-#include "org_eclipse_tm_internal_rapi_RapiDesktop.h"
-
-#define RAPI_NATIVE(func) Java_org_eclipse_tm_internal_rapi_RapiDesktop_##func
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(EnumDevices)
- (JNIEnv *env, jobject that, jint arg0, jintArray arg1)
-{
- jint rc = E_FAIL;
- jint *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetIntArrayElements(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPIDesktop *pDesktop = (IRAPIDesktop*) arg0;
- rc = pDesktop->EnumDevices((IRAPIEnumDevices**)lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
- return rc;
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiDevice.cpp eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiDevice.cpp
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiDevice.cpp 2008-03-27 19:50:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiDevice.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-
-#include
-#include
-
-#include "org_eclipse_tm_internal_rapi_RapiDevice.h"
-
-#define RAPI_NATIVE(func) Java_org_eclipse_tm_internal_rapi_RapiDevice_##func
-
-struct RAPI_DEVICEINFO_FID_CACHE
-{
- int cached;
- jclass clazz;
- jfieldID id, versionMajor, versionMinor, name, platform;
-};
-
-struct RAPI_CONNECTIONINFO_FID_CACHE
-{
- int cached;
- jclass clazz;
- jfieldID connectionType;
-};
-
-RAPI_DEVICEINFO_FID_CACHE RAPI_DEVICEINFOFc;
-RAPI_CONNECTIONINFO_FID_CACHE RAPI_CONNECTIONINFOFc;
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CreateSession)
- (JNIEnv *env, jobject that, jint arg0, jintArray arg1)
-{
- jint rc = E_FAIL;
- jint *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetIntArrayElements(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPIDevice *pDevice = (IRAPIDevice*) arg0;
- rc = pDevice->CreateSession((IRAPISession**)lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
- return rc;
-}
-
-void cacheRAPI_DEVICEINFOFields(JNIEnv *env, jobject lpObject)
-{
- if (RAPI_DEVICEINFOFc.cached) return;
- RAPI_DEVICEINFOFc.clazz = env->GetObjectClass(lpObject);
- RAPI_DEVICEINFOFc.id = env->GetFieldID(RAPI_DEVICEINFOFc.clazz, "id", "Ljava/lang/String;");
- RAPI_DEVICEINFOFc.versionMajor = env->GetFieldID(RAPI_DEVICEINFOFc.clazz, "versionMajor", "I");
- RAPI_DEVICEINFOFc.versionMinor = env->GetFieldID(RAPI_DEVICEINFOFc.clazz, "versionMinor", "I");
- RAPI_DEVICEINFOFc.name = env->GetFieldID(RAPI_DEVICEINFOFc.clazz, "name", "Ljava/lang/String;");
- RAPI_DEVICEINFOFc.platform = env->GetFieldID(RAPI_DEVICEINFOFc.clazz, "platform", "Ljava/lang/String;");
- RAPI_DEVICEINFOFc.cached = 1;
-}
-
-void cacheRAPI_CONNECTIONINFOFields(JNIEnv *env, jobject lpObject)
-{
- if (RAPI_CONNECTIONINFOFc.cached) return;
- RAPI_CONNECTIONINFOFc.clazz = env->GetObjectClass(lpObject);
- RAPI_CONNECTIONINFOFc.connectionType = env->GetFieldID(RAPI_CONNECTIONINFOFc.clazz, "connectionType", "I");
- RAPI_CONNECTIONINFOFc.cached = 1;
-}
-
-void setRAPI_DEVICEINFOFields(JNIEnv *env, jobject lpObject, RAPI_DEVICEINFO *pDeviceInfo)
-{
- if (!RAPI_DEVICEINFOFc.cached) cacheRAPI_DEVICEINFOFields(env, lpObject);
- WCHAR *pwszGUID = NULL;
- if (StringFromCLSID(pDeviceInfo->DeviceId, &pwszGUID) == S_OK) {
- int idLen = lstrlen(pwszGUID);
- jstring id = env->NewString((const jchar*)pwszGUID, idLen);
- env->SetObjectField(lpObject, RAPI_DEVICEINFOFc.id, id);
- CoTaskMemFree(pwszGUID);
- }
- env->SetIntField(lpObject, RAPI_DEVICEINFOFc.versionMajor, (jint)pDeviceInfo->dwOsVersionMajor);
- env->SetIntField(lpObject, RAPI_DEVICEINFOFc.versionMinor, (jint)pDeviceInfo->dwOsVersionMinor);
- // create new String from the native BSTR
- UINT nameLen = SysStringLen(pDeviceInfo->bstrName);
- jstring name = env->NewString((const jchar*)pDeviceInfo->bstrName, nameLen);
- env->SetObjectField(lpObject, RAPI_DEVICEINFOFc.name, name);
- // create new String from the native BSTR
- UINT platformLen = SysStringLen(pDeviceInfo->bstrPlatform);
- jstring platform = env->NewString((const jchar*)pDeviceInfo->bstrPlatform, platformLen);
- env->SetObjectField(lpObject, RAPI_DEVICEINFOFc.platform, platform);
-}
-
-void setRAPI_CONNECTIONINFOFields(JNIEnv *env, jobject lpObject, RAPI_CONNECTIONINFO *pConnectionInfo)
-{
- if (!RAPI_CONNECTIONINFOFc.cached) cacheRAPI_CONNECTIONINFOFields(env, lpObject);
- env->SetIntField(lpObject, RAPI_CONNECTIONINFOFc.connectionType, (jint)pConnectionInfo->connectionType);
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(GetDeviceInfo)
- (JNIEnv *env, jobject that, jint arg0, jobject arg1)
-{
- jint rc = E_FAIL;
- RAPI_DEVICEINFO deviceInfo = {0};
-
- if (arg0 == 0) return rc;
- IRAPIDevice *pDevice = (IRAPIDevice*) arg0;
- rc = pDevice->GetDeviceInfo(&deviceInfo);
- if (rc != NOERROR) goto fail;
- if (arg1) setRAPI_DEVICEINFOFields(env, arg1, &deviceInfo);
-fail:
- FreeDeviceInfoData(&deviceInfo);
- return rc;
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(GetConnectionInfo)
- (JNIEnv *env, jobject that, jint arg0, jobject arg1)
-{
- jint rc = E_FAIL;
- RAPI_CONNECTIONINFO connectionInfo = {0};
-
- if (arg0 == 0) return rc;
- IRAPIDevice *pDevice = (IRAPIDevice*) arg0;
- rc = pDevice->GetConnectionInfo(&connectionInfo);
- if (rc != NOERROR) goto fail;
- if (arg1) setRAPI_CONNECTIONINFOFields(env, arg1, &connectionInfo);
-fail:
- return rc;
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(GetConnectStat)
- (JNIEnv *env, jobject that, jint arg0, jintArray arg1)
-{
- jint rc = E_FAIL;
- jint *lparg1 = NULL;
- RAPI_DEVICESTATUS devStatus;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetIntArrayElements(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPIDevice *pDevice = (IRAPIDevice*) arg0;
- rc = pDevice->GetConnectStat(&devStatus);
- lparg1[0] = (int)devStatus;
-fail:
- if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
- return rc;
-}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiEnumDevices.cpp eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiEnumDevices.cpp
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiEnumDevices.cpp 2008-03-27 19:50:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiEnumDevices.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-
-#include
-#include
-
-#include "org_eclipse_tm_internal_rapi_RapiEnumDevices.h"
-
-#define RAPI_NATIVE(func) Java_org_eclipse_tm_internal_rapi_RapiEnumDevices_##func
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(Next)
- (JNIEnv *env, jobject that, jint arg0, jintArray arg1)
-{
- jint rc = E_FAIL;
- jint *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetIntArrayElements(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPIEnumDevices *pEnumDevices = (IRAPIEnumDevices*) arg0;
- rc = pEnumDevices->Next((IRAPIDevice**)lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseIntArrayElements(arg1, lparg1, 0);
- return rc;
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiSession.cpp eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiSession.cpp
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/RapiSession.cpp 2008-06-30 11:12:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/RapiSession.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,611 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov 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
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- * Radoslav Gerganov - [238773] [WinCE] Implement IRAPISession#CeRapiInvoke
- *******************************************************************************/
-
-#include
-#include
-
-#include "org_eclipse_tm_internal_rapi_RapiSession.h"
-
-#define RAPI_NATIVE(func) Java_org_eclipse_tm_internal_rapi_RapiSession_##func
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeRapiInit)
- (JNIEnv *env, jobject that, jint arg0)
-{
- if (arg0 == 0) return E_FAIL;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeRapiInit();
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeRapiUninit)
- (JNIEnv *env, jobject that, jint arg0)
-{
- if (arg0 == 0) return E_FAIL;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeRapiUninit();
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeRapiGetError)
- (JNIEnv *env, jobject that, jint arg0)
-{
- if (arg0 == 0) return 0;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeRapiGetError();
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeGetLastError)
- (JNIEnv *env, jobject that, jint arg0)
-{
- if (arg0 == 0) return 0;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeGetLastError();
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeCreateFile)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-{
- HANDLE h = INVALID_HANDLE_VALUE;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) goto fail;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- h = pSession->CeCreateFile((LPCWSTR)lparg1, arg2, arg3, NULL, arg4, arg5, 0);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return (jint)h;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeReadFile)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
-{
- jboolean rc = 0;
- jbyte *lparg2 = NULL;
- jint *lparg4 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg2) {
- lparg2 = env->GetByteArrayElements(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- if (arg4) {
- lparg4 = env->GetIntArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeReadFile((HANDLE)arg1, lparg2, arg3, (LPDWORD)lparg4, NULL);
-fail:
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeWriteFile)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
-{
- jboolean rc = 0;
- jbyte *lparg2 = NULL;
- jint *lparg4 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg2) {
- lparg2 = env->GetByteArrayElements(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- if (arg4) {
- lparg4 = env->GetIntArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeWriteFile((HANDLE)arg1, lparg2, arg3, (LPDWORD)lparg4, NULL);
-fail:
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeCloseHandle)
- (JNIEnv *env, jobject that, jint arg0, jint arg1)
-{
- if (arg0 == 0) return 0;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeCloseHandle((HANDLE)arg1);
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeCopyFile)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jstring arg2, jboolean arg3)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
- const jchar *lparg2 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- if (arg2) {
- lparg2 = env->GetStringChars(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeCopyFile((LPCWSTR)lparg1, (LPCWSTR)lparg2, arg3);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- if (arg2 && lparg2) env->ReleaseStringChars(arg2, lparg2);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeDeleteFile)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeDeleteFile((LPCWSTR)lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeMoveFile)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jstring arg2)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
- const jchar *lparg2 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- if (arg2) {
- lparg2 = env->GetStringChars(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeMoveFile((LPCWSTR)lparg1, (LPCWSTR)lparg2);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- if (arg2 && lparg2) env->ReleaseStringChars(arg2, lparg2);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeCreateDirectory)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeCreateDirectory((LPCWSTR) lparg1, NULL);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeRemoveDirectory)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeRemoveDirectory((LPCWSTR) lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return rc;
-}
-
-struct FIND_DATA_FID_CACHE
-{
- int cached;
- jclass clazz;
- jfieldID fileAttributes, creationTime, lastAccessTime;
- jfieldID lastWriteTime, fileSize, oid, fileName;
-};
-
-FIND_DATA_FID_CACHE FIND_DATAFc;
-
-void cacheFIND_DATAFields(JNIEnv *env, jobject lpObject)
-{
- if (FIND_DATAFc.cached) return;
- FIND_DATAFc.clazz = env->GetObjectClass(lpObject);
- FIND_DATAFc.fileAttributes = env->GetFieldID(FIND_DATAFc.clazz, "fileAttributes", "I");
- FIND_DATAFc.creationTime = env->GetFieldID(FIND_DATAFc.clazz, "creationTime", "J");
- FIND_DATAFc.lastAccessTime = env->GetFieldID(FIND_DATAFc.clazz, "lastAccessTime", "J");
- FIND_DATAFc.lastWriteTime = env->GetFieldID(FIND_DATAFc.clazz, "lastWriteTime", "J");
- FIND_DATAFc.fileSize = env->GetFieldID(FIND_DATAFc.clazz, "fileSize", "J");
- FIND_DATAFc.oid = env->GetFieldID(FIND_DATAFc.clazz, "oid", "I");
- FIND_DATAFc.fileName = env->GetFieldID(FIND_DATAFc.clazz, "fileName", "Ljava/lang/String;");
- FIND_DATAFc.cached = 1;
-}
-
-jlong FILETIME2jlong(FILETIME ft)
-{
- jlong res = ft.dwHighDateTime;
- // well, this is a potential overflow since jlong is signed
- // we should take care about this in the java part
- res <<= 32;
- res |= ft.dwLowDateTime;
- return res;
-}
-
-LPFILETIME jlong2FILETIME(jlong jl, LPFILETIME ft)
-{
- ft->dwLowDateTime = (DWORD)jl;
- jl >>= 32;
- ft->dwHighDateTime = (DWORD)jl;
- return ft;
-}
-
-void setFIND_DATAFields(JNIEnv *env, jobject lpObject, CE_FIND_DATA *pFindData)
-{
- if (!FIND_DATAFc.cached) cacheFIND_DATAFields(env, lpObject);
- env->SetIntField(lpObject, FIND_DATAFc.fileAttributes, (jint)pFindData->dwFileAttributes);
-
- jlong creationTime = FILETIME2jlong(pFindData->ftCreationTime);
- env->SetLongField(lpObject, FIND_DATAFc.creationTime, creationTime);
-
- jlong lastAccessTime = FILETIME2jlong(pFindData->ftLastAccessTime);
- env->SetLongField(lpObject, FIND_DATAFc.lastAccessTime, lastAccessTime);
-
- jlong lastWriteTime = FILETIME2jlong(pFindData->ftLastWriteTime);
- env->SetLongField(lpObject, FIND_DATAFc.lastWriteTime, lastWriteTime);
-
- jlong fileSize = pFindData->nFileSizeHigh;
- fileSize <<= 32;
- fileSize |= pFindData->nFileSizeLow;
- env->SetLongField(lpObject, FIND_DATAFc.fileSize, fileSize);
-
- int fileNameLen = lstrlen(pFindData->cFileName);
- jstring fileName = env->NewString((const jchar*)pFindData->cFileName, fileNameLen);
- env->SetObjectField(lpObject, FIND_DATAFc.fileName, fileName);
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeFindFirstFile)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jobject arg2)
-{
- HANDLE h = INVALID_HANDLE_VALUE;
- CE_FIND_DATA findData;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) goto fail;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- h = pSession->CeFindFirstFile((LPCWSTR)lparg1, &findData);
- if (h != INVALID_HANDLE_VALUE && arg2) setFIND_DATAFields(env, arg2, &findData);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return (jint)h;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeFindNextFile)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jobject arg2)
-{
- jboolean rc = 0;
- CE_FIND_DATA findData;
-
- if (arg0 == 0) return 0;
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeFindNextFile((HANDLE)arg1, &findData);
- if (rc && arg2) setFIND_DATAFields(env, arg2, &findData);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeFindClose)
- (JNIEnv *env, jobject that, jint arg0, jint arg1)
-{
- if (arg0 == 0) return 0;
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeFindClose((HANDLE)arg1);
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeFindAllFiles)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jint arg2, jintArray arg3, jintArray arg4)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
- jint *lparg3 = NULL;
- jint *lparg4 = NULL;
-
- if (arg0 == 0) goto fail;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- if (arg3) {
- lparg3 = env->GetIntArrayElements(arg3, NULL);
- if (lparg3 == NULL) goto fail;
- }
- if (arg4) {
- lparg4 = env->GetIntArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeFindAllFiles((LPCWSTR)lparg1, arg2, (LPDWORD)lparg3, (LPLPCE_FIND_DATA)lparg4);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- return rc;
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeFindAllFilesEx)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jint arg2, jobjectArray arg3)
-{
- if (arg0 == 0 || arg2 == 0 || arg3 == 0) return E_FAIL;
- LPCE_FIND_DATA findDataArray = (LPCE_FIND_DATA) arg2;
- for (int i = 0 ; i < arg1 ; i++) {
- jobject obj = env->GetObjectArrayElement(arg3, i);
- setFIND_DATAFields(env, obj, &findDataArray[i]);
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- return pSession->CeRapiFreeBuffer(findDataArray);
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeGetFileAttributes)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1)
-{
- jint rc = 0xFFFFFFFF;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeGetFileAttributes((LPCWSTR)lparg1);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeGetFileSize)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jintArray arg2)
-{
- jint rc = INVALID_FILE_SIZE;
- jint *lparg2 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg2) {
- lparg2 = env->GetIntArrayElements(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeGetFileSize((HANDLE)arg1, (LPDWORD)lparg2);
-fail:
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeGetFileTime)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
-{
- jboolean rc = 0;
- jlong *lparg2 = NULL;
- jlong *lparg3 = NULL;
- jlong *lparg4 = NULL;
- FILETIME crTime, laTime, lwTime;
-
- if (arg0 == 0) return rc;
- if (arg2) {
- lparg2 = env->GetLongArrayElements(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- if (arg3) {
- lparg3 = env->GetLongArrayElements(arg3, NULL);
- if (lparg3 == NULL) goto fail;
- }
- if (arg4) {
- lparg4 = env->GetLongArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeGetFileTime((HANDLE)arg1, &crTime, &laTime, &lwTime);
- if (!rc) goto fail;
- lparg2[0] = FILETIME2jlong(crTime);
- lparg3[0] = FILETIME2jlong(laTime);
- lparg4[0] = FILETIME2jlong(lwTime);
-fail:
- if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeSetFileAttributes)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jint arg2)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
-
- if (arg0 == 0) return rc;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeSetFileAttributes((LPCWSTR)lparg1, arg2);
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- return rc;
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeSetFileTime)
- (JNIEnv *env, jobject that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
-{
- jboolean rc = 0;
- FILETIME crTime, laTime, lwTime;
- LPFILETIME pcrTime = NULL, plaTime = NULL, plwTime = NULL;
- jlong *lparg2 = NULL, *lparg3 = NULL, *lparg4 = NULL;
-
- if (arg0 == 0) return 0;
- if (arg2) {
- lparg2 = env->GetLongArrayElements(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- pcrTime = jlong2FILETIME(lparg2[0], &crTime);
- }
- if (arg3) {
- lparg3 = env->GetLongArrayElements(arg3, NULL);
- if (lparg3 == NULL) goto fail;
- plaTime = jlong2FILETIME(lparg3[0], &laTime);
- }
- if (arg4) {
- lparg4 = env->GetLongArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- plwTime = jlong2FILETIME(lparg4[0], &lwTime);
- }
-
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeSetFileTime((HANDLE)arg1, pcrTime, plaTime, plwTime);
-fail:
- if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- return rc;
-}
-
-struct PROCESS_INFORMATION_FID_CACHE
-{
- int cached;
- jclass clazz;
- jfieldID hProcess, hThread;
- jfieldID dwProcessId, dwThreadId;
-};
-
-PROCESS_INFORMATION_FID_CACHE PROCESS_INFORMATIONFc;
-
-void cachePROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject)
-{
- if (PROCESS_INFORMATIONFc.cached) return;
- PROCESS_INFORMATIONFc.clazz = env->GetObjectClass(lpObject);
- PROCESS_INFORMATIONFc.hProcess = env->GetFieldID(PROCESS_INFORMATIONFc.clazz, "hProcess", "I");
- PROCESS_INFORMATIONFc.hThread = env->GetFieldID(PROCESS_INFORMATIONFc.clazz, "hThread", "I");
- PROCESS_INFORMATIONFc.dwProcessId = env->GetFieldID(PROCESS_INFORMATIONFc.clazz, "dwProcessId", "I");
- PROCESS_INFORMATIONFc.dwThreadId = env->GetFieldID(PROCESS_INFORMATIONFc.clazz, "dwThreadId", "I");
- PROCESS_INFORMATIONFc.cached = 1;
-}
-
-void setPROCESS_INFORMATIONFields(JNIEnv *env, jobject lpObject, PROCESS_INFORMATION *pi)
-{
- if (!PROCESS_INFORMATIONFc.cached) cachePROCESS_INFORMATIONFields(env, lpObject);
- env->SetIntField(lpObject, PROCESS_INFORMATIONFc.hProcess, (jint)pi->hProcess);
- env->SetIntField(lpObject, PROCESS_INFORMATIONFc.hThread, (jint)pi->hThread);
- env->SetIntField(lpObject, PROCESS_INFORMATIONFc.dwProcessId, (jint)pi->dwProcessId);
- env->SetIntField(lpObject, PROCESS_INFORMATIONFc.dwThreadId, (jint)pi->dwThreadId);
-}
-
-JNIEXPORT jboolean JNICALL RAPI_NATIVE(CeCreateProcess)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jstring arg2, jint arg3, jobject arg4)
-{
- jboolean rc = 0;
- const jchar *lparg1 = NULL;
- const jchar *lparg2 = NULL;
- PROCESS_INFORMATION pi;
-
- if (arg0 == 0) return 0;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- if (arg2) {
- lparg2 = env->GetStringChars(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- rc = pSession->CeCreateProcess((LPCWSTR)lparg1, (LPCWSTR)lparg2, NULL, NULL, FALSE, arg3, NULL, NULL, NULL, &pi);
- if (!rc) goto fail;
- if (arg4) setPROCESS_INFORMATIONFields(env, arg4, &pi);
-
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- if (arg2 && lparg2) env->ReleaseStringChars(arg2, lparg2);
- return rc;
-}
-
-JNIEXPORT jint JNICALL RAPI_NATIVE(CeRapiInvoke)
- (JNIEnv *env, jobject that, jint arg0, jstring arg1, jstring arg2, jbyteArray arg3, jintArray arg4)
-{
- const jchar *lparg1 = NULL;
- const jchar *lparg2 = NULL;
- jbyte *lparg3 = NULL;
- jint *lparg4 = NULL;
- int res = -1;
- jsize cbInput = 0;
-
- if (arg0 == 0) return -1;
- if (arg1) {
- lparg1 = env->GetStringChars(arg1, NULL);
- if (lparg1 == NULL) goto fail;
- }
- if (arg2) {
- lparg2 = env->GetStringChars(arg2, NULL);
- if (lparg2 == NULL) goto fail;
- }
- if (arg3) {
- lparg3 = env->GetByteArrayElements(arg3, NULL);
- if (lparg3 == NULL) goto fail;
- cbInput = env->GetArrayLength(arg3);
- }
- if (arg4) {
- lparg4 = env->GetIntArrayElements(arg4, NULL);
- if (lparg4 == NULL) goto fail;
- }
- IRAPISession *pSession = (IRAPISession*) arg0;
- res = pSession->CeRapiInvoke((LPCWSTR)lparg1, (LPCWSTR)lparg2, cbInput,
- (BYTE*)lparg3, (DWORD*) lparg4, (BYTE**) (lparg4 + 1), NULL, 0);
-
-fail:
- if (arg1 && lparg1) env->ReleaseStringChars(arg1, lparg1);
- if (arg2 && lparg2) env->ReleaseStringChars(arg2, lparg2);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- return res;
-}
-
-JNIEXPORT void JNICALL RAPI_NATIVE(CeRapiInvokeEx)
- (JNIEnv *env, jobject that, jint arg0, jbyteArray arg1)
-{
- jbyte *lparg1 = NULL;
- jsize len = 0;
-
- if (arg1 == 0) return;
- lparg1 = env->GetByteArrayElements(arg1, NULL);
- if (lparg1 == NULL) return;
- len = env->GetArrayLength(arg1);
- memcpy(lparg1, (void*)arg0, len);
- env->ReleaseByteArrayElements(arg1, lparg1, 0);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDesktop.h eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDesktop.h
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDesktop.h 2008-04-07 12:50:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDesktop.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_eclipse_tm_internal_rapi_RapiDesktop */
-
-#ifndef _Included_org_eclipse_tm_internal_rapi_RapiDesktop
-#define _Included_org_eclipse_tm_internal_rapi_RapiDesktop
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiDesktop
- * Method: EnumDevices
- * Signature: (I[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiDesktop_EnumDevices
- (JNIEnv *, jobject, jint, jintArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDevice.h eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDevice.h
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDevice.h 2008-04-07 12:50:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiDevice.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_eclipse_tm_internal_rapi_RapiDevice */
-
-#ifndef _Included_org_eclipse_tm_internal_rapi_RapiDevice
-#define _Included_org_eclipse_tm_internal_rapi_RapiDevice
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiDevice
- * Method: CreateSession
- * Signature: (I[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiDevice_CreateSession
- (JNIEnv *, jobject, jint, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiDevice
- * Method: GetConnectionInfo
- * Signature: (ILorg/eclipse/tm/rapi/RapiConnectionInfo;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiDevice_GetConnectionInfo
- (JNIEnv *, jobject, jint, jobject);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiDevice
- * Method: GetDeviceInfo
- * Signature: (ILorg/eclipse/tm/rapi/RapiDeviceInfo;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiDevice_GetDeviceInfo
- (JNIEnv *, jobject, jint, jobject);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiDevice
- * Method: GetConnectStat
- * Signature: (I[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiDevice_GetConnectStat
- (JNIEnv *, jobject, jint, jintArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiEnumDevices.h eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiEnumDevices.h
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiEnumDevices.h 2008-04-07 12:50:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiEnumDevices.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_eclipse_tm_internal_rapi_RapiEnumDevices */
-
-#ifndef _Included_org_eclipse_tm_internal_rapi_RapiEnumDevices
-#define _Included_org_eclipse_tm_internal_rapi_RapiEnumDevices
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiEnumDevices
- * Method: Next
- * Signature: (I[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiEnumDevices_Next
- (JNIEnv *, jobject, jint, jintArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiSession.h eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiSession.h
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiSession.h 2008-06-30 11:12:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_internal_rapi_RapiSession.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov 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
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- * Radoslav Gerganov - [238773] [WinCE] Implement IRAPISession#CeRapiInvoke
- *******************************************************************************/
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_eclipse_tm_internal_rapi_RapiSession */
-
-#ifndef _Included_org_eclipse_tm_internal_rapi_RapiSession
-#define _Included_org_eclipse_tm_internal_rapi_RapiSession
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRapiInit
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRapiInit
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRapiUninit
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRapiUninit
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRapiGetError
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRapiGetError
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeGetLastError
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeGetLastError
- (JNIEnv *, jobject, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeCreateFile
- * Signature: (ILjava/lang/String;IIII)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeCreateFile
- (JNIEnv *, jobject, jint, jstring, jint, jint, jint, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeReadFile
- * Signature: (II[BI[I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeReadFile
- (JNIEnv *, jobject, jint, jint, jbyteArray, jint, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeWriteFile
- * Signature: (II[BI[I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeWriteFile
- (JNIEnv *, jobject, jint, jint, jbyteArray, jint, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeCloseHandle
- * Signature: (II)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeCloseHandle
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeCopyFile
- * Signature: (ILjava/lang/String;Ljava/lang/String;Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeCopyFile
- (JNIEnv *, jobject, jint, jstring, jstring, jboolean);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeDeleteFile
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeDeleteFile
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeMoveFile
- * Signature: (ILjava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeMoveFile
- (JNIEnv *, jobject, jint, jstring, jstring);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeCreateDirectory
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeCreateDirectory
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRemoveDirectory
- * Signature: (ILjava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRemoveDirectory
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeFindFirstFile
- * Signature: (ILjava/lang/String;Lorg/eclipse/tm/rapi/RapiFindData;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeFindFirstFile
- (JNIEnv *, jobject, jint, jstring, jobject);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeFindNextFile
- * Signature: (IILorg/eclipse/tm/rapi/RapiFindData;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeFindNextFile
- (JNIEnv *, jobject, jint, jint, jobject);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeFindClose
- * Signature: (II)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeFindClose
- (JNIEnv *, jobject, jint, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeFindAllFiles
- * Signature: (ILjava/lang/String;I[I[I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeFindAllFiles
- (JNIEnv *, jobject, jint, jstring, jint, jintArray, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeFindAllFilesEx
- * Signature: (III[Lorg/eclipse/tm/rapi/RapiFindData;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeFindAllFilesEx
- (JNIEnv *, jobject, jint, jint, jint, jobjectArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeGetFileAttributes
- * Signature: (ILjava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeGetFileAttributes
- (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeGetFileSize
- * Signature: (II[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeGetFileSize
- (JNIEnv *, jobject, jint, jint, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeGetFileTime
- * Signature: (II[J[J[J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeGetFileTime
- (JNIEnv *, jobject, jint, jint, jlongArray, jlongArray, jlongArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeSetFileAttributes
- * Signature: (ILjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeSetFileAttributes
- (JNIEnv *, jobject, jint, jstring, jint);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeSetFileTime
- * Signature: (II[J[J[J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeSetFileTime
- (JNIEnv *, jobject, jint, jint, jlongArray, jlongArray, jlongArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeCreateProcess
- * Signature: (ILjava/lang/String;Ljava/lang/String;ILorg/eclipse/tm/rapi/ProcessInformation;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeCreateProcess
- (JNIEnv *, jobject, jint, jstring, jstring, jint, jobject);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRapiInvoke
- * Signature: (ILjava/lang/String;Ljava/lang/String;[B[I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRapiInvoke
- (JNIEnv *, jobject, jint, jstring, jstring, jbyteArray, jintArray);
-
-/*
- * Class: org_eclipse_tm_internal_rapi_RapiSession
- * Method: CeRapiInvokeEx
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_tm_internal_rapi_RapiSession_CeRapiInvokeEx
- (JNIEnv *, jobject, jint, jbyteArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_rapi_Rapi.h eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_rapi_Rapi.h
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/native/org_eclipse_tm_rapi_Rapi.h 2008-04-09 12:55:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/native/org_eclipse_tm_rapi_Rapi.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_eclipse_tm_rapi_Rapi */
-
-#ifndef _Included_org_eclipse_tm_rapi_Rapi
-#define _Included_org_eclipse_tm_rapi_Rapi
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef org_eclipse_tm_rapi_Rapi_NOERROR
-#define org_eclipse_tm_rapi_Rapi_NOERROR 0L
-#undef org_eclipse_tm_rapi_Rapi_GENERIC_READ
-#define org_eclipse_tm_rapi_Rapi_GENERIC_READ -2147483648L
-#undef org_eclipse_tm_rapi_Rapi_GENERIC_WRITE
-#define org_eclipse_tm_rapi_Rapi_GENERIC_WRITE 1073741824L
-#undef org_eclipse_tm_rapi_Rapi_FILE_SHARE_READ
-#define org_eclipse_tm_rapi_Rapi_FILE_SHARE_READ 1L
-#undef org_eclipse_tm_rapi_Rapi_FILE_SHARE_WRITE
-#define org_eclipse_tm_rapi_Rapi_FILE_SHARE_WRITE 2L
-#undef org_eclipse_tm_rapi_Rapi_CREATE_NEW
-#define org_eclipse_tm_rapi_Rapi_CREATE_NEW 1L
-#undef org_eclipse_tm_rapi_Rapi_CREATE_ALWAYS
-#define org_eclipse_tm_rapi_Rapi_CREATE_ALWAYS 2L
-#undef org_eclipse_tm_rapi_Rapi_OPEN_EXISTING
-#define org_eclipse_tm_rapi_Rapi_OPEN_EXISTING 3L
-#undef org_eclipse_tm_rapi_Rapi_OPEN_ALWAYS
-#define org_eclipse_tm_rapi_Rapi_OPEN_ALWAYS 4L
-#undef org_eclipse_tm_rapi_Rapi_TRUNCATE_EXISTING
-#define org_eclipse_tm_rapi_Rapi_TRUNCATE_EXISTING 5L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ARCHIVE
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ARCHIVE 32L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_COMPRESSED
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_COMPRESSED 2048L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_DIRECTORY
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_DIRECTORY 16L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ENCRYPTED
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ENCRYPTED 16384L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_HIDDEN
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_HIDDEN 2L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_INROM
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_INROM 64L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_NORMAL
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_NORMAL 128L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_READONLY
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_READONLY 1L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_REPARSE_POINT
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_REPARSE_POINT 1024L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ROMMODULE
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_ROMMODULE 8192L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_SPARSE_FILE
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_SPARSE_FILE 512L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_SYSTEM
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_SYSTEM 4L
-#undef org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_TEMPORARY
-#define org_eclipse_tm_rapi_Rapi_FILE_ATTRIBUTE_TEMPORARY 256L
-#undef org_eclipse_tm_rapi_Rapi_FILE_FLAG_WRITE_THROUGH
-#define org_eclipse_tm_rapi_Rapi_FILE_FLAG_WRITE_THROUGH -2147483648L
-#undef org_eclipse_tm_rapi_Rapi_FILE_FLAG_OVERLAPPED
-#define org_eclipse_tm_rapi_Rapi_FILE_FLAG_OVERLAPPED 1073741824L
-#undef org_eclipse_tm_rapi_Rapi_FILE_FLAG_RANDOM_ACCESS
-#define org_eclipse_tm_rapi_Rapi_FILE_FLAG_RANDOM_ACCESS 268435456L
-#undef org_eclipse_tm_rapi_Rapi_FILE_FLAG_SEQUENTIAL_SCAN
-#define org_eclipse_tm_rapi_Rapi_FILE_FLAG_SEQUENTIAL_SCAN 134217728L
-#undef org_eclipse_tm_rapi_Rapi_FAF_ATTRIB_CHILDREN
-#define org_eclipse_tm_rapi_Rapi_FAF_ATTRIB_CHILDREN 4096L
-#undef org_eclipse_tm_rapi_Rapi_FAF_ATTRIB_NO_HIDDEN
-#define org_eclipse_tm_rapi_Rapi_FAF_ATTRIB_NO_HIDDEN 8192L
-#undef org_eclipse_tm_rapi_Rapi_FAF_FOLDERS_ONLY
-#define org_eclipse_tm_rapi_Rapi_FAF_FOLDERS_ONLY 16384L
-#undef org_eclipse_tm_rapi_Rapi_FAF_NO_HIDDEN_SYS_ROMMODULES
-#define org_eclipse_tm_rapi_Rapi_FAF_NO_HIDDEN_SYS_ROMMODULES 32768L
-#undef org_eclipse_tm_rapi_Rapi_FAF_GETTARGET
-#define org_eclipse_tm_rapi_Rapi_FAF_GETTARGET 65536L
-#undef org_eclipse_tm_rapi_Rapi_FAF_ATTRIBUTES
-#define org_eclipse_tm_rapi_Rapi_FAF_ATTRIBUTES 1L
-#undef org_eclipse_tm_rapi_Rapi_FAF_CREATION_TIME
-#define org_eclipse_tm_rapi_Rapi_FAF_CREATION_TIME 2L
-#undef org_eclipse_tm_rapi_Rapi_FAF_LASTACCESS_TIME
-#define org_eclipse_tm_rapi_Rapi_FAF_LASTACCESS_TIME 4L
-#undef org_eclipse_tm_rapi_Rapi_FAF_LASTWRITE_TIME
-#define org_eclipse_tm_rapi_Rapi_FAF_LASTWRITE_TIME 8L
-#undef org_eclipse_tm_rapi_Rapi_FAF_SIZE_HIGH
-#define org_eclipse_tm_rapi_Rapi_FAF_SIZE_HIGH 16L
-#undef org_eclipse_tm_rapi_Rapi_FAF_SIZE_LOW
-#define org_eclipse_tm_rapi_Rapi_FAF_SIZE_LOW 32L
-#undef org_eclipse_tm_rapi_Rapi_FAF_OID
-#define org_eclipse_tm_rapi_Rapi_FAF_OID 64L
-#undef org_eclipse_tm_rapi_Rapi_FAF_NAME
-#define org_eclipse_tm_rapi_Rapi_FAF_NAME 128L
-#undef org_eclipse_tm_rapi_Rapi_INVALID_HANDLE_VALUE
-#define org_eclipse_tm_rapi_Rapi_INVALID_HANDLE_VALUE -1L
-#undef org_eclipse_tm_rapi_Rapi_TIME_DIFF
-#define org_eclipse_tm_rapi_Rapi_TIME_DIFF 11644473600000i64
-#undef org_eclipse_tm_rapi_Rapi_COINIT_MULTITHREADED
-#define org_eclipse_tm_rapi_Rapi_COINIT_MULTITHREADED 0L
-#undef org_eclipse_tm_rapi_Rapi_COINIT_APARTMENTTHREADED
-#define org_eclipse_tm_rapi_Rapi_COINIT_APARTMENTTHREADED 2L
-#undef org_eclipse_tm_rapi_Rapi_COINIT_DISABLE_OLE1DDE
-#define org_eclipse_tm_rapi_Rapi_COINIT_DISABLE_OLE1DDE 4L
-#undef org_eclipse_tm_rapi_Rapi_COINIT_SPEED_OVER_MEMORY
-#define org_eclipse_tm_rapi_Rapi_COINIT_SPEED_OVER_MEMORY 8L
-/*
- * Class: org_eclipse_tm_rapi_Rapi
- * Method: CoInitializeEx
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_rapi_Rapi_CoInitializeEx
- (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class: org_eclipse_tm_rapi_Rapi
- * Method: CoUninitialize
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_tm_rapi_Rapi_CoUninitialize
- (JNIEnv *, jclass);
-
-/*
- * Class: org_eclipse_tm_rapi_Rapi
- * Method: CreateRapiDesktop
- * Signature: ([I)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_tm_rapi_Rapi_CreateRapiDesktop
- (JNIEnv *, jclass, jintArray);
-
-/*
- * Class: org_eclipse_tm_rapi_Rapi
- * Method: ReleaseIUnknown
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_tm_rapi_Rapi_ReleaseIUnknown
- (JNIEnv *, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/plugin.properties 2009-05-25 21:22:08.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/plugin.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-providerName = Eclipse.org - DSDP
-pluginName = RAPI2 Java wrappers (Incubation)
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDesktop.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDesktop.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDesktop.java 2008-04-09 12:55:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDesktop.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.internal.rapi;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiEnumDevices;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiException;
-
-/**
- * Implementation of IRapiDesktop
.
- *
- * @author Radoslav Gerganov
- */
-public class RapiDesktop extends IRapiDesktop {
-
- public RapiDesktop(int addr) {
- super(addr);
- }
-
- public IRapiEnumDevices enumDevices() throws RapiException {
- int[] ppIEnum = new int[1];
- int rc = EnumDevices(addr, ppIEnum);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("EnumDevices failed", rc); //$NON-NLS-1$
- }
- return new RapiEnumDevices(ppIEnum[0]);
- }
-
- public String toString() {
- return "[RapiDesktop] addr: " + Integer.toHexString(addr); //$NON-NLS-1$
- }
-
- private final native int EnumDevices(int addr, int[] ppIEnum);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDevice.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDevice.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDevice.java 2008-04-09 12:55:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiDevice.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.internal.rapi;
-
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiConnectionInfo;
-import org.eclipse.tm.rapi.RapiDeviceInfo;
-import org.eclipse.tm.rapi.RapiException;
-
-/**
- * Implementation of IRapiDevice
.
- *
- * @author Radoslav Gerganov
- */
-public class RapiDevice extends IRapiDevice {
-
- public RapiDevice(int addr) {
- super(addr);
- }
-
- public IRapiSession createSession() throws RapiException {
- int[] ppISession = new int[1];
- int rc = CreateSession(addr, ppISession);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("CreateSession failed", rc); //$NON-NLS-1$
- }
- return new RapiSession(ppISession[0]);
- }
-
- public RapiConnectionInfo getConnectionInfo() throws RapiException {
- RapiConnectionInfo connInfo = new RapiConnectionInfo();
- int rc = GetConnectionInfo(addr, connInfo);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("GetConnectionInfo failed", rc); //$NON-NLS-1$
- }
- return connInfo;
- }
-
- public RapiDeviceInfo getDeviceInfo() throws RapiException {
- RapiDeviceInfo devInfo = new RapiDeviceInfo();
- int rc = GetDeviceInfo(addr, devInfo);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("GetDeviceInfo failed", rc); //$NON-NLS-1$
- }
- return devInfo;
- }
-
- public boolean isConnected() throws RapiException {
- int[] status = new int[1];
- int rc = GetConnectStat(addr, status);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("GetConnectStat failed", rc); //$NON-NLS-1$
- }
- return status[0] == 1;
- }
-
- public String toString() {
- return "[RapiDevice] addr: " + Integer.toHexString(addr); //$NON-NLS-1$
- }
-
- private final native int CreateSession(int addr, int[] ppISession);
- private final native int GetConnectionInfo(int addr, RapiConnectionInfo pConnInfo);
- private final native int GetDeviceInfo(int addr, RapiDeviceInfo pDevInfo);
- private final native int GetConnectStat(int addr, int[] status);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiEnumDevices.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiEnumDevices.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiEnumDevices.java 2008-04-09 12:55:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiEnumDevices.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.internal.rapi;
-
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.IRapiEnumDevices;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiException;
-
-/**
- * Implementation of IRapiEnumDevices
.
- *
- * @author Radoslav Gerganov
- */
-public class RapiEnumDevices extends IRapiEnumDevices {
-
- public RapiEnumDevices(int addr) {
- super(addr);
- }
-
- public IRapiDevice next() throws RapiException {
- int[] ppIDevice = new int[1];
- int rc = Next(addr, ppIDevice);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("Next failed", rc); //$NON-NLS-1$
- }
- return new RapiDevice(ppIDevice[0]);
- }
-
- public String toString() {
- return "[RapiEnumDevices] addr: " + Integer.toHexString(addr); //$NON-NLS-1$
- }
-
- private final native int Next(int addr, int[] ppIDevice);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiSession.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiSession.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiSession.java 2008-06-30 11:12:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/internal/rapi/RapiSession.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov 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
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- * Radoslav Gerganov - [238773] [WinCE] Implement IRAPISession#CeRapiInvoke
- *******************************************************************************/
-package org.eclipse.tm.internal.rapi;
-
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.ProcessInformation;
-import org.eclipse.tm.rapi.RapiException;
-import org.eclipse.tm.rapi.RapiFindData;
-
-
-/**
- * Implementation of IRapiSession
.
- *
- * @author Radoslav Gerganov
- */
-public class RapiSession extends IRapiSession {
-
- private RapiFindData[] EMPTY_FIND_DATA_ARR = new RapiFindData[0];
-
- public RapiSession(int addr) {
- super(addr);
- }
-
- private int getError() {
- int err = CeRapiGetError(addr);
- if (err >= 0) {
- err = CeGetLastError(addr);
- }
- return err;
- }
-
- public void init() throws RapiException {
- int rc = CeRapiInit(addr);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("CeRapiInit failed", rc); //$NON-NLS-1$
- }
- }
-
- public void uninit() throws RapiException {
- int rc = CeRapiUninit(addr);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("CeRapiUninit failed", rc); //$NON-NLS-1$
- }
- }
-
- public int createFile(String fileName, int desiredAccess, int shareMode,
- int creationDisposition, int flagsAndAttributes) throws RapiException {
-
- int handle = CeCreateFile(addr, fileName, desiredAccess, shareMode,
- creationDisposition, flagsAndAttributes);
- if (handle == Rapi.INVALID_HANDLE_VALUE) {
- throw new RapiException("CeCreateFile failed", getError()); //$NON-NLS-1$
- }
- return handle;
- }
-
- public int readFile(int handle, byte[] b) throws RapiException {
- if (b.length == 0) {
- return 0;
- }
- int[] bytesRead = new int[1];
- boolean res = CeReadFile(addr, handle, b, b.length, bytesRead);
- if (!res) {
- throw new RapiException("CeReadFile failed", getError()); //$NON-NLS-1$
- }
- return bytesRead[0] > 0 ? bytesRead[0] : -1;
- }
-
- public int readFile(int handle, byte[] b, int off, int len)
- throws RapiException {
- if (off < 0 || len < 0 || off + len > b.length) {
- throw new IndexOutOfBoundsException("Incorrect offset/length"); //$NON-NLS-1$
- }
- if (len == 0) {
- return 0;
- }
- //TODO: add support for setting offset in the native code and remove this tmp array
- byte[] tmp = new byte[len];
- int[] bytesRead = new int[1];
- boolean res = CeReadFile(addr, handle, tmp, tmp.length, bytesRead);
- if (!res) {
- throw new RapiException("CeReadFile failed", getError()); //$NON-NLS-1$
- }
- System.arraycopy(tmp, 0, b, off, len);
- return bytesRead[0] > 0 ? bytesRead[0] : -1;
- }
-
- public void writeFile(int handle, byte[] b) throws RapiException {
- int[] bytesWritten = new int[1];
- boolean res = CeWriteFile(addr, handle, b, b.length, bytesWritten);
- if (!res) {
- throw new RapiException("CeWriteFile failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void writeFile(int handle, byte[] b, int off, int len)
- throws RapiException {
-
- if (off < 0 || len < 0 || off + len > b.length) {
- throw new IndexOutOfBoundsException("Incorrect offset/length"); //$NON-NLS-1$
- }
- //TODO: add support for setting offset in the native code and remove this tmp array
- byte[] tmp = new byte[len];
- System.arraycopy(b, off, tmp, 0, len);
- int[] bytesWritten = new int[1];
- boolean res = CeWriteFile(addr, handle, tmp, tmp.length, bytesWritten);
- if (!res) {
- throw new RapiException("CeWriteFile failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void closeHandle(int handle) throws RapiException {
- boolean res = CeCloseHandle(addr, handle);
- if (!res) {
- throw new RapiException("CeCloseHandle failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void copyFile(String existingFile, String newFile) throws RapiException {
- //overwrite by default
- boolean res = CeCopyFile(addr, existingFile, newFile, false);
- if (!res) {
- throw new RapiException("CeCopyFile failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void deleteFile(String fileName) throws RapiException {
- boolean res = CeDeleteFile(addr, fileName);
- if (!res) {
- throw new RapiException("CeDeleteFile failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void moveFile(String existingFileName, String newFileName) throws RapiException {
- boolean res = CeMoveFile(addr, existingFileName, newFileName);
- if (!res) {
- throw new RapiException("CeMoveFile failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void createDirectory(String pathName) throws RapiException {
- boolean res = CeCreateDirectory(addr, pathName);
- if (!res) {
- throw new RapiException("CeCreateDirectory failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void removeDirectory(String pathName) throws RapiException {
- boolean res = CeRemoveDirectory(addr, pathName);
- if (!res) {
- throw new RapiException("CeRemoveDirectory failed", getError()); //$NON-NLS-1$
- }
- }
-
- public int findFirstFile(String fileName, RapiFindData findData) throws RapiException {
- int handle = CeFindFirstFile(addr, fileName, findData);
- if (handle == Rapi.INVALID_HANDLE_VALUE) {
- throw new RapiException("CeFindFirstFile failed", getError()); //$NON-NLS-1$
- }
- return handle;
- }
-
- public RapiFindData findNextFile(int handle) {
- RapiFindData findData = new RapiFindData();
- boolean res = CeFindNextFile(addr, handle, findData);
- // just return null if findNext fail
- return res ? findData : null;
- }
-
- public void findClose(int handle) throws RapiException {
- boolean res = CeFindClose(addr, handle);
- if (!res) {
- throw new RapiException("CeFindClose failed", getError()); //$NON-NLS-1$
- }
- }
-
- public RapiFindData[] findAllFiles(String path, int flags) throws RapiException {
- int[] foundCount = new int[1];
- int[] dataArr = new int[1];
- boolean res = CeFindAllFiles(addr, path, flags, foundCount, dataArr);
- int count = foundCount[0];
- if (!res || count == 0) {
- // nothing found
- return EMPTY_FIND_DATA_ARR;
- }
- RapiFindData[] findDataArr = new RapiFindData[count];
- for (int i = 0 ; i < count ; i++) {
- findDataArr[i] = new RapiFindData();
- }
- int hRes = CeFindAllFilesEx(addr, count, dataArr[0], findDataArr);
- if (hRes != Rapi.NOERROR) {
- throw new RapiException("CeFindAllFilesEx failed", hRes); //$NON-NLS-1$
- }
- return findDataArr;
- }
-
- public int getFileAttributes(String fileName) {
- int attributes = CeGetFileAttributes(addr, fileName);
-// if (attributes == 0xFFFFFFFF) {
-// throw new RapiException("CeGetFileAttributes failed", getError());
-// }
- return attributes;
- }
-
- public long getFileSize(int handle) {
- int[] sizeHigh = new int[] {1};
- int sizeLow = CeGetFileSize(addr, handle, sizeHigh);
- return ( ((long)sizeHigh[0] << 32) | (sizeLow & 0xFFFFFFFF));
- }
-
- public long getFileCreationTime(int handle) throws RapiException {
- long[] crTime = new long[1];
- long[] laTime = new long[1];
- long[] lwTime = new long[1];
- boolean res = CeGetFileTime(addr, handle, crTime, laTime, lwTime);
- if (!res) {
- throw new RapiException("CeGetFileTime failed", getError()); //$NON-NLS-1$
- }
- return (crTime[0] / 10000) - Rapi.TIME_DIFF;
- }
-
- public long getFileLastAccessTime(int handle) throws RapiException {
- long[] crTime = new long[1];
- long[] laTime = new long[1];
- long[] lwTime = new long[1];
- boolean res = CeGetFileTime(addr, handle, crTime, laTime, lwTime);
- if (!res) {
- throw new RapiException("CeGetFileTime failed", getError()); //$NON-NLS-1$
- }
- return (laTime[0] / 10000) - Rapi.TIME_DIFF;
- }
-
- public long getFileLastWriteTime(int handle) throws RapiException {
- long[] crTime = new long[1];
- long[] laTime = new long[1];
- long[] lwTime = new long[1];
- boolean res = CeGetFileTime(addr, handle, crTime, laTime, lwTime);
- if (!res) {
- throw new RapiException("CeGetFileTime failed", getError()); //$NON-NLS-1$
- }
- return (lwTime[0] / 10000) - Rapi.TIME_DIFF;
- }
-
- public void setFileAttributes(String fileName, int fileAttributes) throws RapiException {
- boolean res = CeSetFileAttributes(addr, fileName, fileAttributes);
- if (!res) {
- throw new RapiException("CeSetFileAttributes failed", getError()); //$NON-NLS-1$
- }
- }
-
- public void setFileLastWriteTime(int handle, long lastWriteTime) throws RapiException {
- if (lastWriteTime < 0) {
- throw new IllegalArgumentException("Time cannot be negative"); //$NON-NLS-1$
- }
- long[] lwTime = new long[] {(lastWriteTime + Rapi.TIME_DIFF) * 10000};
- boolean res = CeSetFileTime(addr, handle, null, null, lwTime);
- if (!res) {
- throw new RapiException("CeSetFileTime failed", getError()); //$NON-NLS-1$
- }
- }
-
- public ProcessInformation createProcess(String appName, String commandLine, int creationFlags) throws RapiException {
- ProcessInformation pi = new ProcessInformation();
- if (!CeCreateProcess(addr, appName, commandLine, creationFlags, pi)) {
- throw new RapiException("CeCreateProcess failed", getError()); //$NON-NLS-1$
- }
- return pi;
- }
-
- public byte[] invoke(String dllPath, String funcName, byte[] input) throws RapiException {
- int[] output = new int[2];
- int res = CeRapiInvoke(addr, dllPath, funcName, input, output);
- if (res != 0) {
- throw new RapiException("CeRapiInvoke failed", res); //$NON-NLS-1$
- }
- int outputLength = output[0];
- int outputPtr = output[1];
- byte[] outputArr = new byte[outputLength];
- CeRapiInvokeEx(outputPtr, outputArr);
- return outputArr;
- }
-
- public String toString() {
- return "[RapiSession] addr: " + Integer.toHexString(addr); //$NON-NLS-1$
- }
-
- private final native int CeRapiInit(int addr);
-
- private final native int CeRapiUninit(int addr);
-
- private final native int CeRapiGetError(int addr);
-
- private final native int CeGetLastError(int addr);
-
- private final native int CeCreateFile(int addr, String lpFileName,
- int dwDesiredAccess, int dwShareMode, int dwCreationDisposition,
- int dwFlagsAndAttributes);
-
- private final native boolean CeReadFile(int addr, int hFile, byte[] lpBuffer,
- int nNumberOfBytesToRead, int[] lpNumberOfBytesRead);
-
- private final native boolean CeWriteFile(int addr, int hFile, byte[] lpBuffer,
- int nNumberOfBytesToWrite, int[] lpNumberOfBytesWritten);
-
- private final native boolean CeCloseHandle(int addr, int hObject);
-
- private final native boolean CeCopyFile(int addr, String lpExistingFileName,
- String lpNewFileName, boolean bFailIfExists);
-
- private final native boolean CeDeleteFile(int addr, String lpFileName);
-
- private final native boolean CeMoveFile(int addr, String lpExistingFileName,
- String lpNewFileName);
-
- private final native boolean CeCreateDirectory(int addr, String lpPathName);
-
- private final native boolean CeRemoveDirectory(int addr, String lpPathName);
-
- private final native int CeFindFirstFile(int addr, String lpFileName,
- RapiFindData lpFindFileData);
-
- private final native boolean CeFindNextFile(int addr, int hFindFile,
- RapiFindData lpFindFileData);
-
- private final native boolean CeFindClose(int addr, int hFindFile);
-
- private final native boolean CeFindAllFiles(int addr, String szPath,
- int dwFlags, int[] lpdwFoundCount, int[] ppFindDataArray);
-
- private final native int CeFindAllFilesEx(int addr, int foundCount,
- int dataArr, RapiFindData[] findDataArr);
-
- private final native int CeGetFileAttributes(int addr, String lpFileName);
-
- private final native int CeGetFileSize(int addr, int hFile, int[] lpFileSizeHigh);
-
- private final native boolean CeGetFileTime(int addr, int hFile,
- long[] lpCreationTime, long[] lpLastAccessTime, long[] lpLastWriteTime);
-
- private final native boolean CeSetFileAttributes(int addr, String lpFileName, int dwFileAttributes);
-
- private final native boolean CeSetFileTime(int addr, int hFile, long[] lpCreationTime,
- long[] lpLastAccessTime, long[] lpLastWriteTime);
-
- private final native boolean CeCreateProcess(int addr, String lpApplicationName,
- String lpCommandLine, int dwCreationFlags, ProcessInformation lpProcessInformation);
-
- private final native int CeRapiInvoke(int addr, String dllPath, String funcName,
- byte[] input, int[] output);
-
- /**
- * Initializes the outputArr with the memory pointed by outputPtr.
- */
- private final native void CeRapiInvokeEx(int outputPtr, byte[] outputArr);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDesktop.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDesktop.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDesktop.java 2008-04-10 01:27:09.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDesktop.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-import org.eclipse.tm.internal.rapi.RapiDesktop;
-
-/**
- * This class is used to find connected WinCE-based remote devices.
- * Use {@link IRapiDesktop#getInstance()} to obtain an instance.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @author Radoslav Gerganov
- */
-public abstract class IRapiDesktop extends IUnknown {
-
- public IRapiDesktop(int addr) {
- super(addr);
- }
-
- /**
- * Returns new instance of IRapiDesktop
.
- * Use {@link IRapiDesktop#release()} to release this instance when it is
- * no longer needed.
- * @return new instance of IRapiDesktop
- * @throws RapiException if an error occurs.
- */
- public synchronized static IRapiDesktop getInstance() throws RapiException {
- int[] rapiDesktop = new int[1];
- int rc = Rapi.CreateRapiDesktop(rapiDesktop);
- if (rc != Rapi.NOERROR) {
- throw new RapiException("CreateRapiDesktop failed", rc); //$NON-NLS-1$
- }
- return new RapiDesktop(rapiDesktop[0]);
- }
-
- /**
- * Returns an instance of IRapiEnumDevices
.
- * Use {@link IRapiEnumDevices#release()} to release this instance when it is
- * no longer needed.
- * @return an instance of IRapiEnumDevices
- * @throws RapiException if an error occurs.
- */
- public abstract IRapiEnumDevices enumDevices() throws RapiException;
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDevice.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDevice.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDevice.java 2008-04-10 01:27:09.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiDevice.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class represents a connected WinCE-based remote device.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @author Radoslav Gerganov
- */
-public abstract class IRapiDevice extends IUnknown {
-
- public IRapiDevice(int addr) {
- super(addr);
- }
-
- /**
- * Returns an instance of IRapiSession
for this remote device.
- * Use {@link IRapiSession#release()} to release this instance when it is
- * no longer needed.
- * @return an instance of IRapiSession
- * @throws RapiException if an error occurs.
- */
- public abstract IRapiSession createSession() throws RapiException;
-
- /**
- * Returns information about the connection between this remote device and the desktop.
- * @return RapiConnectionInfo
object containing information about
- * the connection between this remote device and the desktop.
- * @throws RapiException if an error occurs.
- */
- public abstract RapiConnectionInfo getConnectionInfo() throws RapiException;
-
- /**
- * Returns information about this remote device.
- * @return RapiDeviceInfo
object containing information about this remote
- * device.
- * @throws RapiException if an error occurs.
- */
- public abstract RapiDeviceInfo getDeviceInfo() throws RapiException;
-
- /**
- * Tests whether this device is connected.
- * @return true
if this device is connected;false
otherwise.
- * @throws RapiException if an error occurs.
- */
- public abstract boolean isConnected() throws RapiException;
-
-}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiEnumDevices.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiEnumDevices.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiEnumDevices.java 2008-04-10 01:27:09.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiEnumDevices.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class is used to enumerate the set of connected WinCE-based
- * remote devices which are represented by IRapiDevice
- * objects.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @author Radoslav Gerganov
- */
-public abstract class IRapiEnumDevices extends IUnknown {
-
- public IRapiEnumDevices(int addr) {
- super(addr);
- }
-
- /**
- * Returns an instance of IRapiDevice
.
- * Use {@link IRapiDevice#release()} to release this instance when it is
- * no longer needed.
- * @return an instance of IRapiDevice
- * @throws RapiException if an error occurs.
- */
- public abstract IRapiDevice next() throws RapiException;
-
-}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiSession.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiSession.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiSession.java 2008-06-30 14:48:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IRapiSession.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov 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
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- * Radoslav Gerganov - [238773] [WinCE] Implement IRAPISession#CeRapiInvoke
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class is used to perform Remote API 2 operations on a connected
- * WinCE-based remote device.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @author Radoslav Gerganov
- */
-public abstract class IRapiSession extends IUnknown {
-
- public IRapiSession(int addr) {
- super(addr);
- }
-
- /**
- * Initializes (synchronously) the communication layers between the desktop
- * and the target remote device. This method must be called before calling any
- * of the other IRapiSession
methods. Use {@link IRapiSession#uninit()}
- * to uninitialize the session.
- * @throws RapiException if an error occurs.
- */
- public abstract void init() throws RapiException;
-
- /**
- * Uninitializes the session. This method should be called last.
- * @throws RapiException if an error occurs.
- */
- public abstract void uninit() throws RapiException;
-
- /**
- * Creates, opens, or truncates a file on the remote device.
- * @param fileName file name on the remote device
- * @param desiredAccess specifies the type of access to the file
- * @param shareMode specifies how the file can be shared
- * @param creationDisposition specifies which action to take on
- * files that exist, and which action to take when files do not exist
- * @param flagsAndAttributes specifies the file attributes and flags
- * for the file
- * @return integer representing a valid handle that can be used to access the file
- * @throws RapiException if an error occurs.
- */
- public abstract int createFile(String fileName, int desiredAccess,
- int shareMode, int creationDisposition,
- int flagsAndAttributes) throws RapiException;
-
- /**
- * Reads up to b.length
bytes of data from a remote file
- * into an array of bytes.
- * @param handle handle to the file to be read
- * @param b the buffer into which the data is read
- * @return the total number of bytes read into the buffer, or
- * -1
if there is no more data because the end of
- * the file has been reached
- * @throws RapiException if an error occurs.
- */
- public abstract int readFile(int handle, byte[] b) throws RapiException;
-
- /**
- * Reads up to len
bytes of data from a remote file
- * into an array of bytes.
- * @param handle handle to the file to be read
- * @param b the buffer into which the data is read
- * @param off the start offset of the data
- * @param len the maximum number of bytes read
- * @return the total number of bytes read into the buffer, or
- * -1
if there is no more data because the end of
- * the file has been reached
- * @throws RapiException if an error occurs.
- */
- public abstract int readFile(int handle, byte[] b, int off, int len)
- throws RapiException;
-
- /**
- * Writes b.length
bytes from the specified byte array
- * to a remote file.
- * @param handle handle to the file to which bytes will be written
- * @param b the data
- * @throws RapiException if an error occurs.
- */
- public abstract void writeFile(int handle, byte[] b) throws RapiException;
-
- /**
- * Writes len
bytes from the specified byte array
- * starting at offset off
to a remote file.
- * @param handle handle to the file to which bytes will be written
- * @param b the data
- * @param off the start offset in the data
- * @param len the number of bytes to write
- * @throws RapiException if an error occurs.
- */
- public abstract void writeFile(int handle, byte[] b, int off, int len)
- throws RapiException;
-
- /**
- * Closes an open file handle.
- * @param handle handle to an open file
- * @throws RapiException if an error occurs.
- */
- public abstract void closeHandle(int handle) throws RapiException;
-
- /**
- * Copies an existing file on the remote device to a new file on the
- * remote device.
- * @param existingFile the file name of the existing file
- * @param newFile the file name of the new file
- * @throws RapiException if an error occurs.
- */
- public abstract void copyFile(String existingFile, String newFile)
- throws RapiException;
-
- /**
- * Deletes the specified file on the remote device.
- * @param fileName the file to be deleted
- * @throws RapiException if an error occurs.
- */
- public abstract void deleteFile(String fileName) throws RapiException;
-
- /**
- * Renames existing file or directory on the remote device.
- * @param existingFileName the existing name
- * @param newFileName the new name
- * @throws RapiException if an error occurs.
- */
- public abstract void moveFile(String existingFileName,
- String newFileName) throws RapiException;
-
- /**
- * Creates a new directory on the remote device.
- * @param pathName the path of the directory to be created
- * @throws RapiException if an error occurs.
- */
- public abstract void createDirectory(String pathName) throws RapiException;
-
- /**
- * Deletes an existing empty directory on the remote device.
- * @param pathName the path of the directory to be deleted
- * @throws RapiException if an error occurs.
- */
- public abstract void removeDirectory(String pathName) throws RapiException;
-
- /**
- * Searches for a file or sub-directory in a directory on the remote device.
- * Use {@link IRapiSession#findNextFile(int)} to get the next found file.
- * Finally, call {@link IRapiSession#findClose(int)} to close the returned search handle.
- * @param fileName string that specifies a valid directory or path and file name.
- * This string can contain wildcard characters (* and ?)
- * @param findData [out] this object receives information about the found file
- * or sub-directory
- * @return integer representing valid search handle
- * @throws RapiException if an error occurs.
- */
- public abstract int findFirstFile(String fileName,
- RapiFindData findData) throws RapiException;
-
- /**
- * Retrieves the next file in an enumeration context.
- * @param handle search handle obtained with a call to
- * {@link IRapiSession#findFirstFile(String, RapiFindData)}
- * @return RapiFindData
object containing information about the
- * next file/sub-directory or null
if no matching files can be found
- */
- public abstract RapiFindData findNextFile(int handle);
-
- /**
- * Closes the specified search handle on the remote device.
- * @param handle the search handle to close
- * @throws RapiException if an error occurs.
- */
- public abstract void findClose(int handle) throws RapiException;
-
- /**
- * Retrieves information about all files and directories in the given directory on
- * the remote device.
- * @param path string containing the path in which to search for files
- * @param flags combination of filter and retrieval flags
- * @return an array of RapiFindData
objects containing the information
- * about the found items
- * @throws RapiException if an error occurs.
- */
- public abstract RapiFindData[] findAllFiles(String path,
- int flags) throws RapiException;
-
- /**
- * Returns attributes for the specified file or directory on the remote device.
- * @param fileName string that specifies the name of a file or directory
- * @return attributes for the specified file or -1
- * if an error has occurred
- */
- public abstract int getFileAttributes(String fileName);
-
- /**
- * Returns the size, in bytes, of the specified file on the remote device.
- * @param handle open handle of the file whose size is being returned
- * @return the file size in bytes
- */
- public abstract long getFileSize(int handle);
-
- /**
- * Returns the time when the file was created.
- *
- * The time is represented as the number of Universal Time (UT)
- * milliseconds since the epoch (00:00:00 GMT, January 1, 1970).
- *
- * @param handle handle to the file for which to get creation time
- * @return the creation time for this file
- * @throws RapiException if an error occurs.
- */
- public abstract long getFileCreationTime(int handle) throws RapiException;
-
- /**
- * Returns the time when the file was last accessed.
- *
- * The time is represented as the number of Universal Time (UT)
- * milliseconds since the epoch (00:00:00 GMT, January 1, 1970).
- *
- * @param handle handle to the file for which to get last access time
- * @return the last access time for this file
- * @throws RapiException if an error occurs.
- */
- public abstract long getFileLastAccessTime(int handle) throws RapiException;
-
- /**
- * Returns the time when the file was last written to.
- *
- * The time is represented as the number of Universal Time (UT)
- * milliseconds since the epoch (00:00:00 GMT, January 1, 1970).
- *
- * @param handle handle to the file for which to get last write time
- * @return the last write time for this file
- * @throws RapiException if an error occurs.
- */
- public abstract long getFileLastWriteTime(int handle) throws RapiException;
-
- /**
- * Sets the attributes of the specified file on the remote device.
- * @param fileName the target file
- * @param fileAttributes the new attributes; this parameter is combination of the
- * following values: {@link Rapi#FILE_ATTRIBUTE_ARCHIVE}, {@link Rapi#FILE_ATTRIBUTE_HIDDEN},
- * {@link Rapi#FILE_ATTRIBUTE_NORMAL}, {@link Rapi#FILE_ATTRIBUTE_READONLY},
- * {@link Rapi#FILE_ATTRIBUTE_SYSTEM}, {@link Rapi#FILE_ATTRIBUTE_TEMPORARY}
- * @throws RapiException if an error occurs.
- */
- public abstract void setFileAttributes(String fileName, int fileAttributes) throws RapiException;
-
- /**
- * Sets the last write time of the specified file.
- *
- * The time is represented as the number of Universal Time (UT)
- * milliseconds since the epoch (00:00:00 GMT, January 1, 1970).
- *
- * The specified time will be truncated to fit the supported precision.
- * @param handle handle to the target file
- * @param lastWriteTime the new last write time for this file
- * @throws IllegalArgumentException if the specified time is negative
- * @throws RapiException if an error occurs.
- */
- public abstract void setFileLastWriteTime(int handle, long lastWriteTime) throws RapiException;
-
- /**
- * Creates new process on the remote device.
- * @param appName module to execute
- * @param commandLine command line arguments
- * @param creationFlags additional flags controlling the creation
- * @return ProcessInformaion
containing information about the new process
- * @throws RapiException if an error occurs.
- */
- public abstract ProcessInformation createProcess(String appName, String commandLine,
- int creationFlags) throws RapiException;
-
- /**
- * Invokes the specified native function on the remote device passing the specified byte array as argument.
- * The native function must have the following signature:
- * HRESULT funcName(DWORD inpLen, BYTE *inp, DWORD *outLen, BYTE **out, IRAPIStream *stream)
- * The native function must return 0
on success or non-zero value if an error occurs.
- * @param dllPath the name of the dll on the remote device which contains the native function
- * @param funcName the name of the native function that will be called
- * @param input byte array which will be passed to the native function; inpLen
is initialized with
- * the length of input
and inp
points to a buffer with the same content as
- * input
- * @return byte array returned from the native function; the length and the content of the returned array
- * corresponds to *outLen
and *out
respectively
- * @throws RapiException if an error occurs.
- * @since org.eclipse.tm.rapi 0.2
- */
- public abstract byte[] invoke(String dllPath, String funcName, byte[] input) throws RapiException;
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IUnknown.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IUnknown.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IUnknown.java 2008-04-10 01:27:09.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/IUnknown.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * Java wrapper for the native IUnknown interface.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @author Radoslav Gerganov
- */
-public abstract class IUnknown {
-
- /**
- * Pointer to the underlying IUnknown
object.
- */
- protected int addr;
-
- public IUnknown(int addr) {
- this.addr = addr;
- }
-
- /**
- * Releases the underlying IUnknown object.
- */
- public void release() {
- Rapi.ReleaseIUnknown(addr);
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/ProcessInformation.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/ProcessInformation.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/ProcessInformation.java 2008-04-03 15:58:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/ProcessInformation.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class contains information for a new process
- * created with {@link IRapiSession#createProcess(String, String, int)}
- *
- * @author Radoslav Gerganov
- */
-public class ProcessInformation {
- public int hProcess;
- public int hThread;
- public int dwProcessId;
- public int dwThreadId;
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java 2008-09-25 17:37:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/Rapi.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class provides access to some native Win32 APIs and constants.
- *
- * @noinstantiate This class is not intended to be instantiated by clients.
- * @author Radoslav Gerganov
- */
-public final class Rapi {
-
- static {
- System.loadLibrary("jrapi"); //$NON-NLS-1$
- }
-
- public static final int NOERROR = 0;
- //TODO: add more error codes
-
- public static final int GENERIC_READ = 0x80000000;
- public static final int GENERIC_WRITE = 0x40000000;
- public static final int FILE_SHARE_READ = 0x00000001;
- public static final int FILE_SHARE_WRITE = 0x00000002;
-
- public static final int CREATE_NEW = 1;
- public static final int CREATE_ALWAYS = 2;
- public static final int OPEN_EXISTING = 3;
- public static final int OPEN_ALWAYS = 4;
- public static final int TRUNCATE_EXISTING = 5;
-
- public static final int FILE_ATTRIBUTE_ARCHIVE = 0x00000020;
- public static final int FILE_ATTRIBUTE_COMPRESSED = 0x00000800;
- public static final int FILE_ATTRIBUTE_DIRECTORY = 0x00000010;
- public static final int FILE_ATTRIBUTE_ENCRYPTED = 0x00004000;
- public static final int FILE_ATTRIBUTE_HIDDEN = 0x00000002;
- public static final int FILE_ATTRIBUTE_INROM = 0x00000040;
- public static final int FILE_ATTRIBUTE_NORMAL = 0x00000080;
- public static final int FILE_ATTRIBUTE_READONLY = 0x00000001;
- public static final int FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400;
- public static final int FILE_ATTRIBUTE_ROMMODULE = 0x00002000;
- public static final int FILE_ATTRIBUTE_SPARSE_FILE = 0x00000200;
- public static final int FILE_ATTRIBUTE_SYSTEM = 0x00000004;
- public static final int FILE_ATTRIBUTE_TEMPORARY = 0x00000100;
-
- public static final int FILE_FLAG_WRITE_THROUGH = 0x80000000;
- public static final int FILE_FLAG_OVERLAPPED = 0x40000000;
- public static final int FILE_FLAG_RANDOM_ACCESS = 0x10000000;
- public static final int FILE_FLAG_SEQUENTIAL_SCAN = 0x08000000;
-
- public static final int FAF_ATTRIB_CHILDREN = 0x01000;
- public static final int FAF_ATTRIB_NO_HIDDEN = 0x02000;
- public static final int FAF_FOLDERS_ONLY = 0x04000;
- public static final int FAF_NO_HIDDEN_SYS_ROMMODULES = 0x08000;
- public static final int FAF_GETTARGET = 0x10000;
-
- public static final int FAF_ATTRIBUTES = 0x01;
- public static final int FAF_CREATION_TIME = 0x02;
- public static final int FAF_LASTACCESS_TIME = 0x04;
- public static final int FAF_LASTWRITE_TIME = 0x08;
- public static final int FAF_SIZE_HIGH = 0x10;
- public static final int FAF_SIZE_LOW = 0x20;
- public static final int FAF_OID = 0x40;
- public static final int FAF_NAME = 0x80;
-
- public static final int INVALID_HANDLE_VALUE = -1;
-
- public static final long TIME_DIFF = 11644473600000L;
-
- public static final int COINIT_MULTITHREADED = 0x0;
- public static final int COINIT_APARTMENTTHREADED = 0x2;
- public static final int COINIT_DISABLE_OLE1DDE = 0x4;
- public static final int COINIT_SPEED_OVER_MEMORY = 0x8;
-
- /**
- * Initializes the library, the clients must call this method before any
- * other. The meaning of the init
parameter and the returned
- * value is platform dependent. On Win32 platforms this method is directly
- * mapped to CoInitializeEx
.
- *
- * @param init on Win32 it is either {@link #COINIT_APARTMENTTHREADED} or
- * {@link #COINIT_MULTITHREADED}
- * @return on Win32 this is the returned value from
- * CoInitializeEx
- */
- public static final int initialize(int init) {
- return CoInitializeEx(0, init);
- }
-
- /**
- * Uninitializes the library, the clients must call this method last to free any allocated resources.
- * This method is platform dependent, on Win32 it is directly mapped to CoUninitialize
.
- */
- public static final void uninitialize() {
- CoUninitialize();
- }
-
- /**
- * Initializes the COM library.
- */
- static final native int CoInitializeEx(int pvReserved, int dwCoInit);
-
- /**
- * Closes the COM library on the current thread.
- */
- static final native void CoUninitialize();
-
- /**
- * Sets the first element of the specified array with the address of a newly
- * instantiated IRAPIDesktop
native interface.
- *
- * @param pIRAPIDesktop an array with one element
- * @return {@link #NOERROR} if the function succeeds; otherwise an error
- * code
- */
- final static native int CreateRapiDesktop(int[] pIRAPIDesktop);
-
-
- /**
- * Invokes the Release
method of the IUnkonwn
object
- * having the specified address.
- * @param addr the address of the IUnknown
object
- */
- final static native void ReleaseIUnknown(int addr);
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiConnectionInfo.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiConnectionInfo.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiConnectionInfo.java 2008-04-02 11:59:11.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiConnectionInfo.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class contains information that describes the connection between
- * a WinCE device and a host computer.
- *
- * @author Radoslav Gerganov
- */
-public class RapiConnectionInfo {
-
- public static final int RAPI_CONNECTION_USB = 0;
- public static final int RAPI_CONNECTION_IR = 1;
- public static final int RAPI_CONNECTION_SERIAL = 2;
- public static final int RAPI_CONNECTION_NETWORK = 3;
-
- //FIXME
- //SOCKADDR_STORAGE ipaddr;
- //SOCKADDR_STORAGE hostIpaddr;
-
- public int connectionType;
-
- public String toString() {
- switch (connectionType) {
- case RAPI_CONNECTION_USB: return "USB"; //$NON-NLS-1$
- case RAPI_CONNECTION_IR: return "IR"; //$NON-NLS-1$
- case RAPI_CONNECTION_SERIAL: return "Serial"; //$NON-NLS-1$
- case RAPI_CONNECTION_NETWORK: return "Network"; //$NON-NLS-1$
- }
- return "Unknown"; //$NON-NLS-1$
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiDeviceInfo.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiDeviceInfo.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiDeviceInfo.java 2008-03-27 19:50:25.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiDeviceInfo.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * This class contains information that identifies a particular WinCE device.
- *
- * @author Radoslav Gerganov
- */
-public class RapiDeviceInfo {
-
- public String id;
- public int versionMajor;
- public int versionMinor;
- public String name;
- public String platform;
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiException.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiException.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiException.java 2008-04-02 11:59:11.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiException.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-/**
- * Signals that an error has occurred during execution of RAPI2 call.
- *
- * @author Radoslav Gerganov
- */
-public class RapiException extends Exception {
-
- private static final long serialVersionUID = -1833456445593343458L;
-
- private int errorCode;
-
- public RapiException(String msg) {
- super(msg);
- }
-
- public RapiException(String msg, int errCode) {
- super(msg + " errorCode: 0x" + Integer.toHexString(errCode)); //$NON-NLS-1$
- this.errorCode = errCode;
- }
-
- /**
- * Returns the error code associated with this exception.
- */
- public int getErrorCode() {
- return errorCode;
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiFindData.java eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiFindData.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiFindData.java 2008-04-09 12:55:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi/src/org/eclipse/tm/rapi/RapiFindData.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi;
-
-import java.util.Date;
-
-/**
- * This class describes a file found by CeFindFirstFile
- * or CeFindAllFiles
- *
- * @author Radoslav Gerganov
- */
-public class RapiFindData {
- public int fileAttributes;
- public long creationTime;
- public long lastAccessTime;
- public long lastWriteTime;
- public long fileSize;
- public int oid;
- public String fileName;
-
- public Date getCreationTime() {
- return new Date((creationTime / 10000) - Rapi.TIME_DIFF);
- }
-
- public Date getLastAccessTime() {
- return new Date((lastAccessTime / 10000) - Rapi.TIME_DIFF);
- }
-
- public Date getLastWriteTime() {
- return new Date((lastWriteTime / 10000) - Rapi.TIME_DIFF);
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.classpath eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.classpath
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.classpath 2008-03-27 20:06:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.classpath 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.cvsignore 2008-05-21 12:56:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.project eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.project 2008-03-27 19:46:50.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.project 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
- org.eclipse.tm.rapi.examples
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.settings/org.eclipse.jdt.core.prefs eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.settings/org.eclipse.jdt.core.prefs
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/.settings/org.eclipse.jdt.core.prefs 2008-03-31 12:37:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/.settings/org.eclipse.jdt.core.prefs 1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF 2008-04-02 11:59:08.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.rapi.examples
-Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.tm.rapi.examples.Activator
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-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
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/about.html eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/about.html
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/about.html 2008-03-27 20:50:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/about.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-March 27, 2008
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/build.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/build.properties 2008-03-27 20:50:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/build.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - add about.html
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
-src.includes = about.html
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/plugin.properties 2009-05-25 21:21:42.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/plugin.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-providerName = Eclipse.org - DSDP
-pluginName = RAPI2 Java wrapper examples (Incubation)
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/Activator.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/Activator.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/Activator.java 2008-03-27 19:46:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/Activator.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.examples;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.tm.rapi.examples";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
-
- // run the examples when the bundle is started
- RapiExamples obj = new RapiExamples();
- obj.runExamples();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java 2008-04-24 07:33:44.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.examples/src/org/eclipse/tm/rapi/examples/RapiExamples.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.examples;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.IRapiEnumDevices;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.ProcessInformation;
-import org.eclipse.tm.rapi.RapiConnectionInfo;
-import org.eclipse.tm.rapi.RapiDeviceInfo;
-import org.eclipse.tm.rapi.RapiException;
-import org.eclipse.tm.rapi.RapiFindData;
-
-/**
- * This class demonstrates example usage of RAPI2.
- *
- * @author Radoslav Gerganov
- */
-public class RapiExamples {
-
- IRapiDesktop desktop = null;
- IRapiEnumDevices enumDevices = null;
- IRapiDevice device = null;
- IRapiSession session = null;
-
- /**
- * Initialize the underlying natives.
- */
- public void initRapi() {
- Rapi.initialize(Rapi.COINIT_MULTITHREADED);
- }
-
- /**
- * Uninitialize the underlying natives.
- */
- public void uninitRapi() {
- if (desktop != null) {
- desktop.release();
- }
- if (enumDevices != null) {
- enumDevices.release();
- }
- if (device != null) {
- device.release();
- }
- if (session != null) {
- session.release();
- }
- Rapi.uninitialize();
- }
-
- /**
- * Prints various information about the device.
- */
- public void printDeviceInfo() throws RapiException {
- System.out.println(">>> printDeviceInfo()");
- RapiDeviceInfo deviceInfo = device.getDeviceInfo();
- System.out.println("Device id: " + deviceInfo.id);
- System.out.println("Device name: " + deviceInfo.name);
- System.out.println("Platform: " + deviceInfo.platform);
- System.out.println("Major version: " + deviceInfo.versionMajor);
- System.out.println("Minor version: " + deviceInfo.versionMinor);
- }
-
- /**
- * Prints information about how the device is connected.
- */
- public void printConnectionInfo() throws RapiException {
- System.out.println(">>> printConnectionInfo()");
- RapiConnectionInfo connectionInfo = device.getConnectionInfo();
- System.out.println("Connection type: " + connectionInfo);
- System.out.println("IsConnected: " + device.isConnected());
- }
-
- /**
- * Creates file on the device with the specified filename.
- */
- public void createFile(String fileName) throws RapiException {
- System.out.println(">>> createFile()");
- int handle = session.createFile(fileName, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- byte[] content = "Hello world!".getBytes();
- session.writeFile(handle, content);
- session.closeHandle(handle);
- }
-
- /**
- * Reads the specified file on the device and prints its content.
- */
- public void readFile(String fileName) throws RapiException {
- System.out.println(">>> readFile()");
- int handle = session.createFile(fileName, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- byte[] buf = new byte[256];
- int br = session.readFile(handle, buf);
- System.out.println("readFile: " + new String(buf, 0, br));
- System.out.println("bytesRead: " + br);
- session.closeHandle(handle);
- }
-
- /**
- * Utility method used to determine if the specified RapiFindData
- * describes a directory.
- */
- boolean isDirectory(RapiFindData findData) {
- return (findData.fileAttributes & Rapi.FILE_ATTRIBUTE_DIRECTORY) != 0;
- }
-
- /**
- * Utility method used for printing RapiFindData
on the console.
- */
- void printFindData(RapiFindData findData, int indent) {
- for (int i = 0 ; i < indent ; i++) {
- System.out.print(" ");
- }
- String fileName = findData.fileName;
- if (isDirectory(findData)) {
- System.out.println("[" + fileName + "]");
- } else {
- System.out.println(fileName + " (" + findData.fileSize + ")");
- }
- }
-
- /**
- * List all files in the specified directory using
- * IRapiSession.findFirstFile
and
- * IRapiSession.findNextFile
- */
- public void listFiles(String dir) throws RapiException {
- System.out.println(">>> listFiles()");
- RapiFindData findData = new RapiFindData();
- int fh = session.findFirstFile(dir + "*", findData);
- while (findData != null) {
- printFindData(findData, 0);
- findData = session.findNextFile(fh);
- }
- session.findClose(fh);
- }
-
- /**
- * List all files in the specified directory using
- * IRapiSession.findAllFiles
- */
- public void listFiles2(String dir) throws RapiException {
- System.out.println(">>> listFiles2()");
- RapiFindData[] fdArr = session.findAllFiles(dir + "*",
- Rapi.FAF_ATTRIBUTES | Rapi.FAF_NAME | Rapi.FAF_SIZE_LOW);
- for (int i = 0 ; i < fdArr.length ; i++) {
- printFindData(fdArr[i], 0);
- }
- }
-
- /**
- * Prints various information about the specified file.
- */
- public void statFile(String fileName) throws RapiException {
- System.out.println(">>> statFile()");
- int handle = session.createFile(fileName, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- int fileAttributes = session.getFileAttributes(fileName);
- System.out.println("fileAttributes: " + fileAttributes);
- long fileSize = session.getFileSize(handle);
- System.out.println("fileSize: " + fileSize);
- System.out.println("creationTime: " + session.getFileCreationTime(handle));
- System.out.println("lastAccessTime: " + session.getFileLastAccessTime(handle));
- System.out.println("lastWriteTime: " + session.getFileLastWriteTime(handle));
- session.closeHandle(handle);
- }
-
- /**
- * Recursively print the whole device tree on the console.
- */
- void printDeviceTree(String dir, int indent) throws RapiException {
- RapiFindData[] fdArr = session.findAllFiles(dir + "*",
- Rapi.FAF_ATTRIBUTES | Rapi.FAF_NAME | Rapi.FAF_SIZE_LOW);
- if (fdArr == null) {
- return;
- }
- for (int i = 0 ; i < fdArr.length ; i++) {
- if (isDirectory(fdArr[i])) {
- printDeviceTree(dir + fdArr[i].fileName + "\\", indent + 1);
- } else {
- printFindData(fdArr[i], indent);
- }
- }
- }
-
- /**
- * Opens the specified URL in a browser. The browser is started with
- * {@link IRapiSession#createProcess(String, String, int)} and the URL
- * is passed as command line argument.
- */
- void openUrl(String url) throws RapiException {
- System.out.println(">>> openUrl() url: " + url);
- ProcessInformation pi = session.createProcess("\\Windows\\iexplore.exe", url, 0);
- System.out.println("hProcess: " + Integer.toHexString(pi.hProcess));
- System.out.println("hThread: " + Integer.toHexString(pi.hThread));
- System.out.println("dwProcessId: " + Integer.toHexString(pi.dwProcessId));
- System.out.println("dwThreadId: " + Integer.toHexString(pi.dwThreadId));
- session.closeHandle(pi.hProcess);
- session.closeHandle(pi.hThread);
- }
-
- void runExamples() {
- try {
- initRapi();
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- // get the first device
- device = enumDevices.next();
- printDeviceInfo();
- printConnectionInfo();
- // create session
- session = device.createSession();
- session.init();
- createFile("\\foo.txt");
- readFile("\\foo.txt");
- session.copyFile("\\foo.txt", "\\bar.txt");
- listFiles("\\");
- session.moveFile("\\bar.txt", "\\spam.txt");
- listFiles2("\\");
- session.deleteFile("\\spam.txt");
- statFile("\\foo.txt");
- System.out.println(">>> printDeviceTree()");
- printDeviceTree("\\", 0);
- openUrl("www.eclipse.org/dsdp/tm");
- session.uninit();
- } catch (RapiException e) {
- e.printStackTrace();
- } finally {
- uninitRapi();
- }
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.classpath eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.classpath
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.classpath 2008-03-27 20:07:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.classpath 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.cvsignore 2008-05-21 12:56:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.project eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.project 2008-03-27 19:45:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.project 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
- org.eclipse.tm.rapi.tests
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
- org.eclipse.jdt.core.javanature
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.settings/org.eclipse.jdt.core.prefs eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.settings/org.eclipse.jdt.core.prefs
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/.settings/org.eclipse.jdt.core.prefs 2008-03-31 12:26:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/.settings/org.eclipse.jdt.core.prefs 1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF 2008-04-02 11:59:17.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.rapi.tests
-Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-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 -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/about.html eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/about.html
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/about.html 2008-03-27 20:50:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/about.html 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-March 27, 2008
-License
-
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
-
-If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at http://www.eclipse.org.
-
-
-
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/build.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/build.properties 2008-03-27 20:50:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/build.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - add about.html
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
-src.includes = about.html
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/plugin.properties 2009-05-25 21:21:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/plugin.properties 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Radoslav Gerganov 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
-#
-# Contributors:
-# Radoslav Gerganov - initial API and implementation
-# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-providerName = Eclipse.org - DSDP
-pluginName = RAPI2 Java wrapper unit tests (Incubation)
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/AllTests.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/AllTests.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/AllTests.java 2008-03-27 19:45:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/AllTests.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Unit tests for the Java wrappers of RAPI2.
- *
- * Establishing an ActiveSync connection with a device or emulator is needed
- * before running these tests.
- *
- * @author Radoslav Gerganov
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.tm.rapi");
- //$JUnit-BEGIN$
- suite.addTestSuite(RapiDesktopTest.class);
- suite.addTestSuite(RapiEnumDevicesTest.class);
- suite.addTestSuite(RapiDeviceTest.class);
- suite.addTestSuite(RapiSessionTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDesktopTest.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDesktopTest.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDesktopTest.java 2008-03-27 19:45:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDesktopTest.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.RapiException;
-
-public class RapiDesktopTest extends RapiTestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- public void testGetInstance() throws RapiException {
- desktop = IRapiDesktop.getInstance();
- assertNotNull("IRapiDesktop.getInstance() returned null", desktop);
- }
-
- public void testEnumDevices() throws RapiException {
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- assertNotNull("IRapiDesktop.enumDevices() returned null", enumDevices);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDeviceTest.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDeviceTest.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDeviceTest.java 2008-03-27 19:45:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiDeviceTest.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.RapiConnectionInfo;
-import org.eclipse.tm.rapi.RapiDeviceInfo;
-import org.eclipse.tm.rapi.RapiException;
-
-public class RapiDeviceTest extends RapiTestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- IRapiDevice getDevice() throws RapiException {
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- return enumDevices.next();
- }
-
- public void testCreateSession() throws RapiException {
- device = getDevice();
- session = device.createSession();
- assertNotNull("IRapiDevice.createSession() returned null", session);
- }
-
- public void testGetConnectionInfo() throws RapiException {
- device = getDevice();
- RapiConnectionInfo connectionInfo = device.getConnectionInfo();
- int connectionType = connectionInfo.connectionType;
- assertTrue("Unknown connectionType: " + connectionType,
- connectionType >= 0 && connectionType <= 3);
- }
-
- public void testGetDeviceInfo() throws RapiException {
- device = getDevice();
- RapiDeviceInfo deviceInfo = device.getDeviceInfo();
- assertNotNull("deviceInfo.id is null", deviceInfo.id);
- assertNotNull("deviceInfo.name is null", deviceInfo.name);
- assertNotNull("deviceInfo.platform is null", deviceInfo.platform);
- //TODO: make some reasonable checks for the version numbers
- }
-
- public void testIsConnected() throws RapiException {
- device = getDevice();
- boolean connected = device.isConnected();
- assertTrue("device should be connected", connected);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiEnumDevicesTest.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiEnumDevicesTest.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiEnumDevicesTest.java 2008-03-27 19:45:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiEnumDevicesTest.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.RapiException;
-
-public class RapiEnumDevicesTest extends RapiTestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- public void testNext() throws RapiException {
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- device = enumDevices.next();
- assertNotNull("IRapiEnumDevices.next() returned null", device);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiSessionTest.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiSessionTest.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiSessionTest.java 2008-04-09 12:55:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiSessionTest.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-import org.eclipse.tm.rapi.RapiException;
-import org.eclipse.tm.rapi.RapiFindData;
-
-public class RapiSessionTest extends RapiTestCase {
-
- private static final int TEMP_FILES_COUNT = 10;
- private static final int TEST_FILE_SIZE = 8 * 1024;
- private static final String TEST_FILE_NAME = "\\foo.bin";
- private static final int CHUNK_SIZE = 1024;
-
- private static final String TEST_DIR_NAME = "bar";
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /**
- * Creates and initialize RAPI2 session
- */
- void createInitSession() throws RapiException {
- desktop = IRapiDesktop.getInstance();
- enumDevices = desktop.enumDevices();
- device = enumDevices.next();
- session = device.createSession();
- session.init();
- }
-
- /**
- * Returns true if the first len
bytes of the specified arrays
- * are equal.
- */
- boolean arraysEqual(byte[] arr1, byte[] arr2, int len) {
- for (int i = 0 ; i < len ; i++) {
- if (arr1[i] != arr2[i]) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Returns true if the specified path
exists and it is a directory.
- */
- boolean isDirectory(String path) {
- int attr = session.getFileAttributes(path);
- if (attr == -1) {
- return false;
- }
- return (attr & Rapi.FILE_ATTRIBUTE_DIRECTORY) != 0;
- }
-
- /**
- * Returns true if the specified path
exists and it is a file.
- */
- boolean isFile(String path) {
- int attr = session.getFileAttributes(path);
- if (attr == -1) {
- return false;
- }
- return (attr & Rapi.FILE_ATTRIBUTE_DIRECTORY) == 0;
- }
-
- /**
- * Tests reading and writing files on the device.
- */
- public void testReadWriteFiles() throws RapiException {
- createInitSession();
-
- // generate random file content
- byte[] content = new byte[TEST_FILE_SIZE];
- for (int i = 0 ; i < content.length ; i++) {
- content[i] = (byte)(Math.random() * 131);
- }
-
- // write the test file at once
- int handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.writeFile(handle, content);
- session.closeHandle(handle);
-
- // try to read the whole file
- handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- byte[] contentRead = new byte[TEST_FILE_SIZE];
- int br = session.readFile(handle, contentRead);
- session.closeHandle(handle);
- assertTrue("Different file content", arraysEqual(content, contentRead, br));
-
- // write the test file by chunks
- handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- int off = 0;
- for (int i = 0 ; i < TEST_FILE_SIZE / CHUNK_SIZE ; i++) {
- session.writeFile(handle, content, off, CHUNK_SIZE);
- off += CHUNK_SIZE;
- }
- session.closeHandle(handle);
-
- // read the test file by chunks
- handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- byte[] contentRead2 = new byte[TEST_FILE_SIZE];
- off = 0;
- int bytesToRead = TEST_FILE_SIZE;
- while (bytesToRead > 0) {
- int len = CHUNK_SIZE < bytesToRead ? CHUNK_SIZE : bytesToRead;
- br = session.readFile(handle, contentRead2, off, len);
- off += br;
- bytesToRead -= br;
- }
- session.closeHandle(handle);
- assertTrue("Different file content", arraysEqual(content, contentRead2, TEST_FILE_SIZE));
-
- // delete the test file
- session.deleteFile(TEST_FILE_NAME);
- }
-
- /**
- * Tests creating and removing directories on the device.
- */
- public void testCreateRemoveDirectories() throws RapiException {
- createInitSession();
- try {
- session.removeDirectory(TEST_DIR_NAME);
- } catch (RapiException re) {
- // ignore
- }
- session.createDirectory(TEST_DIR_NAME);
- assertTrue("Failed to create directory: " + TEST_DIR_NAME, isDirectory(TEST_DIR_NAME));
- session.removeDirectory(TEST_DIR_NAME);
- assertFalse("Failed to remove directory: " + TEST_DIR_NAME, isDirectory(TEST_DIR_NAME));
- }
-
- /**
- * Utility method for creating files.
- */
- void createFile(IRapiSession session, String fileName) throws RapiException {
- int handle = session.createFile(fileName, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.writeFile(handle, "spam".getBytes());
- session.closeHandle(handle);
- }
-
- /**
- * Tests copying, moving and deleting files on the device.
- */
- public void testCopyMoveDeleteFiles() throws RapiException {
- createInitSession();
-
- // create test file
- createFile(session, TEST_FILE_NAME);
-
- // make a copy
- String copy = TEST_FILE_NAME + "1";
- session.copyFile(TEST_FILE_NAME, copy);
- assertTrue("The copied file doesn't exist: " + copy, isFile(copy));
-
- // delete the test file
- session.deleteFile(TEST_FILE_NAME);
- assertFalse("Failed to delete file: " + TEST_FILE_NAME, isFile(TEST_FILE_NAME));
-
- // rename the copy
- session.moveFile(copy, TEST_FILE_NAME);
- assertTrue("Failed to move file, existing file: " + copy + " new file: " + TEST_FILE_NAME,
- isFile(TEST_FILE_NAME));
- assertFalse("Failed to move file, existing file: " + copy + " new file: " + TEST_FILE_NAME,
- isFile(copy));
-
- // delete test file
- session.deleteFile(TEST_FILE_NAME);
- }
-
- /**
- * Utility method for creating a bunch of files.
- */
- void createTempFiles() throws RapiException {
- for (int i = 0 ; i < TEMP_FILES_COUNT ; i++) {
- createFile(session, TEST_FILE_NAME + i);
- }
- }
-
- /**
- * Tests finding files using {@link IRapiSession#findFirstFile(String, RapiFindData)}
- */
- public void testFindFiles() throws RapiException {
- createInitSession();
- createTempFiles();
- int filesFound = 0;
- RapiFindData findData = new RapiFindData();
- int fh = session.findFirstFile(TEST_FILE_NAME + "?", findData);
- while (findData != null) {
- filesFound++;
- findData = session.findNextFile(fh);
- }
- session.findClose(fh);
- assertTrue("Found " + filesFound + " , expected " + TEMP_FILES_COUNT,
- filesFound == TEMP_FILES_COUNT);
- // clean up
- for (int i = 0 ; i < TEMP_FILES_COUNT ; i++) {
- session.deleteFile(TEST_FILE_NAME + i);
- }
- }
-
- /**
- * Tests finding files using {@link IRapiSession#findAllFiles(String, int)}
- */
- public void testFindAllFiles() throws RapiException {
- createInitSession();
- createTempFiles();
- RapiFindData[] faf = session.findAllFiles(TEST_FILE_NAME + "?", Rapi.FAF_NAME);
- int filesFound = faf.length;
- assertTrue("Found " + filesFound + " , expected " + TEMP_FILES_COUNT,
- filesFound == TEMP_FILES_COUNT);
- // clean up
- for (int i = 0 ; i < TEMP_FILES_COUNT ; i++) {
- session.deleteFile(TEST_FILE_NAME + i);
- }
- }
-
- /**
- * Tests getting and setting file attributes
- */
- public void testGetSetFileAttributes() throws RapiException {
- createInitSession();
- // create test file
- createFile(session, TEST_FILE_NAME);
-
- session.setFileAttributes(TEST_FILE_NAME, Rapi.FILE_ATTRIBUTE_READONLY);
- int attr = session.getFileAttributes(TEST_FILE_NAME);
- assertTrue("Wrong file attributes, expected FILE_ATTRIBUTE_READONLY",
- (attr & Rapi.FILE_ATTRIBUTE_READONLY) != 0);
-
- session.setFileAttributes(TEST_FILE_NAME, Rapi.FILE_ATTRIBUTE_ARCHIVE);
- attr = session.getFileAttributes(TEST_FILE_NAME);
- assertTrue("Wrong file attributes, expected FILE_ATTRIBUTE_ARCHIVE",
- (attr & Rapi.FILE_ATTRIBUTE_ARCHIVE) != 0);
-
- //clean up
- session.deleteFile(TEST_FILE_NAME);
- }
-
- /**
- * Tests getting file size using {@link IRapiSession#getFileSize(int)}
- */
- public void testGetFileSize() throws RapiException {
- createInitSession();
- // create test file
- int handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.writeFile(handle, "spam".getBytes());
- assertTrue("Wrong file size, expected size 4 bytes", 4 == session.getFileSize(handle));
- session.closeHandle(handle);
- //clean up
- session.deleteFile(TEST_FILE_NAME);
- }
-
- /**
- * Tests getting and setting file times
- */
- public void testGetSetFileTime() throws RapiException {
- createInitSession();
-
- // now + 1h
- long d = System.currentTimeMillis() + 3600000;
-
- // create file and set last access time to d
- int handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_WRITE,
- Rapi.FILE_SHARE_READ, Rapi.CREATE_ALWAYS, Rapi.FILE_ATTRIBUTE_NORMAL);
- session.writeFile(handle, "spam".getBytes());
- session.setFileLastWriteTime(handle, d);
- session.closeHandle(handle);
- // get file last write time and compare to d
- handle = session.createFile(TEST_FILE_NAME, Rapi.GENERIC_READ,
- Rapi.FILE_SHARE_READ, Rapi.OPEN_EXISTING, Rapi.FILE_ATTRIBUTE_NORMAL);
- long lwTime = session.getFileLastWriteTime(handle);
- // the precision of setLastWriteTime should be about 1-2sec
- assertTrue("Too big difference for lastWriteTime, expected: " + d
- + " returned: " + lwTime, Math.abs(lwTime - d) <= 5000);
- session.closeHandle(handle);
-
- //clean up
- session.deleteFile(TEST_FILE_NAME);
- }
-
- protected void tearDown() throws Exception {
- if (session != null) {
- session.uninit();
- }
- super.tearDown();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java
--- eclipse-rse-3.1.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java 2008-04-24 07:33:40.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.rapi.tests/src/org/eclipse/tm/rapi/tests/RapiTestCase.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Radoslav Gerganov
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Radoslav Gerganov - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tm.rapi.tests;
-
-import org.eclipse.tm.rapi.IRapiDesktop;
-import org.eclipse.tm.rapi.IRapiDevice;
-import org.eclipse.tm.rapi.IRapiEnumDevices;
-import org.eclipse.tm.rapi.IRapiSession;
-import org.eclipse.tm.rapi.Rapi;
-
-import junit.framework.TestCase;
-
-public class RapiTestCase extends TestCase {
-
- protected IRapiDesktop desktop = null;
- protected IRapiEnumDevices enumDevices = null;
- protected IRapiDevice device = null;
- protected IRapiSession session = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- desktop = null;
- enumDevices = null;
- device = null;
- session = null;
- Rapi.initialize(Rapi.COINIT_MULTITHREADED);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (desktop != null) {
- desktop.release();
- }
- if (enumDevices != null) {
- enumDevices.release();
- }
- if (device != null) {
- device.release();
- }
- if (session != null) {
- session.release();
- }
- Rapi.uninitialize();
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/.cvsignore 2007-02-08 23:50:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/META-INF/MANIFEST.MF 2009-11-05 17:35:50.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
-Bundle-Version: 3.0.2.qualifier
+Bundle-Version: 3.2.2.qualifier
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,16 +19,19 @@
org.eclipse.tm.internal.terminal.control.impl;x-friends:="org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.emulator;x-friends:="org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.model;x-friends:="org.eclipse.tm.terminal.test",
+ org.eclipse.tm.internal.terminal.preferences;x-friends:="org.eclipse.tm.terminal.view",
org.eclipse.tm.internal.terminal.provisional.api;
x-friends:="org.eclipse.tm.terminal.serial,
org.eclipse.tm.terminal.ssh,
org.eclipse.tm.terminal.telnet,
+ org.eclipse.tm.terminal.local,
org.eclipse.tm.terminal.view,
org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.provisional.api.provider;
x-friends:="org.eclipse.tm.terminal.serial,
org.eclipse.tm.terminal.ssh,
org.eclipse.tm.terminal.telnet,
+ org.eclipse.tm.terminal.local,
org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.textcanvas;x-friends:="org.eclipse.tm.terminal.test",
org.eclipse.tm.terminal.model
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/about.ini 2009-05-13 22:21:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/about.properties 2009-02-01 15:15:29.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/build.properties 2009-05-13 22:43:24.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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
@@ -25,7 +25,7 @@
about.ini,\
about.mappings,\
about.properties,\
- dsdp32.png,\
+ tm32.png,\
icons/,\
HelpContexts.xml
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/plugin.properties 2009-05-13 22:21:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -13,12 +13,13 @@
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
###############################################################################
# NLS_MESSAGEFORMAT_NONE
pluginName = Target Management Terminal Widget
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
terminal.context.name=Terminal widget context
terminal.context.description=Override ALT+x menu access keys
@@ -26,3 +27,7 @@
terminal.insertion.description=Terminal view insertion
terminal.insertion.name=Terminal view insert
terminal.insertion.category.name=Terminal view commands
+
+terminal.preferences.name = Terminal
+terminal.font.description = The font for the terminal console.
+terminal.font.label = Terminal Console Font
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/plugin.xml 2008-07-15 21:57:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,7 @@
@@ -106,4 +107,30 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="Alt+W"/>
+
+
+
+
+
+
+
+
+
+
+
+
+ %terminal.font.description
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal
+ 3.2.2.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java 2009-07-16 20:13:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2011 Wind River Systems, Inc. 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
@@ -11,6 +11,7 @@
* Michael Scharf (Wing River) - [196447] The optional terminal input line should be resizeable
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
* Michael Scharf (Wing River) - [236458] Fix 168197 lost the last entry
+ * Anton Leherbauer (Wind River) - [220971] The optional terminal input line has redraw problems when resizing
*******************************************************************************/
package org.eclipse.tm.internal.terminal.control;
import java.util.ArrayList;
@@ -29,6 +30,7 @@
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
@@ -116,6 +118,7 @@
*/
private Text fInputField;
private Sash fSash;
+ private Composite fPanel;
public CommandInputFieldWithHistory(int maxHistorySize) {
fMaxSize=maxHistorySize;
}
@@ -222,13 +225,17 @@
fSash.setLayoutData(gd_sash);
fSash.addListener (SWT.Selection, new Listener () {
public void handleEvent (Event e) {
+ if (e.detail == SWT.DRAG) {
+ // don't redraw during drag, it causes paint errors - bug 220971
+ return;
+ }
// no idea why this is needed
GridData gdata = (GridData) fInputField.getLayoutData();
Rectangle sashRect = fSash.getBounds ();
Rectangle containerRect = parent.getClientArea ();
int h=fInputField.getLineHeight();
- // make sure the input filed hight is a multiple of the line height
+ // make sure the input filed height is a multiple of the line height
gdata.heightHint = Math.max(((containerRect.height-e.y-sashRect.height)/h)*h,h);
// do not show less then one line
e.y=Math.min(e.y,containerRect.height-h);
@@ -238,7 +245,12 @@
parent.redraw();
}
});
- fInputField=new Text(parent, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
+ fPanel = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = 0; layout.marginHeight = 0; layout.marginTop = 0; layout.marginBottom = 2;
+ fPanel.setLayout(layout);
+ fPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ fInputField=new Text(fPanel, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
GridData data=new GridData(SWT.FILL, SWT.FILL, true, false);
boolean installDecoration=true;
if(installDecoration) {
@@ -301,8 +313,9 @@
public void dispose() {
fSash.dispose();
fSash=null;
+ fPanel.dispose();
+ fPanel=null;
fInputField.dispose();
fInputField=null;
-
}
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java 2008-07-07 20:38:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/ITerminalViewControl.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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,6 +9,7 @@
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Martin Oberhuber (Wind River) - [204796] Terminal should allow setting the encoding to use
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
******************************************************************************/
package org.eclipse.tm.internal.terminal.control;
@@ -45,7 +46,19 @@
String getEncoding();
boolean isEmpty();
+ /**
+ * Sets the Terminal font
+ * @deprecated use {@link #setFont(String)} in order to support bold and italic variants of the given font
+ * @param font
+ */
void setFont(Font font);
+ /**
+ * Sets the font for the Terminal, using a JFace symbolic font name, such
+ * that bold and italic variants can be leveraged.
+ * @since 3.2
+ * @param fontName
+ */
+ void setFont(String fontName);
void setInvertedColors(boolean invert);
Font getFont();
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java 2008-04-04 16:31:42.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/TerminalViewControlFactory.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -8,6 +8,7 @@
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
*******************************************************************************/
package org.eclipse.tm.internal.terminal.control;
@@ -16,7 +17,28 @@
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
public class TerminalViewControlFactory {
+ /**
+ * Instantiate a Terminal widget.
+ * @param target Callback for notifying the owner of Terminal state changes.
+ * @param wndParent The Window parent to embed the Terminal in.
+ * @param connectors Provided connectors.
+ */
public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors) {
- return new VT100TerminalControl(target, wndParent, connectors);
+ return makeControl(target, wndParent, connectors, false);
}
+
+ /**
+ * Instantiate a Terminal widget.
+ * @param target Callback for notifying the owner of Terminal state changes.
+ * @param wndParent The Window parent to embed the Terminal in.
+ * @param connectors Provided connectors.
+ * @param useCommonPrefs If true
, the Terminal widget will pick up settings
+ * from the org.eclipse.tm.terminal.TerminalPreferencePage
Preference page.
+ * Otherwise, clients need to maintain settings themselves.
+ * @since 3.2
+ */
+ public static ITerminalViewControl makeControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors, boolean useCommonPrefs) {
+ return new VT100TerminalControl(target, wndParent, connectors, useCommonPrefs);
+ }
+
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java 2008-04-04 16:31:42.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -8,6 +8,7 @@
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
*******************************************************************************/
package org.eclipse.tm.internal.terminal.control.impl;
@@ -23,4 +24,9 @@
public static String IOError;
public static String CannotConnectTo;
public static String NotInitialized;
+
+ //Preference Page
+ public static String INVERT_COLORS;
+ public static String BUFFERLINES;
+
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties 2009-04-20 10:11:17.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalMessages.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -13,6 +13,7 @@
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
###############################################################################
# NLS_MESSAGEFORMAT_VAR
@@ -22,3 +23,6 @@
IOError = IO Error
CannotConnectTo = Cannot initialize {0}:\n{1}
NotInitialized = Not Initialized
+
+INVERT_COLORS = Invert terminal colors
+BUFFERLINES = Terminal buffer lines:
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java 2009-02-01 12:40:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -16,6 +16,8 @@
* Michael Scharf (Wind River) - [209746] There are cases where some colors not displayed correctly
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
+ * Martin Oberhuber (Wind River) - [334969] Fix multi-command SGR sequence
+ * Kris De Volder (VMWare) - [392107] Switched interpretation for ESC[0K and ESC[1K sequences
*******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator;
@@ -29,7 +31,6 @@
import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.Logger;
-import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
import org.eclipse.tm.terminal.model.ITerminalTextData;
import org.eclipse.tm.terminal.model.Style;
@@ -664,13 +665,13 @@
switch (ansiParameter) {
case 0:
- // Erase from beginning to current position (inclusive).
- text.eraseLineToCursor();
+ // Erase from current position to end (inclusive).
+ text.eraseLineToEnd();
break;
case 1:
- // Erase from current position to end (inclusive).
- text.eraseLineToEnd();
+ // Erase from beginning to current position (inclusive).
+ text.eraseLineToCursor();
break;
case 2:
@@ -725,92 +726,107 @@
switch (ansiParameter) {
case 0:
// Reset all graphics modes.
- text.setStyle(text.getDefaultStyle());
+ style = text.getDefaultStyle();
break;
case 1:
- text.setStyle(style.setBold(true));
+ style = style.setBold(true);
+ break;
+
+ case 4:
+ style = style.setUnderline(true);
+ break;
+
+ case 5:
+ style = style.setBlink(true);
break;
case 7:
- text.setStyle(style.setReverse(true));
+ style = style.setReverse(true);
break;
case 10: // Set primary font. Ignored.
break;
-// case 22:
-// // TODO
-// //currentFontStyle = SWT.NORMAL; // Cancel bold or dim attributes
-// // only.
-// break;
+ case 21:
+ case 22:
+ style = style.setBold(false);
+ break;
+
+ case 24:
+ style = style.setUnderline(false);
+ break;
+
+ case 25:
+ style = style.setBlink(false);
+ break;
case 27:
- text.setStyle(style.setReverse(false));
+ style = style.setReverse(false);
break;
case 30:
- text.setStyle(style.setForground("BLACK")); //$NON-NLS-1$
+ style = style.setForground("BLACK"); //$NON-NLS-1$
break;
case 31:
- text.setStyle(style.setForground("RED")); //$NON-NLS-1$
+ style = style.setForground("RED"); //$NON-NLS-1$
break;
case 32:
- text.setStyle(style.setForground("GREEN")); //$NON-NLS-1$
+ style = style.setForground("GREEN"); //$NON-NLS-1$
break;
case 33:
- text.setStyle(style.setForground("YELLOW")); //$NON-NLS-1$
+ style = style.setForground("YELLOW"); //$NON-NLS-1$
break;
case 34:
- text.setStyle(style.setForground("BLUE")); //$NON-NLS-1$
+ style = style.setForground("BLUE"); //$NON-NLS-1$
break;
case 35:
- text.setStyle(style.setForground("MAGENTA")); //$NON-NLS-1$
+ style = style.setForground("MAGENTA"); //$NON-NLS-1$
break;
case 36:
- text.setStyle(style.setForground("CYAN")); //$NON-NLS-1$
+ style = style.setForground("CYAN"); //$NON-NLS-1$
break;
case 37:
- text.setStyle(style.setForground("WHITE_FOREGROUND")); //$NON-NLS-1$
+ style = style.setForground("WHITE_FOREGROUND"); //$NON-NLS-1$
break;
case 40:
- text.setStyle(style.setBackground("BLACK")); //$NON-NLS-1$
+ style = style.setBackground("BLACK"); //$NON-NLS-1$
break;
case 41:
- text.setStyle(style.setBackground("RED")); //$NON-NLS-1$
+ style = style.setBackground("RED"); //$NON-NLS-1$
break;
case 42:
- text.setStyle(style.setBackground("GREEN")); //$NON-NLS-1$
+ style = style.setBackground("GREEN"); //$NON-NLS-1$
break;
case 43:
- text.setStyle(style.setBackground("YELLOW")); //$NON-NLS-1$
+ style = style.setBackground("YELLOW"); //$NON-NLS-1$
break;
case 44:
- text.setStyle(style.setBackground("BLUE")); //$NON-NLS-1$
+ style = style.setBackground("BLUE"); //$NON-NLS-1$
break;
case 45:
- text.setStyle(style.setBackground("MAGENTA")); //$NON-NLS-1$
+ style = style.setBackground("MAGENTA"); //$NON-NLS-1$
break;
case 46:
- text.setStyle(style.setBackground("CYAN")); //$NON-NLS-1$
+ style = style.setBackground("CYAN"); //$NON-NLS-1$
break;
case 47:
- text.setStyle(style.setBackground("WHITE")); //$NON-NLS-1$
+ style = style.setBackground("WHITE"); //$NON-NLS-1$
break;
default:
@@ -821,6 +837,7 @@
++parameterIndex;
}
+ text.setStyle(style);
}
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java 2007-10-08 21:12:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2011 Wind River Systems, Inc. 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Anton Leherbauer (Wind River) - [206329] Changing terminal size right after connect does not scroll properly
*******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator;
@@ -77,34 +78,27 @@
synchronized (fTerminal) {
if(lines==fLines && cols==fColumns)
return; // nothing to do
- // cursor line from the bottom
- int cl=lines-(fLines-getCursorLine());
+ // relative cursor line
+ int cl=getCursorLine();
int cc=getCursorColumn();
- int newLines=Math.max(lines,fTerminal.getHeight());
- // if the terminal has no history, then resize by
- // setting the size to the new size
- if(fTerminal.getHeight()==fLines) {
- if(lines1)
-// break;
-// // is the line empty?
-// if(segments[0].getText().replaceAll("[\000 ]+", "").length()==0)
-// break;
-// }
- } else {
- cl+=fLines-lines;
+ int height=fTerminal.getHeight();
+ // absolute cursor line
+ int acl=cl+height-fLines;
+ int newLines=Math.max(lines,height);
+ if(linestrue
, the Terminal widget will pick up settings
+ * from the org.eclipse.tm.terminal.TerminalPreferencePage
Preference page.
+ * Otherwise, clients need to maintain settings themselves.
+ * @since 3.2
+ */
+ public VT100TerminalControl(ITerminalListener target, Composite wndParent, ITerminalConnector[] connectors, boolean useCommonPrefs) {
fConnectors=connectors;
+ fUseCommonPrefs = useCommonPrefs;
fTerminalListener=target;
fTerminalModel=TerminalTextDataFactory.makeTerminalTextData();
fTerminalModel.setMaxHeight(1000);
@@ -173,16 +225,20 @@
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy()
*/
public void copy() {
- getCtlText().copy();
+ copy(DND.CLIPBOARD);
+ }
+
+ private void copy(int clipboardType) {
+ Object[] data = new Object[] { getSelection() };
+ Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
+ fClipboard.setContents(data, types, clipboardType);
}
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#paste()
*/
public void paste() {
- TextTransfer textTransfer = TextTransfer.getInstance();
- String strText = (String) fClipboard.getContents(textTransfer);
- pasteString(strText);
+ paste(DND.CLIPBOARD);
// TODO paste in another thread.... to avoid blocking
// new Thread() {
// public void run() {
@@ -194,6 +250,12 @@
// }.start();
}
+ private void paste(int clipboardType) {
+ TextTransfer textTransfer = TextTransfer.getInstance();
+ String strText = (String) fClipboard.getContents(textTransfer, clipboardType);
+ pasteString(strText);
+ }
+
/**
* @param strText the text to paste
*/
@@ -297,6 +359,10 @@
*/
public void disposeTerminal() {
Logger.log("entered."); //$NON-NLS-1$
+ if(fUseCommonPrefs) {
+ TerminalPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPreferenceListener);
+ JFaceResources.getFontRegistry().removeListener(fFontListener);
+ }
disconnectTerminal();
fClipboard.dispose();
getTerminalText().dispose();
@@ -330,27 +396,29 @@
public void disconnectTerminal() {
Logger.log("entered."); //$NON-NLS-1$
- if (getState()==TerminalState.CLOSED) {
- return;
- }
- if(getTerminalConnector()!=null) {
- getTerminalConnector().disconnect();
+ //Disconnect the remote side first
+ if (getState()!=TerminalState.CLOSED) {
+ if(getTerminalConnector()!=null) {
+ getTerminalConnector().disconnect();
+ }
}
- //Ensure that a new Job can be started; then clean up old Job.
- //TODO not sure whether the fInputStream needs to be cleaned too,
- //or whether the Job could actually cancel in case the fInputStream is closed.
- Job job;
- synchronized(this) {
- job = fJob;
- fJob = null;
- }
- if (job!=null) {
- job.cancel();
- //There's not really a need to interrupt, since the job will
- //check its cancel status after 500 msec latest anyways...
- //Thread t = job.getThread();
- //if(t!=null) t.interrupt();
- }
+
+ //Ensure that a new Job can be started; then clean up old Job.
+ Job job;
+ synchronized(this) {
+ job = fJob;
+ fJob = null;
+ }
+ if (job!=null) {
+ job.cancel();
+ // Join job to avoid leaving job running after workbench shutdown (333613).
+ // Interrupt to be fast enough; cannot close fInputStream since it is re-used (bug 348700).
+ Thread t = job.getThread();
+ if(t!=null) t.interrupt();
+ try {
+ job.join();
+ } catch (InterruptedException e) {}
+ }
}
// TODO
@@ -524,15 +592,53 @@
}
/* (non-Javadoc)
- * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setupTerminal()
+ * @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#setupTerminal(org.eclipse.swt.widgets.Composite)
*/
public void setupTerminal(Composite parent) {
+ Assert.isNotNull(parent);
fState=TerminalState.CLOSED;
setupControls(parent);
setupListeners();
+ if (fUseCommonPrefs) {
+ updatePreferences();
+ onTerminalFontChanged();
+ TerminalPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPreferenceListener);
+ JFaceResources.getFontRegistry().addListener(fFontListener);
+ }
setupHelp(fWndParent, TerminalPlugin.HELP_VIEW);
}
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#updatePreferences()
+ */
+ private void updatePreferences() {
+ int bufferLineLimit = Platform.getPreferencesService().getInt(TerminalPlugin.PLUGIN_ID, ITerminalConstants.PREF_BUFFERLINES, 0, null);
+ boolean invert = Platform.getPreferencesService().getBoolean(TerminalPlugin.PLUGIN_ID, ITerminalConstants.PREF_INVERT_COLORS, false, null);
+ setBufferLineLimit(bufferLineLimit);
+ setInvertedColors(invert);
+ }
+
+ private void onTerminalFontChanged() {
+ // set the font for all
+ setFont(ITerminalConstants.FONT_DEFINITION);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#setFont(java.lang.String)
+ */
+ public void setFont(String fontName) {
+ Font font=JFaceResources.getFont(fontName);
+ getCtlText().setFont(font);
+ if(fCommandInputField!=null) {
+ fCommandInputField.setFont(font);
+ }
+ // Tell the TerminalControl singleton that the font has changed.
+ fCtlText.updateFont(fontName);
+ getTerminalText().fontChanged();
+ }
+
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#onFontChanged()
*/
@@ -584,12 +690,19 @@
fTerminalText.setDimensions(lines, columns);
}
});
-
+ fCtlText.addMouseListener(new MouseAdapter() {
+ public void mouseUp(MouseEvent e) {
+ // update selection used by middle mouse button paste
+ if (e.button == 1 && getSelection().length() > 0) {
+ copy(DND.SELECTION_CLIPBOARD);
+ }
+ }
+ });
fDisplay = getCtlText().getDisplay();
fClipboard = new Clipboard(fDisplay);
// fViewer.setDocument(new TerminalDocument());
- setFont(JFaceResources.getTextFont());
+// setFont(JFaceResources.getTextFont());
}
protected void setupListeners() {
@@ -754,6 +867,13 @@
return;
}
+ // Manage the Del key
+ if (event.keyCode == 0x000007f)
+ {
+ sendString("\u001b[3~"); //$NON-NLS-1$
+ return;
+ }
+
// If the event character is NUL ('\u0000'), then a special key was pressed
// (e.g., PageUp, PageDown, an arrow key, a function key, Shift, Alt,
// Control, etc.). The one exception is when the user presses Control-@,
@@ -789,11 +909,11 @@
break;
case 0x1000005: // PgUp key.
- sendString("\u001b[I"); //$NON-NLS-1$
+ sendString("\u001b[5~"); //$NON-NLS-1$
break;
case 0x1000006: // PgDn key.
- sendString("\u001b[G"); //$NON-NLS-1$
+ sendString("\u001b[6~"); //$NON-NLS-1$
break;
case 0x1000007: // Home key.
@@ -804,6 +924,10 @@
sendString("\u001b[F"); //$NON-NLS-1$
break;
+ case 0x1000009: // Insert.
+ sendString("\u001b[2~"); //$NON-NLS-1$
+ break;
+
case 0x100000a: // F1 key.
if ( (event.stateMask & SWT.CTRL)!=0 ) {
//Allow Ctrl+F1 to act locally as well as on the remote, because it is
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/ITerminalConstants.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
+ *
+ * Contributors:
+ * Michael Scharf (Wind River) - initial API and implementation
+ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
+ *******************************************************************************/
+package org.eclipse.tm.internal.terminal.preferences;
+
+public interface ITerminalConstants {
+
+ public static final String PREF_HAS_MIGRATED = "TerminalPref.migrated"; //$NON-NLS-1$
+
+ public static final String PREF_BUFFERLINES = "TerminalPrefBufferLines"; //$NON-NLS-1$
+ public static final String PREF_INVERT_COLORS = "TerminalPrefInvertColors"; //$NON-NLS-1$
+ public static final int DEFAULT_BUFFERLINES = 1000;
+ public static final boolean DEFAULT_INVERT_COLORS = false;
+
+ public static final String FONT_DEFINITION = "terminal.views.view.font.definition"; //$NON-NLS-1$
+
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/PreferenceModifyListener.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 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
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
+ *******************************************************************************/
+package org.eclipse.tm.internal.terminal.preferences;
+
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
+import org.osgi.service.prefs.Preferences;
+
+public class PreferenceModifyListener extends
+ org.eclipse.core.runtime.preferences.PreferenceModifyListener {
+
+ public PreferenceModifyListener() {
+ // Nothing to do
+ }
+
+ /**
+ * Intercept programmatic access to old Terminal Preferences such as "invert"
+ */
+ public IEclipsePreferences preApply(IEclipsePreferences node) {
+ migrateTerminalPreferences(node.node("instance")); //$NON-NLS-1$
+ return super.preApply(node);
+ }
+
+ public static void migrateTerminalPreferences(Preferences node) {
+ Preferences terminalPrefs = node.node(TerminalPlugin.PLUGIN_ID);
+ Preferences oldPrefs = node.node("org.eclipse.tm.terminal.view"); //$NON-NLS-1$
+ String oldInvert = oldPrefs.get(ITerminalConstants.PREF_INVERT_COLORS, null);
+ String oldBuflines = oldPrefs.get(ITerminalConstants.PREF_BUFFERLINES, null);
+ if (oldInvert != null) {
+ terminalPrefs.put(ITerminalConstants.PREF_INVERT_COLORS, oldInvert);
+ oldPrefs.remove(ITerminalConstants.PREF_INVERT_COLORS);
+ }
+ if (oldBuflines != null) {
+ terminalPrefs.put(ITerminalConstants.PREF_BUFFERLINES, oldBuflines);
+ oldPrefs.remove(ITerminalConstants.PREF_BUFFERLINES);
+ }
+ }
+
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferenceInitializer.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
+ *
+ * Contributors:
+ * Michael Scharf (Wind River) - initial API and implementation
+ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
+ *******************************************************************************/
+package org.eclipse.tm.internal.terminal.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
+
+public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer {
+
+ public TerminalPreferenceInitializer() {
+ }
+
+ public void initializeDefaultPreferences() {
+ //DefaultScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back
+ IEclipsePreferences defaultPrefs = new DefaultScope().getNode(TerminalPlugin.PLUGIN_ID);
+ defaultPrefs.putBoolean(ITerminalConstants.PREF_INVERT_COLORS, ITerminalConstants.DEFAULT_INVERT_COLORS);
+ defaultPrefs.putInt(ITerminalConstants.PREF_BUFFERLINES, ITerminalConstants.DEFAULT_BUFFERLINES);
+ migrateTerminalPreferences();
+ }
+
+ /**
+ * Migrate settings from the older org.eclipse.tm.terminal.view bundle into the o.e.tm.terminal bundle
+ */
+ public static void migrateTerminalPreferences() {
+ //InstanceScope.INSTANCE was only added in Eclipse 3.7 - we want to be compatible further back
+ IEclipsePreferences prefs = new InstanceScope().getNode(TerminalPlugin.PLUGIN_ID);
+ if (!prefs.getBoolean(ITerminalConstants.PREF_HAS_MIGRATED, false)) {
+ prefs.putBoolean(ITerminalConstants.PREF_HAS_MIGRATED, true);
+ PreferenceModifyListener.migrateTerminalPreferences(new InstanceScope().getNode("")); //$NON-NLS-1$
+ }
+ }
+
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/preferences/TerminalPreferencePage.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
+ *
+ * Initial Contributors:
+ * The following Wind River employees contributed to the Terminal component
+ * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
+ * Helmut Haigermoser and Ted Williams.
+ *
+ * Contributors:
+ * Michael Scharf (Wind River) - split into core, view and connector plugins
+ * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
+ *******************************************************************************/
+package org.eclipse.tm.internal.terminal.preferences;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.tm.internal.terminal.control.impl.TerminalMessages;
+import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+public class TerminalPreferencePage extends FieldEditorPreferencePage implements
+ IWorkbenchPreferencePage {
+ protected BooleanFieldEditor fInvertColors;
+
+ protected IntegerFieldEditor fEditorBufferSize;
+
+ public TerminalPreferencePage() {
+ super(GRID);
+ }
+ protected void createFieldEditors() {
+ setupPage();
+ }
+ public void init(IWorkbench workbench) {
+ // do nothing
+ }
+ protected void setupPage() {
+ setupData();
+ setupEditors();
+ }
+ protected void setupData() {
+ TerminalPlugin plugin;
+ IPreferenceStore preferenceStore;
+
+ plugin = TerminalPlugin.getDefault();
+ preferenceStore = plugin.getPreferenceStore();
+ setPreferenceStore(preferenceStore);
+ }
+ protected void setupEditors() {
+ fInvertColors = new BooleanFieldEditor(
+ ITerminalConstants.PREF_INVERT_COLORS, TerminalMessages.INVERT_COLORS,
+ getFieldEditorParent());
+ fEditorBufferSize = new IntegerFieldEditor(ITerminalConstants.PREF_BUFFERLINES,
+ TerminalMessages.BUFFERLINES, getFieldEditorParent());
+
+ fEditorBufferSize.setValidRange(0, Integer.MAX_VALUE);
+
+ addField(fInvertColors);
+ addField(fEditorBufferSize);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/AbstractSettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,181 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Wind River Systems, Inc. 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
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tm.internal.terminal.provisional.api;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Abstract settings page providing a common implementation of the listener handling.
+ */
+public abstract class AbstractSettingsPage implements ISettingsPage, IMessageProvider {
+ // A message associated with the control.
+ private String message = null;
+
+ // The message type of the associated message.
+ private int messageType = IMessageProvider.NONE;
+
+ // Reference to the listener
+ private final ListenerList listeners = new ListenerList();
+
+ // Flag to control the control decorations
+ private boolean hasDecoration = false;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#addListener(org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage.Listener)
+ */
+ public void addListener(Listener listener) {
+ Assert.isNotNull(listener);
+ listeners.add(listener);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage#removeListener(org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage.Listener)
+ */
+ public void removeListener(Listener listener) {
+ Assert.isNotNull(listener);
+ listeners.remove(listener);
+ }
+
+ /**
+ * Fire the listeners for the given control.
+ *
+ * @param control The control or null
.
+ */
+ public void fireListeners(Control control) {
+ Object[] list = listeners.getListeners();
+ for (int i = 0; i < list.length; i++) {
+ Object l = list[i];
+ if (!(l instanceof Listener)) continue;
+ ((Listener)l).onSettingsPageChanged(control);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.IMessageProvider#getMessage()
+ */
+ public final String getMessage() {
+ return message;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.IMessageProvider#getMessageType()
+ */
+ public final int getMessageType() {
+ return messageType;
+ }
+
+ /**
+ * Set the message and the message type.
+ *
+ * @param message The message or null
.
+ * @param messageType The type of the message (NONE, INFORMATION, WARNING, ERROR).
+ */
+ public final void setMessage(String message, int messageType) {
+ this.message = message;
+ this.messageType = messageType;
+ }
+
+ /**
+ * Sets if or if not the settings panel widgets will have control decorations
+ * or not. The method has effect only if called before {@link #createControl(org.eclipse.swt.widgets.Composite)}.
+ *
+ * @param value True
if the panel widgets have control decorations, false
otherwise.
+ */
+ public final void setHasControlDecoration(boolean value) {
+ this.hasDecoration = value;
+ }
+
+ /**
+ * Returns if or if not the settings panel widgets will have control
+ * decorations or not.
+ *
+ * @return True
if the panel widgets have control decorations, false
otherwise.
+ */
+ protected final boolean hasControlDecoration() {
+ return hasDecoration;
+ }
+
+ /**
+ * Creates a new instance of a {@link ControlDecoration} object associated with
+ * the given control. The method is called after the control has been created.
+ *
+ * @param control The control. Must not be null
.
+ * @return The control decoration object instance.
+ */
+ protected final ControlDecoration createControlDecoration(Control control) {
+ Assert.isNotNull(control);
+ if (!hasDecoration) return null;
+ ControlDecoration controlDecoration = new ControlDecoration(control, getControlDecorationPosition());
+ controlDecoration.setShowOnlyOnFocus(false);
+ control.setData("controlDecoration", controlDecoration); //$NON-NLS-1$
+ return controlDecoration;
+ }
+
+ /**
+ * Returns the control decoration position. The default is
+ * {@link SWT#TOP} | {@link SWT#LEFT}.
+ *
+ * @return The control position.
+ */
+ protected int getControlDecorationPosition() {
+ return SWT.TOP | SWT.LEFT;
+ }
+
+ /**
+ * Updates the control decoration of the given control to represent the given message
+ * and message type. If the message is null
or the message type is
+ * {@link IMessageProvider#NONE} no decoration will be shown.
+ *
+ * @param control The control. Must not be null
.
+ * @param message The message.
+ * @param messageType The message type.
+ */
+ protected final void updateControlDecoration(Control control, String message, int messageType) {
+ Assert.isNotNull(control);
+
+ ControlDecoration controlDecoration = (ControlDecoration)control.getData("controlDecoration"); //$NON-NLS-1$
+ if (controlDecoration != null) {
+ // The description is the same as the message
+ controlDecoration.setDescriptionText(message);
+
+ // The icon depends on the message type
+ FieldDecorationRegistry registry = FieldDecorationRegistry.getDefault();
+
+ // Determine the id of the decoration to show
+ String decorationId = FieldDecorationRegistry.DEC_INFORMATION;
+ if (messageType == IMessageProvider.ERROR) {
+ decorationId = FieldDecorationRegistry.DEC_ERROR;
+ } else if (messageType == IMessageProvider.WARNING) {
+ decorationId = FieldDecorationRegistry.DEC_WARNING;
+ }
+
+ // Get the field decoration
+ FieldDecoration fieldDeco = registry.getFieldDecoration(decorationId);
+ if (fieldDeco != null) {
+ controlDecoration.setImage(fieldDeco.getImage());
+ }
+
+ if (message == null || messageType == IMessageProvider.NONE) {
+ controlDecoration.hide();
+ }
+ else {
+ controlDecoration.show();
+ }
+ }
+ }
+
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java 2007-05-24 14:53:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,32 +1,44 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. 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
- *
- * Contributors:
+ * Copyright (c) 2006, 2013 Wind River Systems, Inc. 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
+ *
+ * Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
*******************************************************************************/
package org.eclipse.tm.internal.terminal.provisional.api;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
/**
* @author Michael Scharf
*
- * TODO: Michael Scharf: provide a mechanism to set an error string
* TODO: Michael Scharf: provide a long description of a wizard
* TODO: Michael Scharf: allow multiple pages to be generated
*
* EXPERIMENTAL. This class or interface has been added as
* part of a work in progress. There is no guarantee that this API will
* work or that it will remain the same. Please do not use this API without
- * consulting with the Target Management team.
+ * consulting with the Target Management team.
*
*/
public interface ISettingsPage {
+
+ public interface Listener {
+
+ /**
+ * Invoked by settings page controls to signal that the settings page
+ * changed and page container may update their state.
+ *
+ * @param control The control which triggered the event or null
+ */
+ public void onSettingsPageChanged(Control control);
+ }
+
/**
* Create a page to be shown in a dialog or wizard to setup the connection.
* @param parent
@@ -44,8 +56,25 @@
void saveSettings();
/**
- * @return true if the
+ * @return true if the
*/
boolean validateSettings();
-
+
+ /**
+ * Adds the given listener.
+ *
+ * Has not effect if the same listener is already registered.
+ *
+ * @param listener The listener. Must not be null
.
+ */
+ public void addListener(Listener listener);
+
+ /**
+ * Removes the given listener.
+ *
+ * Has no effect if the same listener was not registered.
+ *
+ * @param listener The listener. Must not be null
.
+ */
+ public void removeListener(Listener listener);
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java 2007-05-24 14:53:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ISettingsStore.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -19,7 +19,7 @@
* EXPERIMENTAL. This class or interface has been added as
* part of a work in progress. There is no guarantee that this API will
* work or that it will remain the same. Please do not use this API without
- * consulting with the Target Management team.
+ * consulting with the Target Management team.
*
*/
public interface ISettingsStore {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java 2009-07-10 12:47:21.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalConnector.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -45,7 +45,7 @@
* as part of a work in progress. There is no guarantee that this API
* will work or that it will remain the same. Please do not use this API
* without consulting with the Target Management team.
+ * href="http://www.eclipse.org/tm/">Target Management team.
*
*/
public interface ITerminalConnector extends IAdaptable {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java 2009-01-19 14:03:07.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/ITerminalControl.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -16,6 +16,7 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
/**
@@ -24,7 +25,7 @@
* EXPERIMENTAL. This class or interface has been added as part
* of a work in progress. There is no guarantee that this API will work or that
* it will remain the same. Please do not use this API without consulting with
- * the Target Management team.
+ * the Target Management team.
*
*
* @author Michael Scharf
@@ -44,6 +45,13 @@
void setState(TerminalState state);
/**
+ * Setup the terminal control within the given parent composite.
+ *
+ * @param parent The parent composite. Must not be null
.
+ */
+ void setupTerminal(Composite parent);
+
+ /**
* A shell to show dialogs.
* @return the shell in which the terminal is shown.
*/
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java 2008-07-09 14:39:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/LayeredSettingsStore.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2011 Wind River Systems, Inc. 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
@@ -16,7 +16,7 @@
* EXPERIMENTAL. This class or interface has been added as part
* of a work in progress. There is no guarantee that this API will work or that
* it will remain the same. Please do not use this API without consulting with
- * the Target Management team.
+ * the Target Management team.
*
*/
public class LayeredSettingsStore implements ISettingsStore {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java 2009-05-13 22:43:24.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2005, 2011 Wind River Systems, Inc. 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
@@ -37,7 +37,7 @@
* EXPERIMENTAL. This class or interface has been added as
* part of a work in progress. There is no guarantee that this API will
* work or that it will remain the same. Please do not use this API without
- * consulting with the Target Management team.
+ * consulting with the Target Management team.
*
*/
public final class Logger {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java 2008-07-09 14:39:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/PreferenceSettingStore.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2011 Wind River Systems, Inc. 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
@@ -18,7 +18,7 @@
* EXPERIMENTAL. This class or interface has been added as part
* of a work in progress. There is no guarantee that this API will work or that
* it will remain the same. Please do not use this API without consulting with
- * the Target Management team.
+ * the Target Management team.
*
*/
public class PreferenceSettingStore implements ISettingsStore {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java 2009-07-10 12:47:21.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalConnectorExtension.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -32,7 +32,7 @@
* EXPERIMENTAL. This class or interface has been added as
* part of a work in progress. There is no guarantee that this API will work or
* that it will remain the same. Please do not use this API without consulting
- * with the Target Management
+ * with the Target Management
* team.
*
*/
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java 2009-02-01 12:40:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/TerminalState.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -21,7 +21,7 @@
* EXPERIMENTAL. This class or interface has been added as
* part of a work in progress. There is no guarantee that this API will
* work or that it will remain the same. Please do not use this API without
- * consulting with the Target Management team.
+ * consulting with the Target Management team.
*
*/
public class TerminalState {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java 2008-04-11 17:37:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2010 Wind River Systems, Inc. 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
@@ -8,6 +8,7 @@
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
+ * Anton Leherbauer (Wind River) - [219589] Copy an entire line selection
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -281,7 +282,7 @@
* @return the currently selected text
*/
private String extractSelectedText() {
- if(fSelectionStartLine<0 || fSelectionStartCoumn<0 || fSelectionEndColumn<0 || fSelectionSnapshot==null)
+ if(fSelectionStartLine<0 || fSelectionStartCoumn<0 || fSelectionSnapshot==null)
return ""; //$NON-NLS-1$
StringBuffer buffer=new StringBuffer();
for (int line = fSelectionStartLine; line <= fSeletionEndLine; line++) {
@@ -289,7 +290,7 @@
char[] chars=fSelectionSnapshot.getChars(line);
if(chars!=null) {
text=new String(chars);
- if(line==fSeletionEndLine)
+ if(line==fSeletionEndLine && fSelectionEndColumn >= 0)
text=text.substring(0, Math.min(fSelectionEndColumn+1,text.length()));
if(line==fSelectionStartLine)
text=text.substring(Math.min(fSelectionStartCoumn,text.length()));
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java 2008-04-04 16:31:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/GridCanvas.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2010 Wind River Systems, Inc. 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -18,6 +19,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.ScrollBar;
/**
* A Grid based Canvas. The canvas has rows and columns.
@@ -45,20 +47,6 @@
}
- public void setBounds(int x, int y, int width, int height) {
- // adjust the height so that there are no characters cut
- // Maybe it would be better to use a custom Layout...
- int shiftH=0;
- if(getCellHeight()!=0)
- shiftH=height % getCellHeight();
- super.setBounds(x, y+shiftH, width, height-shiftH);
- }
-
- public void setBounds(Rectangle rect) {
- // just to be sure our set bounds is called!
- setBounds(rect.x,rect.y,rect.width,rect.height);
- }
-
/** template method paint.
* iterates over all cells in the clipping rectangle and paints them.
*/
@@ -73,6 +61,9 @@
int colFirst=virtualXToCell(xOffset+clipping.x);
if(colFirst>getCols())
colFirst=getCols();
+ else if (colFirst < 0) {
+ colFirst = 0;
+ }
int rowFirst=virtualYToCell(yOffset+clipping.y);
// End coordinates
int colLast=virtualXToCell(xOffset+clipping.x+clipping.width+fCellWidth);
@@ -172,10 +163,10 @@
int cellX=virtualXToCell(x);
int cellY=virtualYToCell(y);
// End coordinates
- int xE=virtualXToCell(x+fCellWidth+width-1);
+ int xE=virtualXToCell(x+width);
// if(xE>getCols())
// xE=getCols();
- int yE=virtualYToCell(y+fCellHeight+height-1);
+ int yE=virtualYToCell(y+height);
// if(yE>getRows())
// yE=getRows();
visibleCellRectangleChanged(cellX,cellY,xE-cellX,yE-cellY);
@@ -193,5 +184,49 @@
protected void visibleCellRectangleChanged(int x, int y, int width, int height) {
}
+ protected void setVirtualExtend(int width, int height) {
+ int cellHeight = getCellHeight();
+ if (cellHeight > 0) {
+ height -= height % cellHeight;
+ }
+ super.setVirtualExtend(width, height);
+ }
+
+ protected void setVirtualOrigin(int x, int y) {
+ int cellHeight = getCellHeight();
+ if (cellHeight > 0) {
+ int remainder = y % cellHeight;
+ if (remainder < 0) {
+ y -= (cellHeight + remainder);
+ } else {
+ y -= remainder;
+ }
+ }
+ super.setVirtualOrigin(x, y);
+ }
+
+ protected void scrollY(ScrollBar vBar) {
+ int vSelection = vBar.getSelection ();
+ Rectangle bounds = getVirtualBounds();
+ int y = -vSelection;
+ int cellHeight = getCellHeight();
+ if (cellHeight > 0) {
+ int remainder = y % cellHeight;
+ if (remainder < 0) {
+ y -= (cellHeight + remainder);
+ } else {
+ y -= remainder;
+ }
+ }
+ int deltaY = y - bounds.y;
+ if(deltaY!=0) {
+ scrollSmart(0,deltaY);
+ setVirtualOrigin(bounds.x, bounds.y += deltaY);
+ }
+ if (-bounds.y + getRows() * getCellHeight() >= bounds.height) {
+ // scrolled to bottom - need to redraw bottom area
+ Rectangle clientRect = getClientArea();
+ redraw(0, clientRect.height - fCellHeight, clientRect.width, fCellHeight, false);
+ }
+ }
}
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java 2007-10-13 02:20:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/ILinelRenderer.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. 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
@@ -7,9 +7,12 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
/**
@@ -19,6 +22,16 @@
int getCellWidth();
int getCellHeight();
void drawLine(ITextCanvasModel model, GC gc, int line, int x, int y, int colFirst, int colLast);
+ /**
+ * Update for a font change from the global JFace Registry.
+ */
void onFontChange();
+ /**
+ * Set a new font
+ * @param fontName Jface name of the new font
+ * @since 3.2
+ */
+ void updateFont(String fontName);
void setInvertedColors(boolean invert);
+ Color getDefaultBackgroundColor();
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java 2008-02-26 02:49:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1996, 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 1996, 2011 Wind River Systems, Inc. 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
@@ -10,6 +10,7 @@
* Douglas Lea (Addison Wesley) - [cq:1552] BoundedBufferWithStateTracking adapted to BoundedByteBuffer
* Martin Oberhuber (Wind River) - the waitForAvailable method
* Martin Oberhuber (Wind River) - [208166] Avoid unnecessary arraycopy in BoundedByteBuffer
+ * Pawel Piech (Wind River) - [333613] "Job found still running" after shutdown
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -72,7 +73,7 @@
* Must be called with a lock on this!
*/
public int available() {
- return fUsedSlots;
+ return fUsedSlots;
}
/**
* Writes a single byte to the buffer. Blocks if the buffer is full.
@@ -231,13 +232,13 @@
*/
public void waitForAvailable(long millis) throws InterruptedException {
synchronized(fQueue) {
- if(fQueue.available()==0)
+ if(fQueue.available()==0 && !fQueue.fClosed)
fQueue.wait(millis);
}
}
/**
* Must be called in the Display Thread!
- * @return true if a character is available for the terminal to show.
+ * @return number of characters available for reading.
*/
public int available() {
synchronized(fQueue) {
@@ -259,12 +260,14 @@
}
}
/**
- * Closing a PipedInputStream has no effect. The methods in
- * this class can be called after the stream has been closed without
- * generating an IOException.
- *
+ * Closing a PipedInputStream is the same as closing the output stream.
+ * The stream will allow reading data that's still in the pipe after which it will
+ * throw an IOException.
*/
public void close() throws IOException {
+ synchronized(fQueue) {
+ fQueue.close();
+ }
}
public int read(byte[] cbuf, int off, int len) throws IOException {
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java 2009-02-18 18:11:09.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. 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
@@ -11,6 +11,8 @@
* Michael Scharf (Wind River) - [209746] There are cases where some colors not displayed correctly
* Michael Scharf (Wind River) - [206328] Terminal does not draw correctly with proportional fonts
* Martin Oberhuber (Wind River) - [247700] Terminal uses ugly fonts in JEE package
+ * Martin Oberhuber (Wind River) - [335358] Fix Terminal color definition
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -25,6 +27,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.tm.internal.terminal.preferences.ITerminalConstants;
import org.eclipse.tm.terminal.model.Style;
import org.eclipse.tm.terminal.model.StyleColor;
@@ -41,11 +44,10 @@
private static final String RED = "red"; //$NON-NLS-1$
private static final String PREFIX = "org.eclipse.tm.internal."; //$NON-NLS-1$
- // TODO propagate the name of the font in the FontRegistry
- private static final String fDefaultFontName="terminal.views.view.font.definition"; //$NON-NLS-1$
- String fFontName=fDefaultFontName;
+ String fFontName=ITerminalConstants.FONT_DEFINITION;
Map fColorMapForeground=new HashMap();
Map fColorMapBackground=new HashMap();
+ Map fColorMapIntense=new HashMap();
Map fFontMap=new HashMap();
private Point fCharSize;
private final Style fDefaultStyle;
@@ -60,24 +62,25 @@
private void initColors() {
initForegroundColors();
initBackgroundColors();
+ initIntenseColors();
}
private void initForegroundColors() {
if(fInvertColors) {
setColor(fColorMapForeground, WHITE, 0, 0, 0);
setColor(fColorMapForeground, WHITE_FOREGROUND, 50, 50, 50);
- setColor(fColorMapForeground, BLACK, 255, 255, 255);
+ setColor(fColorMapForeground, BLACK, 229, 229, 229);
} else {
setColor(fColorMapForeground, WHITE, 255, 255, 255);
setColor(fColorMapForeground, WHITE_FOREGROUND, 229, 229, 229);
- setColor(fColorMapForeground, BLACK, 0, 0, 0);
+ setColor(fColorMapForeground, BLACK, 50, 50, 50);
}
- setColor(fColorMapForeground, RED, 255, 128, 128);
- setColor(fColorMapForeground, GREEN, 128, 255, 128);
- setColor(fColorMapForeground, BLUE, 128, 128, 255);
- setColor(fColorMapForeground, YELLOW, 255, 255, 0);
- setColor(fColorMapForeground, CYAN, 0, 255, 255);
- setColor(fColorMapForeground, MAGENTA, 255, 255, 0);
- setColor(fColorMapForeground, GRAY, 128, 128, 128);
+ setColor(fColorMapForeground, RED, 205, 0, 0);
+ setColor(fColorMapForeground, GREEN, 0, 205, 0);
+ setColor(fColorMapForeground, BLUE, 0, 0, 238);
+ setColor(fColorMapForeground, YELLOW, 205, 205, 0);
+ setColor(fColorMapForeground, CYAN, 0, 205, 205);
+ setColor(fColorMapForeground, MAGENTA, 205, 0, 205);
+ setColor(fColorMapForeground, GRAY, 229, 229, 229);
}
private void initBackgroundColors() {
@@ -90,14 +93,34 @@
setColor(fColorMapBackground, WHITE_FOREGROUND, 229, 229, 229);
setColor(fColorMapBackground, BLACK, 0, 0, 0);
}
- setColor(fColorMapBackground, RED, 255, 128, 128);
- setColor(fColorMapBackground, GREEN, 128, 255, 128);
- setColor(fColorMapBackground, BLUE, 128, 128, 255);
- setColor(fColorMapBackground, YELLOW, 255, 255, 0);
- setColor(fColorMapBackground, CYAN, 0, 255, 255);
- setColor(fColorMapBackground, MAGENTA, 255, 255, 0);
- setColor(fColorMapBackground, GRAY, 128, 128, 128);
+ setColor(fColorMapBackground, RED, 205, 0, 0);
+ setColor(fColorMapBackground, GREEN, 0, 205, 0);
+ setColor(fColorMapBackground, BLUE, 0, 0, 238);
+ setColor(fColorMapBackground, YELLOW, 205, 205, 0);
+ setColor(fColorMapBackground, CYAN, 0, 205, 205);
+ setColor(fColorMapBackground, MAGENTA, 205, 0, 205);
+ setColor(fColorMapBackground, GRAY, 229, 229, 229);
}
+
+ private void initIntenseColors() {
+ if(fInvertColors) {
+ setColor(fColorMapIntense, WHITE, 127, 127, 127);
+ setColor(fColorMapIntense, WHITE_FOREGROUND, 0, 0, 0); // only used when colors are inverse
+ setColor(fColorMapIntense, BLACK, 255, 255, 255);
+ } else {
+ setColor(fColorMapIntense, WHITE, 255, 255, 255);
+ setColor(fColorMapIntense, WHITE_FOREGROUND, 255, 255, 255);
+ setColor(fColorMapIntense, BLACK, 0, 0, 0);
+ }
+ setColor(fColorMapIntense, RED, 255, 0, 0);
+ setColor(fColorMapIntense, GREEN, 0, 255, 0);
+ setColor(fColorMapIntense, BLUE, 92, 92, 255);
+ setColor(fColorMapIntense, YELLOW, 255, 255, 0);
+ setColor(fColorMapIntense, CYAN, 0, 255, 255);
+ setColor(fColorMapIntense, MAGENTA, 255, 0, 255);
+ setColor(fColorMapIntense, GRAY, 255, 255, 255);
+ }
+
private void setColor(Map colorMap, String name, int r, int g, int b) {
String colorName=PREFIX+r+"-"+g+"-"+b; //$NON-NLS-1$//$NON-NLS-2$
Color color=JFaceResources.getColorRegistry().get(colorName);
@@ -111,10 +134,12 @@
public Color getForegrondColor(Style style) {
style = defaultIfNull(style);
+ Map map = style.isBold() ? fColorMapIntense : fColorMapForeground;
+ //Map map = fColorMapForeground;
if(style.isReverse())
- return getColor(fColorMapForeground,style.getBackground());
+ return getColor(map ,style.getBackground());
else
- return getColor(fColorMapForeground,style.getForground());
+ return getColor(map ,style.getForground());
}
public Color getBackgroundColor(Style style) {
style = defaultIfNull(style);
@@ -169,13 +194,19 @@
return fCharSize.y;
}
public void updateFont() {
+ updateFont(ITerminalConstants.FONT_DEFINITION);
+ }
+ /**
+ * Update the StyleMap for a new font name.
+ * The font name must be a valid name in the Jface font registry.
+ * @param fontName Jface name of the new font to use.
+ * @since 3.2
+ */
+ public void updateFont(String fontName) {
Display display=Display.getCurrent();
GC gc = new GC (display);
- if (JFaceResources.getFontRegistry().hasValueFor(fDefaultFontName)) {
- fFontName = fDefaultFontName;
- } else if (JFaceResources.getFontRegistry().hasValueFor("REMOTE_COMMANDS_VIEW_FONT")) { //$NON-NLS-1$
- //try RSE Shell View Font
- fFontName = "REMOTE_COMMANDS_VIEW_FONT"; //$NON-NLS-1$
+ if (JFaceResources.getFontRegistry().hasValueFor(fontName)) {
+ fFontName = fontName;
} else {
//fall back to "basic jface text font"
fFontName = "org.eclipse.jface.textfont"; //$NON-NLS-1$
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java 2009-11-08 23:11:33.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. 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
@@ -10,6 +10,12 @@
* Michael Scharf (Wind River) - [240098] The cursor should not blink when the terminal is disconnected
* Uwe Stieber (Wind River) - [281328] The very first few characters might be missing in the terminal control if opened and connected programmatically
* Martin Oberhuber (Wind River) - [294327] After logging in, the remote prompt is hidden
+ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
+ * Uwe Stieber (Wind River) - [205486] Fix ScrollLock always moving to line 1
+ * Anton Leherbauer (Wind River) - [219589] Copy an entire line selection
+ * Anton Leherbauer (Wind River) - [196465] Resizing Terminal changes Scroller location
+ * Anton Leherbauer (Wind River) - [324608] Terminal has strange scrolling behaviour
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -23,6 +29,7 @@
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -66,9 +73,11 @@
// since it allows switching the terminal viewport small/large as needed,
// without destroying the backing store. For a complete solution,
// Bug 196462 tracks the request for a user-defined fixed-widow-size-mode.
- private int fMinColumns=20;
+ private int fMinColumns=80;
private int fMinLines=4;
private boolean fCursorEnabled;
+ private boolean fResizing;
+
/**
* Create a new CellCanvas with the given SWT style bits.
* (SWT.H_SCROLL and SWT.V_SCROLL are automatically added).
@@ -84,13 +93,16 @@
repaintRange(col,line,width,height);
}
public void dimensionsChanged(int cols, int rows) {
- setVirtualExtend(cols+getCellWidth(), rows+getCellHeight());
calculateGrid();
}
public void terminalDataChanged() {
if(isDisposed())
return;
- scrollToEnd();
+ // scroll to end (unless scroll lock is active)
+ if (!fResizing) {
+ calculateGrid();
+ scrollToEnd();
+ }
}
});
// let the cursor blink if the text canvas gets the focus...
@@ -160,7 +172,10 @@
if (fDraggingStart !=null && !p.equals(fDraggingEnd)) {
fDraggingEnd = p;
if (compare(p, fDraggingStart) < 0) {
- fCellCanvasModel.setSelection(p.y, fDraggingStart.y, p.x, fDraggingStart.x);
+ // bug 219589 - make sure selection start coordinates are non-negative
+ int startColumn = Math.max(0, p.x);
+ int startRow = Math.max(p.y, 0);
+ fCellCanvasModel.setSelection(startRow, fDraggingStart.y, startColumn, fDraggingStart.x);
} else {
fCellCanvasModel.setSelection(fDraggingStart.y, p.y, fDraggingStart.x, p.x);
@@ -206,8 +221,10 @@
protected void onResize(boolean init) {
if(fResizeListener!=null) {
Rectangle bonds=getClientArea();
- int lines=bonds.height/getCellHeight();
- int columns=bonds.width/getCellWidth();
+ int cellHeight = getCellHeight();
+ int cellWidth = getCellWidth();
+ int lines=bonds.height/cellHeight;
+ int columns=bonds.width/cellWidth;
// when the view is minimised, its size is set to 0
// we don't sent this to the terminal!
if((lines>0 && columns>0) || init) {
@@ -215,15 +232,14 @@
if(!isHorizontalBarVisble()) {
setHorizontalBarVisible(true);
bonds=getClientArea();
- lines=bonds.height/getCellHeight();
+ lines=bonds.height/cellHeight;
}
columns=fMinColumns;
} else if(columns>=fMinColumns && isHorizontalBarVisble()) {
setHorizontalBarVisible(false);
bonds=getClientArea();
- lines=bonds.height/getCellHeight();
- columns=bonds.width/getCellWidth();
-
+ lines=bonds.height/cellHeight;
+ columns=bonds.width/cellWidth;
}
if(lines 0) {
+ y = 0;
+ }
Rectangle v=getViewRectangle();
- if(v.y!=y) {
+ if(v.y!=-y) {
setVirtualOrigin(v.x,y);
}
+ // make sure the scroll area is correct:
+ scrollY(getVerticalBar());
+ scrollX(getHorizontalBar());
}
}
/**
@@ -267,7 +299,6 @@
}
/**
* If set then if the size changes
- * @param scrollLock
*/
public void setScrollLock(boolean scrollLock) {
fScrollLock=scrollLock;
@@ -279,7 +310,9 @@
}
protected void drawLine(GC gc, int line, int x, int y, int colFirst, int colLast) {
fCellRenderer.drawLine(fCellCanvasModel, gc,line,x,y,colFirst, colLast);
-
+ }
+ protected Color getTerminalBackgroundColor() {
+ return fCellRenderer.getDefaultBackgroundColor();
}
protected void visibleCellRectangleChanged(int x, int y, int width, int height) {
fCellCanvasModel.setVisibleRectangle(y,x,height,width);
@@ -341,6 +374,9 @@
}
}
+ /**
+ * Notify about a change of the global Font Preference.
+ */
public void onFontChange() {
fCellRenderer.onFontChange();
setCellWidth(fCellRenderer.getCellWidth());
@@ -348,6 +384,13 @@
calculateGrid();
}
+ public void updateFont(String fontName) {
+ fCellRenderer.updateFont(fontName);
+ setCellWidth(fCellRenderer.getCellWidth());
+ setCellHeight(fCellRenderer.getCellHeight());
+ calculateGrid();
+ }
+
public void setInvertedColors(boolean invert) {
fCellRenderer.setInvertedColors(invert);
redraw();
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java 2008-04-04 16:31:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2012 Wind River Systems, Inc. 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,6 +9,8 @@
* Michael Scharf (Wind River) - initial API and implementation
* Michael Scharf (Wind River) - [205260] Terminal does not take the font from the preferences
* Michael Scharf (Wind River) - [206328] Terminal does not draw correctly with proportional fonts
+ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -28,10 +30,8 @@
public class TextLineRenderer implements ILinelRenderer {
private final ITextCanvasModel fModel;
StyleMap fStyleMap=new StyleMap();
- Color fBackgroundColor;
public TextLineRenderer(TextCanvas c, ITextCanvasModel model) {
fModel=model;
- fBackgroundColor=Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
}
/* (non-Javadoc)
* @see com.imagicus.thumbs.view.ICellRenderer#getCellWidth()
@@ -47,7 +47,7 @@
}
public void drawLine(ITextCanvasModel model, GC gc, int line, int x, int y, int colFirst, int colLast) {
if(line<0 || line>=getTerminalText().getHeight() || colFirst>=getTerminalText().getWidth() || colFirst-colLast==0) {
- fillBackground(gc, x, y, getCellWidth()*(colFirst-colLast), getCellHeight());
+ fillBackground(gc, x, y, getCellWidth()*(colLast-colFirst), getCellHeight());
} else {
colLast=Math.min(colLast, getTerminalText().getWidth());
LineSegment[] segments=getTerminalText().getLineSegments(line, colFirst, colLast-colFirst);
@@ -87,15 +87,17 @@
private void fillBackground(GC gc, int x, int y, int width, int height) {
Color bg=gc.getBackground();
- gc.setBackground(getBackgroundColor());
+ gc.setBackground(getDefaultBackgroundColor());
gc.fillRectangle (x,y,width,height);
gc.setBackground(bg);
}
- private Color getBackgroundColor() {
- return fBackgroundColor;
+ public Color getDefaultBackgroundColor() {
+ // null == default style
+ return fStyleMap.getBackgroundColor(null);
}
+
private void drawCursor(ITextCanvasModel model, GC gc, int row, int x, int y, int colFirst) {
if(!model.isCursorOn())
return;
@@ -156,6 +158,9 @@
public void onFontChange() {
fStyleMap.updateFont();
}
+ public void updateFont(String fontName) {
+ fStyleMap.updateFont(fontName);
+ }
public void setInvertedColors(boolean invert) {
fStyleMap.setInvertedColors(invert);
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java 2008-04-04 16:31:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/VirtualCanvas.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2010 Wind River Systems, Inc. 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
*******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas;
@@ -16,7 +17,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite;
@@ -99,9 +99,11 @@
}
- private void scrollSmart(int deltaX, int deltaY) {
- Rectangle rect = getBounds();
- scroll (deltaX, deltaY, 0, 0, rect.width, rect.height, false);
+ protected void scrollSmart(int deltaX, int deltaY) {
+ if (deltaX != 0 || deltaY != 0) {
+ Rectangle rect = getBounds();
+ scroll (deltaX, deltaY, 0, 0, rect.width, rect.height, false);
+ }
}
/**
@@ -155,8 +157,8 @@
return getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
}
protected void paintUnoccupiedSpace(GC gc, Rectangle clipping) {
- int width=fVirtualBounds.width;
- int height=fVirtualBounds.height;
+ int width=fVirtualBounds.width + fVirtualBounds.x;
+ int height=fVirtualBounds.height + fVirtualBounds.y;
int marginWidth = (clipping.x+clipping.width) - width;
int marginHeight = (clipping.y+clipping.height) - height;
if(marginWidth>0||marginHeight>0){
@@ -224,11 +226,13 @@
* @param y
*/
protected void setVirtualOrigin(int x, int y) {
- fVirtualBounds.x=x;
- fVirtualBounds.y=y;
- getHorizontalBar().setSelection(-x);
- getVerticalBar().setSelection(-y);
- updateViewRectangle();
+ if (fVirtualBounds.x != x || fVirtualBounds.y != y) {
+ fVirtualBounds.x=x;
+ fVirtualBounds.y=y;
+ getHorizontalBar().setSelection(-x);
+ getVerticalBar().setSelection(-y);
+ updateViewRectangle();
+ }
}
protected Rectangle getVirtualBounds() {
return cloneRectangle(fVirtualBounds);
@@ -304,25 +308,24 @@
}
}
private void doUpdateScrollbar() {
- Point size= getSize();
Rectangle clientArea= getClientArea();
ScrollBar horizontal= getHorizontalBar();
// even if setVisible was called on the scrollbar, isVisible
// returns false if its parent is not visible.
if(!isVisible() || horizontal.isVisible()) {
horizontal.setPageIncrement(clientArea.width - horizontal.getIncrement());
- int max= fVirtualBounds.width + (size.x - clientArea.width);
+ int max= fVirtualBounds.width;
horizontal.setMaximum(max);
- horizontal.setThumb(size.x > max ? max : size.x);
+ horizontal.setThumb(clientArea.width);
}
ScrollBar vertical= getVerticalBar();
// even if setVisible was called on the scrollbar, isVisible
// returns false if its parent is not visible.
if(!isVisible() || vertical.isVisible()) {
vertical.setPageIncrement(clientArea.height - vertical.getIncrement());
- int max= fVirtualBounds.height + (size.y - clientArea.height);
+ int max= fVirtualBounds.height;
vertical.setMaximum(max);
- vertical.setThumb(size.y > max ? max : size.y);
+ vertical.setThumb(clientArea.height);
}
}
protected boolean isVertialBarVisible() {
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/feature.properties 2009-05-13 22:22:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,10 +18,10 @@
featureName=Target Management Terminal Widget
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=An ANSI (vt102) compatible Terminal widget \
@@ -29,7 +29,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -43,8 +43,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -52,42 +52,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -96,47 +92,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/feature.xml 2009-11-05 17:38:02.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,8 +1,19 @@
-
+
+
@@ -18,8 +29,8 @@
-
-
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/license.html 2007-06-04 16:08:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal
+ 3.2.2.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties 2009-05-13 22:22:44.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Widget Source
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=An ANSI (vt102) compatible Terminal widget.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html 2007-06-04 16:08:57.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplateFeature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:22:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:15:14.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties 2009-05-13 22:43:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -8,5 +8,5 @@
# Contributors:
# Martin Oberhuber - initial API and implementation
################################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/
sourcePlugin = true
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:43:32.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@
# Martin Oberhuber - initial API and implementation
################################################################################
pluginName=Target Management Terminal Widget Source
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal-feature/sourceTemplatePlugin/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/.project eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/.project 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/.project 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,17 @@
+
+
+ org.eclipse.tm.terminal.core.sdk-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/build.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,19 @@
+################################################################################
+# Copyright (c) 2012 Wind River Systems, Inc. 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
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+################################################################################
+bin.includes = feature.xml,\
+ epl-v10.html,\
+ feature.properties,\
+ license.html,\
+ eclipse_update_120.jpg
+generate.plugin@org.eclipse.tm.terminal.source=org.eclipse.tm.terminal
+generate.plugin@org.eclipse.tm.terminal.serial.source=org.eclipse.tm.terminal.serial
+generate.plugin@org.eclipse.tm.terminal.ssh.source=org.eclipse.tm.terminal.ssh
+generate.plugin@org.eclipse.tm.terminal.telnet.source=org.eclipse.tm.terminal.telnet
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/eclipse_update_120.jpg and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/eclipse_update_120.jpg differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/epl-v10.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+Eclipse Public License - Version 1.0
+
+
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,169 @@
+###############################################################################
+# Copyright (c) 2012 Wind River Systems, Inc. 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
+#
+# Contributors:
+# Wind River Systems - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Target Management Terminal
+
+# "description" property - description of the feature
+description=An ANSI (vt102) compatible Terminal control including \
+plug-ins for Serial, SSH and Telnet connections. Includes Source Code.
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse TM Project
+
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 3.4 Updates
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2012 Wind River Systems, Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,80 @@
+
+
+
+
+
+ %description
+
+
+
+ %copyright
+
+
+
+ %license
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/license.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,108 @@
+
+
+
+
+
+Eclipse Foundation Software User Agreement
+
+
+
+Eclipse Foundation Software User Agreement
+February 1, 2011
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+ For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
+
+ - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.core.sdk-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.core.sdk-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.core.sdk
+ 3.3.2.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.classpath eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.classpath
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.classpath 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.classpath 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.project eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.project 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.project 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,34 @@
+
+
+ org.eclipse.tm.terminal.local
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+ org.eclipse.pde.api.tools.apiAnalysisBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+ org.eclipse.pde.api.tools.apiAnalysisNature
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/.settings/org.eclipse.jdt.core.prefs 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,83 @@
+#Tue Jul 29 00:26:52 PDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.tm.terminal.local;singleton:=true
+Bundle-Version: 0.2.200.qualifier
+Bundle-Activator: org.eclipse.tm.internal.terminal.local.LocalTerminalActivator
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)",
+ org.eclipse.cdt.core;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.jface,
+ org.eclipse.ui,
+ org.eclipse.ui.externaltools
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
+Import-Package: org.eclipse.core.variables
+Export-Package: org.eclipse.tm.internal.terminal.local;x-internal:=true,
+ org.eclipse.tm.internal.terminal.local.launch;x-internal:=true,
+ org.eclipse.tm.internal.terminal.local.launch.ui;x-internal:=true,
+ org.eclipse.tm.internal.terminal.local.process;x-internal:=true,
+ org.eclipse.tm.internal.terminal.local.ui;x-internal:=true
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,28 @@
+
+
+
+
+About
+
+
+About This Content
+
+March 1, 2010
+License
+
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at http://www.eclipse.org.
+
+
+
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.ini 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=tm32.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.mappings eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.mappings
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.mappings 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.mappings 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,12 @@
+####################################################################################################
+# Copyright (c) 2008 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+####################################################################################################
+
+0=@build@
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/about.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,19 @@
+####################################################################################################
+# Copyright (c) 2008, 2012 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+
+blurb=Target Management Terminal Local Connector (Incubation)\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Mirko Raner and others 2008, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/build.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,24 @@
+###############################################################################
+# Copyright (c) 2010, 2011 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+ plugin.properties,\
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ tm32.png,\
+ icons/,\
+ META-INF/,\
+ .
+src.includes = about.html
+jre.compilation.profile = J2SE-1.5
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/icons/terminal-launch.gif and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/icons/terminal-launch.gif differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/plugin.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,20 @@
+####################################################################################################
+# Copyright (c) 2008, 2011 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+
+# NLS_MESSAGEFORMAT_NONE
+
+pluginName=Local Terminal (Incubation)
+providerName=Eclipse TM Project
+
+terminalLaunch=Terminal
+terminalLaunchDescription=Run a program in a terminal
+localConnection=Local Program
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/plugin.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal.local
+ 0.2.200.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ILocalTerminalSettings.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,75 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.tm.terminal.ssh/ISshSettings
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
+
+/**
+ * The interface {@link ILocalTerminalSettings} defines the public interface for connector-specific
+ * settings needed by the {@link LocalTerminalConnector}. The interface is implemented by class
+ * {@link LocalTerminalSettings}.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.3 $
+ */
+public interface ILocalTerminalSettings {
+
+ /**
+ * The line separator setting CR (carriage return only; for example, used by Mac OS 9).
+ */
+ public final static String LINE_SEPARATOR_CR = "\\r"; //$NON-NLS-1$
+
+ /**
+ * The line separator setting CRLF (carriage return and line feed; for example, used by
+ * Windows).
+ */
+ public final static String LINE_SEPARATOR_CRLF = "\\r\\n"; //$NON-NLS-1$
+
+ /**
+ * The line separator setting LF (line feed only; used by all UNIX-based systems).
+ */
+ public final static String LINE_SEPARATOR_LF = "\\n"; //$NON-NLS-1$
+
+ /**
+ * Loads the settings from a specified {@link ISettingsStore}.
+ *
+ * TODO: the {@link #load(ISettingsStore)} method should probably extracted to a super-interface
+ * as it appears to be common to all customized settings interfaces
+ *
+ * @param store the {@link ISettingsStore} to load the settings from
+ */
+ public abstract void load(ISettingsStore store);
+
+ /**
+ * Saves the settings to a specified {@link ISettingsStore}.
+ *
+ * TODO: the {@link #save(ISettingsStore)} method should probably extracted to a super-interface
+ * as it appears to be common to all customized settings interfaces
+ *
+ * @param store the {@link ISettingsStore} for storing the settings
+ */
+ public abstract void save(ISettingsStore store);
+
+ /**
+ * Gets the name of the launch configuration that will be started in the terminal.
+ *
+ * @return the launch configuration name
+ */
+ public abstract String getLaunchConfigurationName();
+
+ /**
+ * Sets the name of the launch configuration that will be started in the terminal.
+ *
+ * @param configurationName the launch configuration name
+ */
+ public abstract void setLaunchConfigurationName(String configurationName);
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalActivator.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,98 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The class {@link LocalTerminalActivator} is the bundle activator for the Local Terminal
+ * Connector plug-in.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.1 $
+ */
+public class LocalTerminalActivator extends AbstractUIPlugin {
+
+ /**
+ * The plug-in ID of the Local Terminal Connector plug-in.
+ */
+ public static final String PLUGIN_ID = "org.eclipse.tm.terminal.local"; //$NON-NLS-1$
+
+ /**
+ * The preference key for confirming process termination during workbench shutdown.
+ * Value: "CONFIRM_TERMINATE".
+ * If the corresponding Preference slot is set to "true", a confirmation dialog
+ * will be shown when quitting Workbench while a local Terminal is still running.
+ * For details, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=313643
+ * @since 0.1
+ */
+ public final static String PREF_CONFIRM_TERMINATE_ON_SHUTDOWN = "CONFIRM_TERMINATE";//$NON-NLS-1$
+
+ private static LocalTerminalActivator plugin;
+
+ /**
+ * Creates a new {@link LocalTerminalActivator}.
+ */
+ public LocalTerminalActivator() {
+
+ super();
+ }
+
+ /**
+ * Returns the shared plug-in instance.
+ *
+ * @return the shared instance
+ */
+ public static LocalTerminalActivator getDefault() {
+
+ return plugin;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given plug-in relative path.
+ *
+ * @param path the path to the image
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+
+ return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+
+ /**
+ * Starts the bundle and initializes the shared plug-in reference.
+ *
+ * @param context the {@link BundleContext}
+ *
+ * @see AbstractUIPlugin#start(BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+
+ super.start(context);
+ plugin = this;
+ }
+
+ /**
+ * Stops the bundle and resets the the shared plug-in reference.
+ *
+ * @param context the {@link BundleContext}
+ *
+ * @see AbstractUIPlugin#stop(BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+
+ plugin = null;
+ super.stop(context);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalConnector.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,400 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2012 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] initial implementation; some methods adapted from
+ * org.eclipse.tm.terminal.ssh/SshConnector
+ * Mirko Raner - [314977] Dynamically disable when no PTY is available
+ * Anna Dushistova(MontaVista) - [386262] NPE in setTerminalSize
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import java.io.OutputStream;
+
+import org.eclipse.cdt.utils.Platform;
+import org.eclipse.cdt.utils.pty.PTY;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IDebugEventSetListener;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.model.IStreamMonitor;
+import org.eclipse.debug.core.model.IStreamsProxy;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcess;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcessFactory;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcessRegistry;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
+import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl;
+
+/**
+ * The class {@link LocalTerminalConnector} provides a terminal connector implementation for
+ * connecting to local programs (for example, a locally running bash
shell or
+ * vi
editor).
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.6 $
+ */
+public class LocalTerminalConnector extends TerminalConnectorImpl
+implements IDebugEventSetListener {
+
+ // Shorthand for attribute names:
+ //
+ private final static String ATTR_CAPTURE_IN_CONSOLE = IDebugUIConstants.ATTR_CAPTURE_IN_CONSOLE;
+ private final static String ATTR_CAPTURE_OUTPUT = DebugPlugin.ATTR_CAPTURE_OUTPUT;
+ private final static String ATTR_PROCESS_FACTORY_ID = DebugPlugin.ATTR_PROCESS_FACTORY_ID;
+
+ private LocalTerminalOutputStream terminalToLocalProcessStream;
+ private LocalTerminalOutputListener outputListener;
+ private LocalTerminalOutputListener errorListener;
+ private ILocalTerminalSettings settings;
+ private IStreamMonitor outputMonitor;
+ private IStreamMonitor errorMonitor;
+ private LocalTerminalProcess process;
+ private ILaunch launch;
+ private int lastHeight;
+ private int lastWidth;
+
+ /**
+ * Creates a new {@link LocalTerminalConnector}. This constructor is invoked by the framework.
+ */
+ public LocalTerminalConnector() {
+
+ settings = new LocalTerminalSettings();
+ }
+
+ /**
+ * Initializes the connector. This method checks whether a pty
driver is available
+ * and will fail if that is not the case.
+ *
+ * @throws Exception if the connector could not be initialized
+ */
+ public void initialize() throws Exception {
+
+ super.initialize();
+ if (!PTY.isSupported()) {
+
+ final String OS = Platform.getOS();
+ final String ARCH = Platform.getOSArch();
+ String message = NLS.bind(LocalTerminalMessages.errorNoPTYSupport, OS, ARCH);
+ IStatus status = new Status(IStatus.WARNING, LocalTerminalActivator.PLUGIN_ID, message);
+ throw new CoreException(status);
+ }
+ }
+
+ /**
+ * Loads the connector's settings from the specified store.
+ *
+ * @param store the {@link ISettingsStore}
+ *
+ * @see TerminalConnectorImpl#load(ISettingsStore)
+ *
+ * TODO: the load(ISettingsStore) method should probably be made abstract in
+ * TerminalConnectorImpl, otherwise it is not immediately clear that clients need to
+ * override this method if custom settings are necessary (which they usually are).
+ * Maybe the whole settings store mechanism should be redesigned. The current scheme
+ * requires clients to implement load/save methods in their connector implementation
+ * classes (necessity to override is not immediately obvious) and in the settings store
+ * implementations (not enforced at all; merely expected by convention). Structurally,
+ * all client implementations look more or less the same, and probably could be handled
+ * by the framework in a uniform way. Maybe a configuration mechanism using attributes
+ * (like, for example, ILaunchConfiguration) might be beneficial here.
+ */
+ public void load(ISettingsStore store) {
+
+ settings.load(store);
+ }
+
+ /**
+ * Stores the connector's settings into the specified store.
+ * See {@link #load(ISettingsStore)} for additional notes.
+ *
+ * @param store the {@link ISettingsStore}
+ *
+ * @see TerminalConnectorImpl#save(ISettingsStore)
+ */
+ public void save(ISettingsStore store) {
+
+ settings.save(store);
+ }
+
+ /**
+ * Creates the {@link ISettingsPage} for the settings of this connector.
+ *
+ * @return a new page that can be used in a dialog to setup this connection, or
+ * null
if the connection cannot be customized or configured
+ *
+ * @see TerminalConnectorImpl#makeSettingsPage()
+ */
+ public ISettingsPage makeSettingsPage() {
+
+ return new LocalTerminalSettingsPage(settings);
+ }
+
+ /**
+ * Returns a string that represents the settings of the connection.
+ *
+ * @return the name of the launch configuration that is running in the terminal
+ *
+ * @see TerminalConnectorImpl#getSettingsSummary()
+ * @see ILocalTerminalSettings#getLaunchConfigurationName()
+ */
+ public String getSettingsSummary() {
+
+ return settings.getLaunchConfigurationName();
+ }
+
+ /**
+ * Checks if local echo is required.
+ *
+ * @return true
if the connection settings specify that local echo is enable,
+ * false
otherwise
+ *
+ * @see TerminalConnectorImpl#isLocalEcho()
+ * @see LocalTerminalLaunchUtilities#ATTR_LOCAL_ECHO
+ */
+ public boolean isLocalEcho() {
+
+ return LocalTerminalUtilities.getLocalEcho(settings);
+ }
+
+ /**
+ * Returns an {@link OutputStream} that writes to the local program's standard input. For the
+ * stream in the other direction (remote to terminal) see
+ * {@link ITerminalControl#getRemoteToTerminalOutputStream()}.
+ *
+ * @return the terminal-to-remote-stream (bytes written to this stream will be sent to the
+ * local program)
+ */
+ public OutputStream getTerminalToRemoteStream() {
+
+ return terminalToLocalProcessStream;
+ }
+
+ /**
+ * Connects a locally launched program to the {@link ITerminalControl}.
+ *
+ * @param control the {@link ITerminalControl} through which the user can interact with the
+ * program
+ */
+ public void connect(ITerminalControl control) {
+
+ super.connect(control);
+ control.setState(TerminalState.CONNECTING);
+ ILaunchConfigurationWorkingCopy workingCopy = null;
+ ILaunchConfiguration configuration = null;
+ String configurationName = null;
+ try {
+
+ configurationName = settings.getLaunchConfigurationName();
+ configuration = LocalTerminalUtilities.findLaunchConfiguration(configurationName);
+ }
+ catch (CoreException exception) {
+
+ Shell shell = Display.getDefault().getActiveShell();
+ String title = LocalTerminalMessages.errorTitleCouldNotConnectToTerminal;
+ String text = LocalTerminalMessages.errorLaunchConfigurationNoLongerExists;
+ String message = NLS.bind(text, configurationName);
+ IStatus status = new Status(IStatus.ERROR, LocalTerminalActivator.PLUGIN_ID, message);
+ ErrorDialog.openError(shell, title, null, status);
+ control.setState(TerminalState.CLOSED);
+ return;
+ }
+ try {
+
+ String oldFactoryID = configuration.getAttribute(ATTR_PROCESS_FACTORY_ID, (String)null);
+ workingCopy = configuration.getWorkingCopy();
+ workingCopy.setAttribute(ATTR_CAPTURE_OUTPUT, true);
+ workingCopy.setAttribute(ATTR_CAPTURE_IN_CONSOLE, true);
+ workingCopy.setAttribute(ATTR_PROCESS_FACTORY_ID, LocalTerminalProcessFactory.ID);
+ configuration = workingCopy.doSave();
+ try {
+
+ launch = configuration.launch(ILaunchManager.RUN_MODE, null);
+ }
+ finally {
+
+ // The process factory ID is used to distinguish between launches that originate
+ // from the terminal connector and launches that originate from the launch dialog.
+ // After launching, the original ID is restored so that the launch is not mistaken
+ // as originating from the terminal connector UI when it is launched via the launch
+ // dialog the next time:
+ //
+ workingCopy = configuration.getWorkingCopy();
+ workingCopy.setAttribute(ATTR_PROCESS_FACTORY_ID, oldFactoryID);
+ workingCopy.doSave();
+ }
+
+ // To prevent a console from being allocated, the launch will actually not contain a
+ // reference to the runtime process. The process has to be obtained from the
+ // LocalTerminalProcessRegistry instead:
+ //
+ process = LocalTerminalProcessRegistry.getFromLaunch(launch);
+ IStreamsProxy streamsProxy = process.getStreamsProxy();
+
+ // Hook up standard input:
+ //
+ terminalToLocalProcessStream = new LocalTerminalOutputStream(process, settings);
+
+ // Hook up standard output:
+ //
+ outputMonitor = streamsProxy.getOutputStreamMonitor();
+ outputListener = new LocalTerminalOutputListener(control, settings);
+ outputMonitor.addListener(outputListener);
+ outputListener.streamAppended(outputMonitor.getContents(), outputMonitor);
+
+ // Hook up standard error:
+ //
+ errorMonitor = streamsProxy.getErrorStreamMonitor();
+ errorListener = new LocalTerminalOutputListener(control, settings);
+ errorMonitor.addListener(errorListener);
+ errorListener.streamAppended(errorMonitor.getContents(), errorMonitor);
+ //
+ // TODO: add proper synchronization for incoming data from stdout and stderr:
+ // currently, the data gets sometimes processed in the wrong order, for example,
+ // the next prompt (which shells like bash print to stderr) sometimes appears
+ // before the command's proper output that was sent to stdout. For example,
+ // you get:
+ //
+ // $ echo hello
+ // $ hello
+ //
+ // instead of the correct output of:
+ //
+ // $ echo hello
+ // hello
+ // $
+
+ // Listen for process termination and update the terminal state:
+ //
+ DebugPlugin.getDefault().addDebugEventListener(this);
+ control.setState(TerminalState.CONNECTED);
+ }
+ catch (CoreException exception) {
+
+ control.setState(TerminalState.CLOSED);
+ Shell shell = LocalTerminalSettingsPage.getShell();
+ ErrorDialog.openError(shell, null, null, exception.getStatus());
+ Logger.logException(exception);
+ }
+ }
+
+ /**
+ * Disconnects the connector if it is currently connected or does nothing otherwise. This method
+ * will try to terminate the underlying launched process and will remove all registered
+ * listeners.
+ */
+ public void doDisconnect() {
+
+ try {
+
+ removeAllListeners();
+
+ // To prevent a console from being allocated, Terminal launches don't have an IProcess
+ // associated with them while they are running. However, to properly terminate a launch
+ // the launch has to contain at least one process that can be terminated (launches
+ // without processes effectively cannot be terminated):
+ //
+ LocalTerminalProcessRegistry.addProcessBackToFinishedLaunch(launch);
+
+ // Now, terminate the process if it was ever started and hasn't been terminated already:
+ //
+ if (launch != null && launch.canTerminate()) {
+
+ launch.terminate();
+ //
+ // NOTE: canTerminate() merely indicates that the launch has not been terminated
+ // previously already
+ }
+ }
+ catch (DebugException couldNotTerminate) {
+
+ Logger.logException(couldNotTerminate);
+ }
+ }
+
+ /**
+ * Notifies the {@link PTY pty} that the size of the terminal has changed.
+ * This method gets called rather frequently, even if the terminal size has actually not
+ * changed. The method stores the last known width and height and will only call
+ * {@link PTY#setTerminalSize(int, int)} if it was different.
+ *
+ * @param width the new terminal width (in columns)
+ * @param height the new terminal height (in lines)
+ */
+ public void setTerminalSize(int width, int height) {
+ if(process != null){
+ PTY pty = process.getPTY();
+ if (pty != null && (width != lastWidth || height != lastHeight)) {
+
+ pty.setTerminalSize(width, height);
+ lastWidth = width;
+ lastHeight = height;
+ }
+ }
+ }
+
+ /**
+ * Listens for self-induced termination of the launched process. For example, this method will
+ * be notified if a launched shell is terminated by pressing Control-D or by calling
+ * exit
, or if a vi
editor is terminated by means of a
+ * :q!
command.
+ *
+ * @param event the debug events
+ *
+ * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
+ */
+ public void handleDebugEvents(DebugEvent[] event) {
+
+ int numberOfEvents = event.length;
+ for (int index = 0; index < numberOfEvents; index++) {
+
+ if (event[index].getSource().equals(process)
+ && (event[index].getKind() == DebugEvent.TERMINATE)) {
+
+ fControl.setState(TerminalState.CLOSED);
+ removeAllListeners();
+ return;
+ }
+ }
+ }
+
+ /**
+ * Removes any listeners that the {@link LocalTerminalConnector} might have registered in its
+ * {@link #connect(ITerminalControl)} method. This method is necessary for clean-up when a
+ * connection is closed. It prevents that orphaned or meaningless listeners keep accumulating
+ * on certain objects.
+ */
+ protected void removeAllListeners() {
+
+ if (outputMonitor != null && outputListener != null) {
+
+ outputMonitor.removeListener(outputListener);
+ }
+ if (errorMonitor != null && errorListener != null) {
+
+ errorMonitor.removeListener(errorListener);
+ }
+ DebugPlugin.getDefault().removeDebugEventListener(this);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchLabelProvider.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,72 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jface.viewers.BaseLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+
+/**
+ * The class {@link LocalTerminalLaunchLabelProvider} is an {@link ILabelProvider} for lists (or
+ * tables) of {@link ILaunchConfiguration}s. It returns a configuration's name as the text label,
+ * and the configuration type's regular icon as the image label.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalLaunchLabelProvider extends BaseLabelProvider implements ILabelProvider {
+
+ /**
+ * Creates a new {@link LocalTerminalLaunchLabelProvider}.
+ */
+ public LocalTerminalLaunchLabelProvider() {
+
+ super();
+ }
+
+ /**
+ * Returns the image for the label of the given element.
+ *
+ * @param element the element for which the image was requested
+ * @return the image, or null
if no image could be found
+ *
+ * @see ILabelProvider#getImage(Object)
+ */
+ public Image getImage(Object element) {
+
+ if (element instanceof ILaunchConfiguration) {
+
+ return LocalTerminalLaunchUtilities.getImage((ILaunchConfiguration)element);
+ }
+ return null;
+ }
+
+ /**
+ * Returns the text for the label of the given element.
+ *
+ * @param element the element for which to provide the label text
+ * @return the text string used to label the element, or null
if there is no text
+ * label for the given object
+ *
+ * @see ILabelProvider#getText(Object)
+ */
+ public String getText(Object element) {
+
+ if (element instanceof ILaunchConfiguration) {
+
+ return ((ILaunchConfiguration)element).getName();
+ }
+ return String.valueOf(element);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalLaunchListProvider.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,90 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalLaunchListProvider} is a {@link IStructuredContentProvider} that
+ * provides a list of all {@link ILaunchConfiguration}s of the type "External Tools"/"Program".
+ * Those launch configurations can be used to start a new session in the Terminal View.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalLaunchListProvider implements IStructuredContentProvider {
+
+ /**
+ * Creates a new {@link LocalTerminalLaunchListProvider}.
+ */
+ public LocalTerminalLaunchListProvider() {
+
+ super();
+ }
+
+ /**
+ * Returns the matching {@link ILaunchConfiguration}s for the given input element. This content
+ * provider does not really use the concept of "input" because the input can only be obtained in
+ * one way (from the {@link ILaunchManager}.
+ *
+ * @param input the input element (not checked or used by this method)
+ * @return the matching {@link ILaunchConfiguration}s
+ *
+ * @see IStructuredContentProvider#getElements(Object)
+ */
+ public Object[] getElements(Object input) {
+
+ ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
+ ILaunchConfigurationType type = LocalTerminalUtilities.TERMINAL_LAUNCH_TYPE;
+ ILaunchConfiguration[] configurations = null;
+ try {
+
+ configurations = launchManager.getLaunchConfigurations(type);
+ }
+ catch (CoreException couldNotObtainLaunchConfigurations) {
+
+ Logger.logException(couldNotObtainLaunchConfigurations);
+ }
+ return configurations;
+ }
+
+ /**
+ * Disposes of this {@link LocalTerminalLaunchListProvider}. Currently, there is no additional
+ * clean-up necessary, and this method is empty.
+ *
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
+ public void dispose() {
+
+ // Does nothing...
+ }
+
+ /**
+ * Notifies the {@link LocalTerminalLaunchListProvider} that its input has changed. This method
+ * is currently empty because {@link LocalTerminalLaunchListProvider} is not aware of the
+ * concept of "input"
+ *
+ * @see #getElements(Object)
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
+ */
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+
+ // Does nothing...
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,124 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * The class {@link LocalTerminalMessages} provides localization keys to internationalized display
+ * messages used by the Local Terminal Connector.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.4 $
+ */
+public class LocalTerminalMessages extends NLS {
+
+ static {
+
+ NLS.initializeMessages(LocalTerminalMessages.class.getName(), LocalTerminalMessages.class);
+ }
+
+ private LocalTerminalMessages() {
+
+ super();
+ }
+
+ /** The title for the launch configuration selection: "Launch configuration:". */
+ public static String launchConfiguration;
+
+ /** The label for the "New..." button. */
+ public static String labelNew;
+
+ /** The label for the "Edit..." button. */
+ public static String labelEdit;
+
+ /** The label for the "Delete" button. */
+ public static String labelDelete;
+
+ /** The label for the "Enable terminal echo" check box. */
+ public static String enableLocalEcho;
+
+ /** The label for the "Send SIGINT when Ctrl-C is pressed" check box. */
+ public static String sendInterruptOnCtrlC;
+
+ /** The line separator option "LF". */
+ public static String lineSeparatorLF;
+
+ /** The line separator option "CR". */
+ public static String lineSeparatorCR;
+
+ /** The line separator option "CRLF". */
+ public static String lineSeparatorCRLF;
+
+ /** The default line separator option. */
+ public static String lineSeparatorDefault;
+
+ /** The base name for new launch configurations. */
+ public static String newTerminalLaunchName;
+
+ /** The error message to be issued if a launch configuration could not be found. */
+ public static String noSuchLaunchConfiguration;
+
+ /** The message displayed while launching a configuration. */
+ public static String launchingConfiguration;
+
+ /** The error message displayed when process creation failed. */
+ public static String couldNotCreateIProcess;
+
+ /** The error message for a missing executable path. */
+ public static String locationNotSpecified;
+
+ /** The error message for a specified but invalid executable path. */
+ public static String invalidLocation;
+
+ /** The error message for an invalid working directory location. */
+ public static String invalidWorkingDirectory;
+
+ /** The question message for confirming deletion of a launch configuration. */
+ public static String questionDeleteLaunchConfiguration;
+
+ /** The question title for confirming deletion of a launch configuration. */
+ public static String questionTitleDeleteLaunchConfiguration;
+
+ /** The error message for platforms that don't support pty
s. */
+ public static String errorNoPTYSupport;
+
+ /** The error message for attempting to directly launch a Terminal launch configuration. */
+ public static String errorDirectLaunch;
+
+ /** The error message for attempting to launch a no longer existing launch configuration. */
+ public static String errorLaunchConfigurationNoLongerExists;
+
+ /** The error dialog title for failed terminal connections. */
+ public static String errorTitleCouldNotConnectToTerminal;
+
+ /** The title string of the warning displayed when terminal launches are still running. */
+ public static String warningTitleTerminalsStillRunning;
+
+ /** The warning message displayed when terminal launches are still running. */
+ public static String warningMessageTerminalsStillRunning;
+
+ /** The label for the button that quits the workbench anyway. */
+ public static String quitWorkbenchAnyway;
+
+ /** The label for the button that vetoes a shutdown of the workbench. */
+ public static String doNoQuitWorkbench;
+
+ /** The label for a terminal process that was terminated during workbench shut-down. */
+ public static String terminatedProcess;
+
+ /** The name of the launch configuration tab for terminal settings. */
+ public static String terminalTabName;
+
+ /** The group label for the terminal settings on the launch configuration page. */
+ public static String terminalSettings;
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalMessages.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,49 @@
+####################################################################################################
+# Copyright (c) 2008, 2010 Mirko Raner.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+####################################################################################################
+
+launchConfiguration=Launch configuration\:
+enableLocalEcho=Enable terminal echo
+sendInterruptOnCtrlC=Send SIGINT when Ctrl-C is pressed
+lineSeparatorDefault=Program uses default line separator - or\:
+lineSeparatorCRLF=CRLF
+lineSeparatorLF=LF
+lineSeparatorCR=CR
+labelNew=New...
+labelEdit=Edit...
+labelDelete=Delete
+terminalTabName=Terminal
+terminalSettings=Terminal settings\:
+newTerminalLaunchName=Terminal ({0})
+noSuchLaunchConfiguration=A launch configuration called ''{0}'' does not exist
+launchingConfiguration=Launching {0}...
+couldNotCreateIProcess=The IProcess could not be created
+locationNotSpecified=Executable location was not specified in configuration ''{0}''
+invalidLocation=Executable does not exist for the external tool named ''{0}''
+invalidWorkingDirectory=The path {0} is not a directory and cannot be used as working directory \
+ for ''{1}''
+questionDeleteLaunchConfiguration=Do you wish to delete the selected launch configuration?
+questionTitleDeleteLaunchConfiguration=Confirm Launch Configuration Deletion
+errorNoPTYSupport=CDT PTY support is not available on your host ({0}.{1}).\n\n\
+The Local Terminal connector has been disabled.
+errorDirectLaunch=Terminal launch configurations can only be launched from the Terminal view. \
+ Please open the Terminal view and click the view's Settings button to select and launch a local \
+ Terminal.
+errorLaunchConfigurationNoLongerExists=The launch configuration ''{0}'' that is selected in the \
+ Terminal Settings does no longer exist. Please open the Settings dialog to select a valid launch \
+ configuration.
+errorTitleCouldNotConnectToTerminal=Could not connect to Terminal
+warningTitleTerminalsStillRunning=Warning: Terminals with active processes are still running
+warningMessageTerminalsStillRunning=The workbench is about to shut down even though one or more \
+ terminals with active processes are still running. Unsaved data may be lost if the shutdown \
+ proceeds.
+quitWorkbenchAnyway=Quit Workbench Anyways
+doNoQuitWorkbench=Do Not Quit Workbench
+terminatedProcess={0}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputListener.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,90 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import java.io.PrintStream;
+import org.eclipse.debug.core.IStreamListener;
+import org.eclipse.debug.core.model.IStreamMonitor;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalOutputListener} is an {@link IStreamListener} that transfers output
+ * from a program's standard output and standard error streams to an {@link ITerminalControl}.
+ * It does so by listening for appended text and sending it to the terminal's
+ * {@link ITerminalControl#getRemoteToTerminalOutputStream()}. The class also performs line
+ * separator conversions as specified by the {@link ILocalTerminalSettings}.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalOutputListener implements IStreamListener {
+
+ private PrintStream printStream;
+ private String lineSeparator;
+
+ /**
+ * Creates a new {@link LocalTerminalOutputListener}.
+ *
+ * @param control the {@link ITerminalControl} to which the received output is forwarded
+ * @param settings the {@link ILocalTerminalSettings}
+ */
+ public LocalTerminalOutputListener(ITerminalControl control, ILocalTerminalSettings settings) {
+
+ printStream = new PrintStream(control.getRemoteToTerminalOutputStream(), true);
+ lineSeparator = LocalTerminalUtilities.getLineSeparator(settings);
+ if (lineSeparator == null) {
+
+ String defaultLS = System.getProperty(LocalTerminalUtilities.LINE_SEPARATOR_PROPERTY);
+ if (LocalTerminalUtilities.CRLF.equals(defaultLS)) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_CRLF;
+ }
+ else if (LocalTerminalUtilities.LF.equals(defaultLS)) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_LF;
+ }
+ else if (LocalTerminalUtilities.CR.equals(defaultLS)) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_CR;
+ }
+ else {
+
+ Logger.log("Unknown default line separator: " + defaultLS); //$NON-NLS-1$
+ }
+ }
+ }
+
+ /**
+ * Processes new output that was appended to the intercepted stream.
+ *
+ * @param text the new output
+ * @param monitor the {@link IStreamMonitor} from which the output was received (this parameter
+ * is currently not evaluated because each {@link IStreamMonitor} has its own dedicated instance
+ * of {@link LocalTerminalOutputListener} attached)
+ */
+ public void streamAppended(String text, IStreamMonitor monitor) {
+
+ // The VT100TerminalControl apparently adheres to a strict interpretation of the CR and
+ // LF control codes, i.e., CR moves the caret to the beginning of the line (but does not
+ // move down to the next line), and LF moves down to the next line (but not to the
+ // beginning of the line). Therefore, if the program launched in the terminal does not use
+ // CRLF as its line terminator the line terminators have to be converted to CRLF before
+ // being passed on to the terminal control:
+ //
+ if (!ILocalTerminalSettings.LINE_SEPARATOR_CRLF.equals(lineSeparator)) {
+
+ text = text.replaceAll(lineSeparator, LocalTerminalUtilities.CRLF);
+ }
+ printStream.print(text);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalOutputStream.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,184 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.core.model.IStreamsProxy;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcess;
+
+/**
+ * The class {@link LocalTerminalOutputStream} is an {@link OutputStream} that copies data that is
+ * typed into the terminal to the standard input of the active process. Data that is written to the
+ * stream is directly forwarded to the {@link IStreamsProxy} of the process. CRLF line separators
+ * that are received from the terminal will be automatically converted to the line separator that is
+ * specified in the {@link ILocalTerminalSettings}. The Terminal Control generally sends CR line
+ * separators if the local echo is disabled and CRLF if enabled. The reason for this idiosyncrasy
+ * is not entirely clear right now and the line separator behavior might change in the future.
+ *
+ * TODO: research as to whether the CR/CRLF distinction in VT100TerminalControl.TerminalKeyHandler
+ * (based on the local echo setting) is really necessary
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.4 $
+ */
+public class LocalTerminalOutputStream extends OutputStream {
+
+ private final static String NOTHING = ""; //$NON-NLS-1$
+ private final static String CRLF = LocalTerminalUtilities.CRLF;
+ private final static char CR = '\r';
+ private final static char LF = '\n';
+ private final static char CTRL_C = '\03';
+ private final static int TERMINAL_SENDS_CR = 0;
+ private final static int TERMINAL_SENDS_CRLF = 1;
+ private final static int PROGRAM_EXPECTS_LF = 0;
+ private final static int PROGRAM_EXPECTS_CRLF = 1;
+ private final static int PROGRAM_EXPECTS_CR = 2;
+ private final static int NO_CHANGE = 0;
+ private final static int CHANGE_CR_TO_LF = 1;
+ private final static int INSERT_LF_AFTER_CR = 2;
+ private final static int REMOVE_CR = 3;
+ private final static int REMOVE_LF = 4;
+
+ // CRLF conversion table:
+ //
+ // Expected line separator --> | LF | CRLF | CR |
+ // ------------------------------------+-----------------+--------------------+----------------+
+ // Local echo off - control sends CR | change CR to LF | insert LF after CR | no change |
+ // ------------------------------------+-----------------+--------------------+----------------+
+ // Local echo on - control sends CRLF | remove CR | no change | remove LF |
+ //
+ private final static int[][] CRLF_REPLACEMENT = {
+
+ {CHANGE_CR_TO_LF, INSERT_LF_AFTER_CR, NO_CHANGE},
+ {REMOVE_CR, NO_CHANGE, REMOVE_LF}
+ };
+
+ private final boolean sendSIGINTOnCtrlC;
+ private IStreamsProxy streamsProxy;
+ private IProcess process;
+ private int replacement;
+
+ /**
+ * Creates a new {@link LocalTerminalOutputStream}.
+ *
+ * @param process the {@link IProcess} object of the terminal process
+ * @param settings the {@link ILocalTerminalSettings} (currently only used for the line
+ * separator settings)
+ */
+ public LocalTerminalOutputStream(IProcess process, ILocalTerminalSettings settings) {
+
+ this.process = process;
+ streamsProxy = process.getStreamsProxy();
+ sendSIGINTOnCtrlC = LocalTerminalUtilities.getCtrlC(settings);
+ boolean localEcho = LocalTerminalUtilities.getLocalEcho(settings);
+ int terminalSends = localEcho? TERMINAL_SENDS_CRLF:TERMINAL_SENDS_CR;
+ int programExpects;
+ String lineSeparator = LocalTerminalUtilities.getLineSeparator(settings);
+ if (lineSeparator == null) {
+
+ lineSeparator = System.getProperty(LocalTerminalUtilities.LINE_SEPARATOR_PROPERTY);
+ if (LocalTerminalUtilities.CR.equals(lineSeparator)) {
+
+ programExpects = PROGRAM_EXPECTS_CR;
+ }
+ else if (LocalTerminalUtilities.LF.equals(lineSeparator)) {
+
+ programExpects = PROGRAM_EXPECTS_LF;
+ }
+ else {
+
+ programExpects = PROGRAM_EXPECTS_CRLF;
+ }
+ }
+ else if (lineSeparator.equals(ILocalTerminalSettings.LINE_SEPARATOR_LF)) {
+
+ programExpects = PROGRAM_EXPECTS_LF;
+ }
+ else if (lineSeparator.equals(ILocalTerminalSettings.LINE_SEPARATOR_CR)) {
+
+ programExpects = PROGRAM_EXPECTS_CR;
+ }
+ else {
+
+ programExpects = PROGRAM_EXPECTS_CRLF;
+ }
+ replacement = CRLF_REPLACEMENT[terminalSends][programExpects];
+ }
+
+ /**
+ * Writes the specified byte to this output stream.
+ *
+ * @param data the byte
+ * @throws IOException if an I/O error occurs
+ */
+ public void write(int data) throws IOException {
+
+ write(new byte[] {(byte)data}, 0, 1);
+ }
+
+ /**
+ * Writes a specified number of bytes from the specified byte array starting at a given offset.
+ *
+ * @param data the array containing the data
+ * @param offset the offset into the array
+ * @param length the number of bytes to be written
+ * @throws IOException of an I/O error occurs
+ */
+ public void write(byte[] data, int offset, int length) throws IOException {
+
+ String text = new String(data, offset, length);
+ //
+ // TODO: check whether this is correct! new String(byte[], int, int) always uses the default
+ // encoding!
+
+ if (replacement == CHANGE_CR_TO_LF) {
+
+ text = text.replace(CR, LF);
+ }
+ else if (replacement == INSERT_LF_AFTER_CR) {
+
+ text = text.replaceAll(ILocalTerminalSettings.LINE_SEPARATOR_CR, CRLF);
+ }
+ else if (replacement == REMOVE_CR) {
+
+ text = text.replaceAll(ILocalTerminalSettings.LINE_SEPARATOR_CR, NOTHING);
+ }
+ else if (replacement == REMOVE_LF) {
+
+ text = text.replaceAll(ILocalTerminalSettings.LINE_SEPARATOR_LF, NOTHING);
+ }
+
+ // Process Ctrl-C in the proper order:
+ //
+ int positionOfCtrlC = -1;
+ while (sendSIGINTOnCtrlC && (positionOfCtrlC = text.indexOf(CTRL_C)) != -1) {
+
+ // Send text up to (and including) the Ctrl-C to the process, then send a SIGINT:
+ //
+ streamsProxy.write(text.substring(0, positionOfCtrlC+1));
+ if (process instanceof LocalTerminalProcess) {
+
+ ((LocalTerminalProcess)process).interrupt();
+ }
+
+ // Remove the part of the text that was already sent:
+ //
+ text = text.substring(positionOfCtrlC+1);
+ }
+ if (text.length() > 0) {
+
+ streamsProxy.write(text);
+ }
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettings.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,108 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.tm.terminal.ssh/SshSettings
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import java.lang.reflect.Field;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalSettings} is the default implementation of the
+ * {@link ILocalTerminalSettings} interface.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.3 $
+ */
+public class LocalTerminalSettings implements ILocalTerminalSettings {
+
+ private String launchConfiguration;
+
+ /**
+ * Loads the settings from the given {@link ISettingsStore}.
+ * This method loads the store contents by means of reflection. This is clearly overkill for
+ * the few settings supported by this class, but the code is much more reusable. Pretty much
+ * every implementation of a custom settings store is implemented in the same fashion and
+ * might be replace by a single centralized implementation.
+ *
+ * TODO: check for possibilities to reuse this code!
+ *
+ * @param store the {@link ISettingsStore}
+ * @see ILocalTerminalSettings#load(ISettingsStore)
+ */
+ public void load(ISettingsStore store) {
+
+ Field[] declaredField = getClass().getDeclaredFields();
+ int numberOfFields = declaredField.length;
+ for (int index = 0; index < numberOfFields; index++) {
+
+ Field field = declaredField[index];
+ Class type = field.getType();
+ Object value = store.get(field.getName());
+ if (type.equals(boolean.class)) {
+
+ value = Boolean.valueOf((String)value);
+ }
+ // TODO: further conversions need to be added as new settings types are introduced
+ try {
+
+ field.set(this, value);
+ }
+ catch (IllegalAccessException illegalAccess) {
+
+ Logger.logException(illegalAccess);
+ }
+ }
+ }
+
+ /**
+ * Saves the settings to the specified {@link ISettingsStore}.
+ * See {@link #load(ISettingsStore)} for further implementation notes.
+ *
+ * @param store the {@link ISettingsStore}
+ *
+ * @see ILocalTerminalSettings#save(ISettingsStore)
+ */
+ public void save(ISettingsStore store) {
+
+ Field[] declaredField = getClass().getDeclaredFields();
+ int numberOfFields = declaredField.length;
+ for (int index = 0; index < numberOfFields; index++) {
+
+ Field field = declaredField[index];
+ try {
+
+ field.setAccessible(true);
+ store.put(field.getName(), String.valueOf(field.get(this)));
+ }
+ catch (IllegalAccessException illegalAccess) {
+
+ Logger.logException(illegalAccess);
+ }
+ }
+ }
+
+ /**
+ * @see ILocalTerminalSettings#getLaunchConfigurationName()
+ */
+ public String getLaunchConfigurationName() {
+
+ return launchConfiguration;
+ }
+
+ /**
+ * @see ILocalTerminalSettings#setLaunchConfigurationName(String)
+ */
+ public void setLaunchConfigurationName(String launchConfiguration) {
+
+ this.launchConfiguration = launchConfiguration;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalSettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,327 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2013 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.tm.terminal.ssh/SshSettingsPage
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.ILaunchGroup;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+import org.eclipse.tm.internal.terminal.local.ui.DependentHeightComposite;
+import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * The class {@link LocalTerminalSettingsPage} is an implementation {@link ISettingsPage} for
+ * local program connections.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.3 $
+ */
+public class LocalTerminalSettingsPage extends AbstractSettingsPage
+implements ISelectionChangedListener, SelectionListener {
+
+ private ILocalTerminalSettings settings;
+ private TableViewer viewer;
+ private Button buttonEdit;
+ private Button buttonNew;
+ private Button buttonDelete;
+
+ /**
+ * Creates a new {@link LocalTerminalSettingsPage} that reflects the settings of the specified
+ * {@link ILocalTerminalSettings} object.
+ *
+ * @param settings the {@link ILocalTerminalSettings}
+ */
+ public LocalTerminalSettingsPage(ILocalTerminalSettings settings) {
+
+ this.settings = settings;
+ }
+
+ /**
+ * Creates the {@link org.eclipse.swt.widgets.Control} for the settings page.
+ * (NOTE: contrary to the common pattern, this method does not actually return the Control it
+ * created)
+ *
+ * @param parent the parent {@link Composite} into which the control is to be inserted
+ *
+ * @see ISettingsPage#createControl(Composite)
+ */
+ public void createControl(Composite parent) {
+
+ ILaunchConfiguration defaultConfiguration;
+ defaultConfiguration = LocalTerminalLaunchUtilities.createDefaultLaunchConfiguration();
+ Composite enclosing = parent.getParent();
+ Layout enclosingLayout = enclosing.getLayout();
+ int extra = 0;
+ if (enclosingLayout instanceof GridLayout) {
+
+ extra = -2*((GridLayout)enclosingLayout).marginHeight-2;
+ }
+ Composite composite = new DependentHeightComposite(parent, SWT.NONE, enclosing, extra);
+ //
+ // TODO: This is a HACK that ensures proper resizing of the settings page inside the
+ // StackLayout of the PageBook. The following code makes implicit assumptions about
+ // the internal layout of surrounding widgets. This is something that should be
+ // properly addressed in the framework (maybe in the PageBook class).
+
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = layout.marginHeight = 0;
+ layout.horizontalSpacing = layout.verticalSpacing = 0;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ Label label = new Label(composite, SWT.NONE);
+ label.setText(LocalTerminalMessages.launchConfiguration);
+ label.setLayoutData(new GridData());
+
+ // Create list of available launch configurations:
+ //
+ Composite tableAndButtons = new Composite(composite, SWT.NONE);
+ tableAndButtons.setLayoutData(new GridData(GridData.FILL_BOTH));
+ layout = new GridLayout(2, false);
+ layout.marginWidth = 0;
+ tableAndButtons.setLayout(layout);
+ Table table = new Table(tableAndButtons, SWT.BORDER);
+ viewer = new TableViewer(table);
+ viewer.setLabelProvider(new LocalTerminalLaunchLabelProvider());
+ viewer.setContentProvider(new LocalTerminalLaunchListProvider());
+ viewer.setInput(new Object());
+ viewer.addSelectionChangedListener(this);
+ table.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 0, 3));
+ buttonNew = pushButton(tableAndButtons, LocalTerminalMessages.labelNew, false);
+ buttonEdit = pushButton(tableAndButtons, LocalTerminalMessages.labelEdit, false);
+ buttonEdit.setEnabled(settings.getLaunchConfigurationName() != null);
+ buttonDelete = pushButton(tableAndButtons, LocalTerminalMessages.labelDelete, true);
+ buttonDelete.setEnabled(settings.getLaunchConfigurationName() != null);
+ //
+ // NOTE: echo and line separator settings were moved to the launch configuration!
+
+ // NOTE: loadSettings() is actually NOT called by the framework but needs to be called
+ // by the settings page itself
+ // TODO: this should be fixed in the framework; otherwise there is really no point
+ // in having it be a part of the ISettingsPage interface
+ //
+ loadSettings();
+ if (defaultConfiguration != null) {
+
+ // If there is only one configuration (the default one), then make sure it gets
+ // selected:
+ //
+ viewer.setSelection(new StructuredSelection(defaultConfiguration), true);
+ }
+ }
+
+ /**
+ * Loads the settings from the internal {@link ILocalTerminalSettings} object.
+ * This method will update the UI to reflect the current settings.
+ *
+ * @see ISettingsPage#loadSettings()
+ */
+ public void loadSettings() {
+
+ String configurationName = settings.getLaunchConfigurationName();
+ ILaunchConfiguration configuration;
+ try {
+
+ configuration = LocalTerminalUtilities.findLaunchConfiguration(configurationName);
+ }
+ catch (CoreException couldNotFindLaunchConfiguration) {
+
+ configuration = null;
+ }
+ if (settings.getLaunchConfigurationName() != null && configuration != null) {
+
+ viewer.setSelection(new StructuredSelection(configuration), true);
+ }
+ }
+
+ /**
+ * Saves the settings that are currently displayed in the UI to the internal
+ * {@link ILocalTerminalSettings} object.
+ *
+ * @see ISettingsPage#saveSettings()
+ */
+ public void saveSettings() {
+
+ if (viewer != null && !viewer.getSelection().isEmpty()) {
+
+ IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
+ Object element = selection.getFirstElement();
+ if (element instanceof ILaunchConfiguration) {
+
+ String launchConfiguration = ((ILaunchConfiguration)element).getName();
+ settings.setLaunchConfigurationName(launchConfiguration);
+ }
+ }
+ }
+
+ /**
+ * Checks if the current settings are valid for starting a terminal session.
+ * This method will only return true
if a launch configuration is selected.
+ *
+ * @return true
if a launch configuration has been selected, false
+ * otherwise
+ */
+ public boolean validateSettings() {
+
+ return viewer != null && !viewer.getSelection().isEmpty();
+ }
+
+ /**
+ * Enables or disables the Edit... and Delete buttons depending on whether a launch
+ * configuration is currently selected in the viewer.
+ *
+ * @see ISelectionChangedListener#selectionChanged(SelectionChangedEvent)
+ */
+ public void selectionChanged(SelectionChangedEvent event) {
+
+ buttonEdit.setEnabled(!event.getSelection().isEmpty());
+ buttonDelete.setEnabled(!event.getSelection().isEmpty());
+ }
+
+ /**
+ * Handles default button clicks for the Edit... and New.. buttons. This method will simply
+ * pass on the call to {@link #widgetSelected(SelectionEvent)}.
+ *
+ * @param event the {@link SelectionEvent}
+ *
+ * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
+ */
+ public void widgetDefaultSelected(SelectionEvent event) {
+
+ widgetSelected(event);
+ }
+
+ /**
+ * Handles default button clicks for the Edit... and New.. buttons.
+ *
+ * @param event the {@link SelectionEvent}
+ *
+ * @see SelectionListener#widgetSelected(SelectionEvent)
+ */
+ public void widgetSelected(SelectionEvent event) {
+
+ ILaunchConfiguration configuration = null;
+ Widget widget = event.widget;
+ if (widget == null) {
+
+ return;
+ }
+ if (widget.equals(buttonNew)) {
+
+ try {
+
+ ILaunchConfigurationWorkingCopy newLaunch;
+ newLaunch = LocalTerminalLaunchUtilities.createNewLaunchConfigurationWorkingCopy();
+ configuration = newLaunch.doSave();
+ }
+ catch (CoreException couldNotCreateNewLaunchConfiguration) {
+
+ Logger.logException(couldNotCreateNewLaunchConfiguration);
+ }
+ }
+ if (widget.equals(buttonEdit) || configuration != null) {
+
+ ILaunchGroup group;
+ IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
+ if (configuration == null) {
+
+ configuration = (ILaunchConfiguration)selection.getFirstElement();
+ }
+ group = DebugUITools.getLaunchGroup(configuration, ILaunchManager.RUN_MODE);
+ String groupID = group.getIdentifier();
+ DebugUITools.openLaunchConfigurationDialog(getShell(), configuration, groupID, null);
+ //
+ // TODO: handle return value (maybe start terminal right away if "Run" was selected)
+ // - a return value of Window.CANCEL indicates that "Close" was selected
+ // - a return value of Window.OK indicates that "Run" was selected
+
+ viewer.refresh();
+ viewer.setSelection(new StructuredSelection(configuration), true);
+ //
+ // TODO: handle renamed configurations; setSelection(...) will not work if the user
+ // renamed the configuration in the dialog (apparently, because renaming actually
+ // creates a different ILaunchConfiguration object, rather than just renaming the
+ // existing one)
+ }
+ if (widget.equals(buttonDelete)) {
+
+ String title = LocalTerminalMessages.questionTitleDeleteLaunchConfiguration;
+ String question = LocalTerminalMessages.questionDeleteLaunchConfiguration;
+ if (MessageDialog.openQuestion(getShell(), title, question)) {
+
+ IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
+ configuration = (ILaunchConfiguration)selection.getFirstElement();
+ try {
+
+ configuration.delete();
+ }
+ catch (CoreException exception) {
+
+ ErrorDialog.openError(getShell(), null, null, exception.getStatus());
+ }
+ viewer.refresh();
+ }
+ }
+ }
+
+ static Shell getShell() {
+
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IWorkbenchWindow activeWindow = workbench.getActiveWorkbenchWindow();
+ if (activeWindow != null) {
+
+ return activeWindow.getShell();
+ }
+ IWorkbenchWindow[] allWindows = workbench.getWorkbenchWindows();
+ return allWindows.length > 0? allWindows[0].getShell():null;
+ }
+
+ //------------------------------------ PRIVATE SECTION ---------------------------------------//
+
+ private Button pushButton(Composite parent, String label, boolean grabVertical) {
+
+ GridData layoutData;
+ Button button = new Button(parent, SWT.PUSH);
+ button.setText(label);
+ layoutData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING|GridData.HORIZONTAL_ALIGN_FILL);
+ layoutData.grabExcessVerticalSpace = grabVertical;
+ button.setLayoutData(layoutData);
+ button.addSelectionListener(this);
+ return button;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/LocalTerminalUtilities.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,158 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchDelegate;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalUtilities} is a collection of commonly used constants and utility
+ * methods.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalUtilities {
+
+ private static String NULL = null;
+ private static String LOCAL_TERMINAL = LocalTerminalLaunchDelegate.LAUNCH_CONFIGURATION_TYPE_ID;
+
+ /** The name of the line separator system property (i.e., "line.separator
"). */
+ public final static String LINE_SEPARATOR_PROPERTY = "line.separator"; //$NON-NLS-1$
+
+ /** The line separator CRLF (i.e., "\r\n
"). */
+ public final static String CRLF = "\r\n"; //$NON-NLS-1$
+
+ /** The line separator CR (i.e., "\r
"). */
+ public final static String CR = "\r"; //$NON-NLS-1$
+
+ /** The line separator LF (i.e., "\n
"). */
+ public final static String LF = "\n"; //$NON-NLS-1$
+
+ private LocalTerminalUtilities() {
+
+ super();
+ }
+
+ /** The {@link DebugPlugin}'s {@link ILaunchManager} instance. */
+ public final static ILaunchManager LAUNCH_MANAGER = DebugPlugin.getDefault().getLaunchManager();
+
+ /**
+ * The {@link ILaunchConfigurationType} for "Terminal" launches (in the "External Tools"
+ * category).
+ */
+ public final static ILaunchConfigurationType TERMINAL_LAUNCH_TYPE =
+ LAUNCH_MANAGER.getLaunchConfigurationType(LOCAL_TERMINAL);
+
+ /**
+ * Finds a launch configuration by its name.
+ *
+ * @param name the name of the launch configuration
+ * @return the corresponding {@link ILaunchConfiguration} object or null
if the
+ * configuration could not be found
+ * @throws CoreException if there was a general problem accessing launch configurations
+ */
+ public static ILaunchConfiguration findLaunchConfiguration(String name) throws CoreException {
+
+ ILaunchConfiguration[] configuration;
+ ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
+ configuration = manager.getLaunchConfigurations(LocalTerminalUtilities.TERMINAL_LAUNCH_TYPE);
+ int numberOfConfigurations = configuration.length;
+ for (int index = 0; index < numberOfConfigurations; index++) {
+
+ if (configuration[index].getName().equals(name)) {
+
+ return configuration[index];
+ }
+ }
+ String error = NLS.bind(LocalTerminalMessages.noSuchLaunchConfiguration, name);
+ throw new CoreException(new Status(IStatus.ERROR, LocalTerminalActivator.PLUGIN_ID, error));
+ }
+
+ /**
+ * Gets the local echo setting that is stored in the launch configuration for the given
+ * {@link ILocalTerminalSettings}.
+ *
+ * @param settings the {@link ILocalTerminalSettings}
+ * @return true
for local echo enabled, false
otherwise
+ */
+ public static boolean getLocalEcho(ILocalTerminalSettings settings) {
+
+ return getBooleanSetting(settings, LocalTerminalLaunchUtilities.ATTR_LOCAL_ECHO);
+ }
+
+ /**
+ * Gets the Ctrl-C/SIGINT setting that is stored in the launch configuration for the given
+ * {@link ILocalTerminalSettings}.
+ *
+ * @param settings the {@link ILocalTerminalSettings}
+ * @return true
if sending SIGINT for Ctrl-C is enabled,
+ * false
otherwise
+ */
+ public static boolean getCtrlC(ILocalTerminalSettings settings) {
+
+ return getBooleanSetting(settings, LocalTerminalLaunchUtilities.ATTR_CTRL_C);
+ }
+
+ /**
+ * Gets the line separator setting that is stored in the launch configuration for the given
+ * {@link ILocalTerminalSettings}.
+ *
+ * @param settings the {@link ILocalTerminalSettings}
+ * @return {@link ILocalTerminalSettings#LINE_SEPARATOR_LF},
+ * {@link ILocalTerminalSettings#LINE_SEPARATOR_CRLF},
+ * {@link ILocalTerminalSettings#LINE_SEPARATOR_CR}, or null
for the platform's
+ * default line separator
+ */
+ public static String getLineSeparator(ILocalTerminalSettings settings) {
+
+ String configurationName = settings.getLaunchConfigurationName();
+ try {
+
+ String ls;
+ ILaunchConfiguration configuration = findLaunchConfiguration(configurationName);
+ ls = configuration.getAttribute(LocalTerminalLaunchUtilities.ATTR_LINE_SEPARATOR, NULL);
+ return ls;
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ return null;
+ }
+ }
+
+ //------------------------------------- PRIVATE SECTION --------------------------------------//
+
+ private static boolean getBooleanSetting(ILocalTerminalSettings settings, String attribute) {
+
+ String configurationName = settings.getLaunchConfigurationName();
+ try {
+
+ ILaunchConfiguration configuration = findLaunchConfiguration(configurationName);
+ return configuration.getAttribute(attribute, false);
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ return false;
+ }
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchDelegate.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,287 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.ui.externaltools/ProgramLaunchDelegate
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.cdt.utils.pty.PTY;
+import org.eclipse.cdt.utils.spawner.ProcessFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
+import org.eclipse.debug.ui.CommonTab;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalActivator;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalMessages;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalUtilities;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcess;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcessFactory;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * The class {@link LocalTerminalLaunchDelegate} provides a launch configuration delegate for local
+ * terminal launches. It is based on the ProgramLaunchDelegate
class in the
+ * org.eclipse.ui.externaltools
plug-in. In contrast to the original class,
+ * {@link LocalTerminalLaunchDelegate} creates its low-level {@link Process} object using the CDT
+ * {@link ProcessFactory}, which allows the process to run with a pseudo-terminal ({@link PTY}).
+ *
+ * @author Mirko Raner and others
+ * @version $Revision: 1.4 $
+ */
+public class LocalTerminalLaunchDelegate extends LaunchConfigurationDelegate {
+
+ private final static String EMPTY = ""; //$NON-NLS-1$
+ private final static String PLUGIN_ID = LocalTerminalActivator.PLUGIN_ID;
+
+ /**
+ * The launch configuration type ID for terminal launches.
+ */
+ public final static String LAUNCH_CONFIGURATION_TYPE_ID = PLUGIN_ID + ".launch"; //$NON-NLS-1$
+
+ private static LocalTerminalStillRunningListener workbenchCloseListener;
+
+ /**
+ * Creates a new {@link LocalTerminalLaunchDelegate}.
+ */
+ public LocalTerminalLaunchDelegate() {
+
+ super();
+ }
+
+ /**
+ * Launches a new Local Terminal configuration in the specified mode. The launch object has
+ * already been registered with the launch manager.
+ *
+ * @param configuration the {@link ILaunchConfiguration} to launch
+ * @param mode the mode in which to launch; currently, Local Terminal launches only support the
+ * mode {@link org.eclipse.debug.core.ILaunchManager#RUN_MODE}
+ * @param progressMonitor an {@link IProgressMonitor}, or null
for no progress
+ * monitoring
+ * @param launch the {@link ILaunch} object
+ * @exception CoreException if launching fails
+ */
+ public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch,
+ IProgressMonitor progressMonitor) throws CoreException {
+
+ String processFactoryID;
+ processFactoryID = configuration.getAttribute(DebugPlugin.ATTR_PROCESS_FACTORY_ID, EMPTY);
+ if (!LocalTerminalProcessFactory.ID.equals(processFactoryID)) {
+
+ // This launch was not launched via the terminal connector UI but via the launch dialog;
+ // the launch needs to be explicitly connected to a terminal (otherwise it will appear
+ // in the regular console), so launching from the launch dialog or from the launch
+ // history is not supported right now.
+ //
+ String message = LocalTerminalMessages.errorDirectLaunch;
+ IStatus status = new Status(IStatus.ERROR, LocalTerminalActivator.PLUGIN_ID, message);
+ throw new CoreException(status);
+ }
+
+ // Extract all relevant information from the ILaunchConfiguration; the original
+ // ProgramLaunchDelegate class checks for cancellation again and again after each step,
+ // which is a somewhat suspect pattern; however, for now, LocalTerminalLaunchDelegate
+ // handles cancellation in the same way:
+ //
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ IPath location = LocalTerminalLaunchUtilities.getLocation(configuration);
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ IPath workingDirectory = LocalTerminalLaunchUtilities.getWorkingDirectory(configuration);
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ String[] arguments = LocalTerminalLaunchUtilities.getArguments(configuration);
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ String[] commandLine = new String[arguments != null? arguments.length+1:1];
+ commandLine[0] = location.toOSString();
+ if (arguments != null) {
+
+ System.arraycopy(arguments, 0, commandLine, 1, arguments.length);
+ }
+ File workingDirectoryAsFile = null;
+ if (workingDirectory != null) {
+
+ workingDirectoryAsFile = workingDirectory.toFile();
+ }
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ String[] environment = LocalTerminalUtilities.LAUNCH_MANAGER.getEnvironment(configuration);
+ if (progressMonitor.isCanceled()) {
+
+ return;
+ }
+ //
+ // TODO: check if there is a better way of handling cancellation of terminal launches!
+
+ // Install an IWindowListener that checks for left-over terminal processes when the
+ // workbench is closed:
+ //
+ if (workbenchCloseListener == null) {
+
+ workbenchCloseListener = new LocalTerminalStillRunningListener();
+ PlatformUI.getWorkbench().addWorkbenchListener(workbenchCloseListener);
+ }
+
+ // Create the low-level Process object:
+ //
+ Process spawner;
+ PTY pty = null;
+ try {
+
+ ProcessFactory factory = ProcessFactory.getFactory();
+ if (PTY.isSupported()) {
+
+ pty = new PTY(false);
+ spawner = factory.exec(commandLine, environment, workingDirectoryAsFile, pty);
+ }
+ else {
+
+ spawner = factory.exec(commandLine, environment, workingDirectoryAsFile);
+ }
+ }
+ catch (IOException exception) {
+
+ Status error;
+ String message = exception.getMessage();
+ error = new Status(IStatus.ERROR, LocalTerminalActivator.PLUGIN_ID, message, exception);
+ throw new CoreException(error);
+ }
+
+ // Use program name as "process type" attribute:
+ //
+ Map processAttributes = new HashMap();
+ String programName = location.lastSegment();
+ String extension = location.getFileExtension();
+ if (extension != null) {
+
+ programName = programName.substring(0, programName.length()-extension.length()-1);
+ }
+ processAttributes.put(IProcess.ATTR_PROCESS_TYPE, programName.toLowerCase());
+
+ // Create the IProcess:
+ //
+ IProcess process = null;
+ if (spawner != null) {
+
+ String[] configurationName = {configuration.getName()};
+ String task = NLS.bind(LocalTerminalMessages.launchingConfiguration, configurationName);
+ progressMonitor.beginTask(task, IProgressMonitor.UNKNOWN);
+ process = DebugPlugin.newProcess(launch, spawner, commandLine[0], processAttributes);
+ }
+ if (spawner == null || process == null) {
+
+ if (spawner != null) {
+
+ spawner.destroy();
+ }
+ String pluginID = LocalTerminalActivator.PLUGIN_ID;
+ String errorMessage = LocalTerminalMessages.couldNotCreateIProcess;
+ Status error = new Status(IStatus.ERROR, pluginID, IStatus.ERROR, errorMessage, null);
+ throw new CoreException(error);
+ }
+ if (process instanceof LocalTerminalProcess) {
+
+ ((LocalTerminalProcess)process).setPTY(pty);
+ }
+ process.setAttribute(IProcess.ATTR_CMDLINE, generateCommandLine(commandLine));
+
+ // Wait for process termination if necessary (though probably highly unusual for terminal
+ // launches); again, the busy waiting pattern was copied from ProgramLaunchDelegate and is
+ // somewhat suspect:
+ //
+ if (!CommonTab.isLaunchInBackground(configuration)) {
+
+ while (!process.isTerminated()) {
+
+ try {
+
+ if (progressMonitor.isCanceled()) {
+
+ process.terminate();
+ break;
+ }
+ Thread.sleep(50);
+ }
+ catch (InterruptedException interrupt) {
+
+ Logger.logException(interrupt);
+ }
+ }
+ }
+ //
+ // TODO: find a better replacement for the busy waiting loop
+ }
+
+ //------------------------------------- PRIVATE SECTION --------------------------------------//
+
+ private String generateCommandLine(String[] commandLine) {
+
+ if (commandLine.length < 1) {
+
+ return EMPTY;
+ }
+ StringBuffer buffer = new StringBuffer();
+ for (int element = 0; element < commandLine.length; element++) {
+
+ if (element > 0) {
+
+ buffer.append(' ');
+ }
+ StringBuffer argument = new StringBuffer();
+ char[] characters = commandLine[element].toCharArray();
+ boolean argumentContainsSpace = false;
+ for (int index = 0; index < characters.length; index++) {
+
+ char character = characters[index];
+ if (character == '"') {
+
+ argument.append('\\');
+ }
+ else if (character == ' ') {
+
+ argumentContainsSpace = true;
+ }
+ argument.append(character);
+ }
+ if (argumentContainsSpace) {
+
+ buffer.append('"').append(argument).append('"');
+ }
+ else {
+
+ buffer.append(argument);
+ }
+ }
+ return buffer.toString();
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalLaunchUtilities.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,304 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.ui.externaltools/ExternalToolsUtil
+ * Mirko Raner - [314195] vi editor unusable in tcsh local terminal on Linux RHEL4
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch;
+
+import java.io.File;
+import java.text.Format;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.variables.IStringVariableManager;
+import org.eclipse.core.variables.VariablesPlugin;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalActivator;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalMessages;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalUtilities;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalLaunchUtilities} provides some utility methods that are used by the
+ * {@link LocalTerminalLaunchDelegate}. The class is based on the ExternalToolsUtil
+ * class in the org.eclipse.ui.externaltools
plug-in. This code had to be duplicated
+ * because the original class is not part of the public API of its plug-in.
+ *
+ * @author Mirko Raner and others
+ * @version $Revision: 1.4 $
+ */
+public class LocalTerminalLaunchUtilities {
+
+ /** The launch configuration attribute for the local echo setting. */
+ public final static String ATTR_LOCAL_ECHO = LocalTerminalActivator.PLUGIN_ID +
+ ".echo"; //$NON-NLS-1$
+
+ /** The launch configuration attribute for the Ctrl-C/SIGINT setting. */
+ public final static String ATTR_CTRL_C = LocalTerminalActivator.PLUGIN_ID +
+ ".sigint"; //$NON-NLS-1$
+
+ /** The launch configuration attribute for the line terminator setting. */
+ public final static String ATTR_LINE_SEPARATOR = LocalTerminalActivator.PLUGIN_ID +
+ ".lineseparator"; //$NON-NLS-1$
+
+ private final static String[] EMPTY = {};
+ private final static String STRING = null;
+ private final static String TERM = "TERM"; //$NON-NLS-1$
+ private final static String ANSI = "ansi"; //$NON-NLS-1$
+ private final static Map TERM_ANSI = Collections.singletonMap(TERM, ANSI);
+
+ // These constants were copied from IExternalToolConstants to avoid references to internal API:
+ //
+ private final static String XT = "org.eclipse.ui.externaltools"; //$NON-NLS-1$;
+ private final static String ATTR_LOCATION = XT+".ATTR_LOCATION"; //$NON-NLS-1$
+ private final static String ATTR_TOOL_ARGUMENTS = XT+".ATTR_TOOL_ARGUMENTS"; //$NON-NLS-1$
+ private final static String ATTR_WORKING_DIRECTORY = XT+".ATTR_WORKING_DIRECTORY"; //$NON-NLS-1$
+
+ private LocalTerminalLaunchUtilities() {
+
+ super();
+ }
+
+ /**
+ * Gets the image that should be used for representing the given launch configuration.
+ *
+ * @param configuration the {@link ILaunchConfiguration}
+ * @return an SWT {@link Image} or null
if no suitable image was found
+ */
+ public static Image getImage(ILaunchConfiguration configuration) {
+
+ String identifier;
+ try {
+
+ identifier = configuration.getType().getIdentifier();
+ }
+ catch (CoreException couldNotDetermineConfigurationType) {
+
+ identifier = null;
+ Logger.logException(couldNotDetermineConfigurationType);
+ }
+ if (identifier != null) {
+
+ return DebugUITools.getImage(identifier);
+ }
+ return null;
+ }
+
+ /**
+ * Expands and returns the location attribute of the given launch configuration. The location is
+ * verified to point to an existing file in the local file system.
+ *
+ * @param configuration the {@link ILaunchConfiguration}
+ * @return an absolute path to a file in the local file system
+ * @throws CoreException if unable to retrieve the associated launch configuration attribute, or
+ * if unable to resolve any variables, or if the resolved location does not point to an existing
+ * file in the local file system
+ */
+ public static IPath getLocation(ILaunchConfiguration configuration) throws CoreException {
+
+ Object[] configurationName = {configuration.getName()};
+ String location = configuration.getAttribute(ATTR_LOCATION, STRING);
+ if (location == null) {
+
+ abort(NLS.bind(LocalTerminalMessages.locationNotSpecified, configurationName), null, 0);
+ }
+ String expandedLocation = getStringVariableManager().performStringSubstitution(location);
+ if (expandedLocation == null || expandedLocation.length() == 0) {
+
+ abort(NLS.bind(LocalTerminalMessages.invalidLocation, configurationName), null, 0);
+ }
+ File file = new File(expandedLocation);
+ if (!file.isFile()) {
+
+ abort(NLS.bind(LocalTerminalMessages.invalidLocation, configurationName), null, 0);
+ }
+ return new Path(expandedLocation);
+ }
+
+ /**
+ * Expands and returns the working directory attribute of the given launch configuration.
+ * Returns null
if a working directory is not specified. If specified, the working
+ * directory is guaranteed to point to an existing directory in the local file system.
+ *
+ * @param configuration the {@link ILaunchConfiguration}
+ * @return an absolute path to a directory in the local file system, or null
if
+ * no working directory was specified
+ * @throws CoreException if unable to retrieve the associated launch configuration attribute,
+ * or if unable to resolve any variables, or if the resolved location does not point to an
+ * existing directory in the local file system
+ */
+ public static IPath getWorkingDirectory(ILaunchConfiguration configuration)
+ throws CoreException {
+
+ String location = configuration.getAttribute(ATTR_WORKING_DIRECTORY, STRING);
+ if (location != null) {
+
+ String expandedLocation;
+ expandedLocation = getStringVariableManager().performStringSubstitution(location);
+ if (expandedLocation.length() > 0) {
+
+ File path = new File(expandedLocation);
+ if (!path.isDirectory()) {
+
+ Object[] detail = {expandedLocation, configuration.getName()};
+ abort(NLS.bind(LocalTerminalMessages.invalidWorkingDirectory, detail), null, 0);
+ }
+ }
+ return new Path(expandedLocation);
+ }
+ return null;
+ }
+
+ /**
+ * Expands and returns the arguments attribute of the given launch configuration. Returns
+ * null
if arguments were not specified.
+ *
+ * @param configuration the {@link ILaunchConfiguration}
+ * @return an array of resolved arguments, or null
if no arguments were specified
+ * @throws CoreException if unable to retrieve the associated launch configuration attribute,
+ * or if unable to resolve any variables
+ */
+ public static String[] getArguments(ILaunchConfiguration configuration) throws CoreException {
+
+ String arguments = configuration.getAttribute(ATTR_TOOL_ARGUMENTS, STRING);
+ if (arguments != null) {
+
+ String expanded = getStringVariableManager().performStringSubstitution(arguments);
+ return parseStringIntoList(expanded);
+ }
+ return null;
+ }
+
+ /**
+ * Creates an initial default launch configuration for starting a shell if no terminal/program
+ * launch configurations are defined yet.
+ *
+ * @return new {@link ILaunchConfiguration}, or {@code null} if there were already some
+ * terminal/program launch configurations defined
+ */
+ public static ILaunchConfiguration createDefaultLaunchConfiguration() {
+
+ ILaunchConfiguration[] configs;
+ ILaunchManager manager = LocalTerminalUtilities.LAUNCH_MANAGER;
+ try {
+
+ configs = manager.getLaunchConfigurations(LocalTerminalUtilities.TERMINAL_LAUNCH_TYPE);
+ if (configs == null || configs.length == 0) {
+
+ // Create a default launch configuration only if there aren't any terminal launch
+ // configurations defined at all:
+ //
+ ILaunchConfigurationWorkingCopy workingCopy;
+ workingCopy = createNewLaunchConfigurationWorkingCopy();
+ return workingCopy.doSave();
+ }
+ }
+ catch (CoreException exception)
+ {
+ exception.printStackTrace(); // TODO: implement proper exception handling
+ }
+ return null;
+ }
+
+ /**
+ * Creates an {@link ILaunchConfigurationWorkingCopy} that uses the default shell as its
+ * executable and the user's home directory as the working directory.
+ *
+ * @return an unsaved {@link ILaunchConfigurationWorkingCopy}
+ * @throws CoreException if the {@link ILaunchConfigurationWorkingCopy} could not be
+ * instantiated
+ * @see #getDefaultShell()
+ */
+ public static ILaunchConfigurationWorkingCopy createNewLaunchConfigurationWorkingCopy()
+ throws CoreException {
+
+ ILaunchConfigurationWorkingCopy workingCopy;
+ ILaunchManager manager = LocalTerminalUtilities.LAUNCH_MANAGER;
+ String userHome = System.getProperty("user.home", "/"); //$NON-NLS-1$//$NON-NLS-2$
+ String defaultShell = getDefaultShell().getAbsolutePath();
+ String name = defaultShell.substring(defaultShell.lastIndexOf(File.separator) + 1);
+ Format terminalLaunchName = new MessageFormat(LocalTerminalMessages.newTerminalLaunchName);
+ name = terminalLaunchName.format(new Object[] {name});
+ name = manager.generateLaunchConfigurationName(name);
+ workingCopy = LocalTerminalUtilities.TERMINAL_LAUNCH_TYPE.newInstance(null, name);
+ workingCopy.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, new HashMap(TERM_ANSI));
+ workingCopy.setAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true);
+ workingCopy.setAttribute(ATTR_LOCATION, defaultShell);
+ workingCopy.setAttribute(ATTR_WORKING_DIRECTORY, userHome);
+ workingCopy.setAttribute(ATTR_LOCAL_ECHO, runningOnWindows());
+ return workingCopy;
+ }
+
+ /**
+ * Returns the system's default shell. First, this method will read the value of the environment
+ * variable {@code SHELL}. If that variable is not set, it will default to {@code cmd.exe} on
+ * Windows systems, and to {@code /bin/sh} on all other systems.
+ *
+ * @return a {@link File} pointing to the default shell (the underlying file is not guaranteed
+ * to exist in the file system)
+ */
+ public static File getDefaultShell() {
+
+ String shell = System.getenv("SHELL"); //$NON-NLS-1$
+ if (shell == null) {
+
+ if (runningOnWindows()) {
+
+ shell = "C:\\Windows\\System32\\cmd.exe"; //$NON-NLS-1$
+ }
+ else {
+
+ shell = "/bin/sh"; //$NON-NLS-1$
+ }
+ }
+ return new File(shell);
+ }
+
+ //------------------------------------- PRIVATE SECTION --------------------------------------//
+
+ private static boolean runningOnWindows() {
+
+ return Platform.OS_WIN32.equals(Platform.getOS());
+ }
+
+ private static IStringVariableManager getStringVariableManager() {
+
+ return VariablesPlugin.getDefault().getStringVariableManager();
+ }
+
+ private static String[] parseStringIntoList(String arguments) {
+
+ if (arguments == null || arguments.length() == 0) {
+
+ return EMPTY;
+ }
+ return DebugPlugin.parseArguments(arguments);
+ }
+
+ private static void abort(String text, Throwable exception, int code) throws CoreException {
+
+ Status status;
+ status = new Status(IStatus.ERROR, LocalTerminalActivator.PLUGIN_ID, code, text, exception);
+ throw new CoreException(status);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/LocalTerminalStillRunningListener.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,126 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner 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
+ *
+ * Contributors:
+ * Mirko Raner - [196337] Adapted from org.eclipse.ui.externaltools/ProgramLaunchDelegate
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationType;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalActivator;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalUtilities;
+import org.eclipse.tm.internal.terminal.local.launch.ui.LocalTerminalStillRunningDialog;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchListener;
+import org.eclipse.ui.IWorkbenchWindow;
+
+/**
+ * The class {@link LocalTerminalStillRunningListener} is an {@link IWorkbenchListener} that warns
+ * the user about any terminal launches that are still running when the workbench closes. The user
+ * might want to take specific action to deal with such left-over processes. Typically, this
+ * listener will trigger only on very rare cases because the
+ * {@link org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector} implementation will
+ * terminate left-over launches when the workbench window is closed. However, it is possible that
+ * a terminal launch does not get automatically terminated, for example, if it was started through
+ * an External Tools launch rather than through the terminal.
+ *
+ * The class {@link LocalTerminalStillRunningListener} is inspired by the
+ * ProgramLaunchWindowListener
class inside ProgramLaunchDelegate
in the
+ * org.eclipse.ui.externaltools
plug-in, though it works through a slightly different
+ * mechanism.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalStillRunningListener implements IWorkbenchListener {
+
+ /**
+ * Creates a new {@link LocalTerminalStillRunningListener}.
+ */
+ public LocalTerminalStillRunningListener() {
+
+ super();
+ }
+
+ /**
+ * Gets notified when the workbench is closed and informs the user about any left-over
+ * terminal launches.
+ *
+ * @param workbench the {@link IWorkbench}
+ * @param forced true
if a forced shutdown occurred, false
otherwise
+ * @return true
to allow the workbench to proceed with shutdown, false
+ * to prevent a shutdown (only for non-forced shutdown)
+ */
+ public boolean preShutdown(IWorkbench workbench, boolean forced) {
+
+ if (forced) {
+
+ return true;
+ }
+ IPreferenceStore store = LocalTerminalActivator.getDefault().getPreferenceStore();
+ if (!store.getBoolean(LocalTerminalActivator.PREF_CONFIRM_TERMINATE_ON_SHUTDOWN)) {
+
+ return true;
+ }
+ ILaunchConfigurationType launchType;
+ String launchTypeID = LocalTerminalLaunchDelegate.LAUNCH_CONFIGURATION_TYPE_ID;
+ launchType = LocalTerminalUtilities.LAUNCH_MANAGER.getLaunchConfigurationType(launchTypeID);
+ if (launchType == null) {
+
+ return true;
+ }
+ List notTerminated = new ArrayList();
+ ILaunch launches[] = LocalTerminalUtilities.LAUNCH_MANAGER.getLaunches();
+ ILaunchConfigurationType configurationType;
+ ILaunchConfiguration configuration;
+ for (int launch = 0; launch < launches.length; launch++) {
+
+ try {
+
+ configuration = launches[launch].getLaunchConfiguration();
+ if (configuration == null) {
+
+ continue;
+ }
+ configurationType= configuration.getType();
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ continue;
+ }
+ if (configurationType.equals(launchType) && !launches[launch].isTerminated()) {
+
+ notTerminated.add(launches[launch]);
+ }
+ }
+ if (!notTerminated.isEmpty()) {
+
+ IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+ ILaunch[] launch = (ILaunch[])notTerminated.toArray(new ILaunch[notTerminated.size()]);
+ return LocalTerminalStillRunningDialog.openDialog(window.getShell(), launch);
+ }
+ return true;
+ }
+
+ /**
+ * Not implemented.
+ * @see IWorkbenchListener#postShutdown(IWorkbench)
+ */
+ public void postShutdown(IWorkbench workbench) {
+
+ // Not implemented
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalLaunchTabGroup.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,112 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch.ui;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
+import org.eclipse.debug.ui.CommonTab;
+import org.eclipse.debug.ui.EnvironmentTab;
+import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.debug.ui.ILaunchConfigurationDialog;
+import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+* The class {@link LocalTerminalLaunchTabGroup} defines the tabs for the launch configuration
+* dialog that is used for terminal-based launches. The tab groups consists of the main tab for
+* a standard program launch (lifted from the org.eclipse.ui.externaltools
plug-in), the
+* custom {@link LocalTerminalSettingsTab}, and the {@link EnvironmentTab} and {@link CommonTab},
+* which can be publicly accessed from the org.eclipse.debug.ui
plug-in.
+*
+* @author Mirko Raner
+* @version $Revision: 1.2 $
+**/
+public class LocalTerminalLaunchTabGroup extends AbstractLaunchConfigurationTabGroup {
+
+ private final static String ID = "id"; //$NON-NLS-1$
+ private final static String CLASS = "class"; //$NON-NLS-1$
+ private final static String PROGRAM_TAB_GROUP =
+ "org.eclipse.ui.externaltools.launchConfigurationTabGroup.program"; //$NON-NLS-1$
+
+ /**
+ * Creates a new {@link LocalTerminalLaunchTabGroup}.
+ **/
+ public LocalTerminalLaunchTabGroup() {
+
+ super();
+ }
+
+ /**
+ * Creates the tabs contained in the local terminal launch configuration dialog for the specified
+ * launch mode. The tabs control's are not yet created. This is the first method called in the
+ * life-cycle of a tab group.
+ *
+ * @param dialog the launch configuration dialog this tab group is contained in
+ * @param mode the mode the launch configuration dialog was opened in
+ * @see AbstractLaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
+ **/
+ public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
+
+ ILaunchConfigurationTab main = getMainTab(dialog, mode);
+ ILaunchConfigurationTab terminal = new LocalTerminalSettingsTab();
+ ILaunchConfigurationTab environment = new EnvironmentTab();
+ ILaunchConfigurationTab common = new CommonTab();
+ ILaunchConfigurationTab[] tabs = {main, terminal, environment, common};
+ setTabs(tabs);
+ }
+
+ //-------------------------------------- PRIVATE SECTION -------------------------------------//
+
+ private ILaunchConfigurationTab getMainTab(ILaunchConfigurationDialog dialog, String mode) {
+
+ // Find the main tab for the external program launch in the registry (a direct search is
+ // only possible for extensions that actually declare a unique ID, which most extensions
+ // don't; the search for the "id" attribute of a configuration element has to be done
+ // manually):
+ //
+ IConfigurationElement[] element;
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ final String TAB_GROUPS = IDebugUIConstants.EXTENSION_POINT_LAUNCH_CONFIGURATION_TAB_GROUPS;
+ element = registry.getConfigurationElementsFor(IDebugUIConstants.PLUGIN_ID, TAB_GROUPS);
+ int numberOfElements = element.length;
+ for (int index = 0; index < numberOfElements; index++) {
+
+ if (element[index].getAttribute(ID).equals(PROGRAM_TAB_GROUP)) {
+
+ try {
+
+ ILaunchConfigurationTabGroup tabGroup;
+ Object executable = element[index].createExecutableExtension(CLASS);
+ tabGroup = (ILaunchConfigurationTabGroup)executable;
+ tabGroup.createTabs(dialog, mode);
+
+ // It's not possible to make assumptions about the class name of the program
+ // main tab (without over-stepping API boundaries), but it's usually the very
+ // first tab in the group (which is an assumption that actually also over-steps
+ // API boundaries, but it's the best possible solution, short of copying the
+ // whole source code):
+ //
+ return tabGroup.getTabs()[0];
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ }
+ }
+ }
+ return null;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalSettingsTab.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,282 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch.ui;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.tm.internal.terminal.local.ILocalTerminalSettings;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalMessages;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchDelegate;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalSettingsTab} provides the UI for custom settings that are specific
+ * to terminal-based launches. Currently, the tab allows the user to control the local echo settings
+ * and the line separator string.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ **/
+public class LocalTerminalSettingsTab extends AbstractLaunchConfigurationTab
+implements SelectionListener {
+
+ private final static String NULL = null;
+
+ private Button buttonEcho;
+ private Button buttonCtrlC;
+ private Button separatorDefault;
+ private Button separatorLF;
+ private Button separatorCRLF;
+ private Button separatorCR;
+
+ /**
+ * Creates a new {@link LocalTerminalSettingsTab}.
+ **/
+ public LocalTerminalSettingsTab() {
+
+ super();
+ }
+
+ /**
+ * Creates the top-level control for this launch configuration tab under the given parent
+ * composite. This method is called once on tab creation.
+ *
+ * @param parent the parent {@link Composite}
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
+ **/
+ public void createControl(Composite parent) {
+
+ Composite container = new Composite(parent, SWT.NONE);
+ setControl(container);
+ container.setLayout(new GridLayout());
+ Group composite = new Group(container, SWT.NONE);
+ composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ composite.setText(LocalTerminalMessages.terminalSettings);
+ composite.setLayout(new GridLayout());
+
+ // Create echo check box:
+ //
+ buttonEcho = button(composite, LocalTerminalMessages.enableLocalEcho, SWT.CHECK);
+ buttonEcho.setLayoutData(new GridData());
+
+ // Create Ctrl-C/SIGINT check box:
+ //
+ buttonCtrlC = button(composite, LocalTerminalMessages.sendInterruptOnCtrlC, SWT.CHECK);
+ buttonCtrlC.setLayoutData(new GridData());
+
+ // Create radio buttons for line separator settings:
+ //
+ Composite separator = new Composite(composite, SWT.NONE);
+ RowLayout rowLayout = new RowLayout();
+ rowLayout.wrap = false;
+ separator.setLayout(rowLayout);
+ separatorDefault = button(separator, LocalTerminalMessages.lineSeparatorDefault, SWT.RADIO);
+ separatorLF = button(separator, LocalTerminalMessages.lineSeparatorLF, SWT.RADIO);
+ separatorCRLF = button(separator, LocalTerminalMessages.lineSeparatorCRLF, SWT.RADIO);
+ separatorCR = button(separator, LocalTerminalMessages.lineSeparatorCR, SWT.RADIO);
+ separator.setLayoutData(new GridData());
+ }
+
+ /**
+ * Returns the name of this tab.
+ *
+ * @return the name of this tab
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
+ **/
+ public String getName() {
+
+ return LocalTerminalMessages.terminalTabName;
+ }
+
+ /**
+ * Returns the image for this tab, or null
if none
+ *
+ * @return the image for this tab, or null
if none
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
+ **/
+ public Image getImage() {
+
+ return DebugUITools.getImage(LocalTerminalLaunchDelegate.LAUNCH_CONFIGURATION_TYPE_ID);
+ }
+
+ /**
+ * Initializes this tab's controls with values from the given launch configuration. This method
+ * is called when a configuration is selected to view or edit, after the tab's control has been
+ * created.
+ *
+ * @param configuration the launch configuration
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
+ **/
+ public void initializeFrom(ILaunchConfiguration configuration) {
+
+ boolean echo;
+ try {
+
+ echo = configuration.getAttribute(LocalTerminalLaunchUtilities.ATTR_LOCAL_ECHO, false);
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ echo = false;
+ }
+ boolean ctrlC;
+ try {
+
+ ctrlC = configuration.getAttribute(LocalTerminalLaunchUtilities.ATTR_CTRL_C, false);
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ ctrlC = false;
+ }
+ String ls;
+ try {
+
+ ls = configuration.getAttribute(LocalTerminalLaunchUtilities.ATTR_LINE_SEPARATOR, NULL);
+ }
+ catch (CoreException exception) {
+
+ Logger.logException(exception);
+ ls = null;
+ }
+ buttonEcho.setSelection(echo);
+ buttonCtrlC.setSelection(ctrlC);
+ if (ILocalTerminalSettings.LINE_SEPARATOR_LF.equals(ls)) {
+
+ separatorLF.setSelection(true);
+ }
+ else if (ILocalTerminalSettings.LINE_SEPARATOR_LF.equals(ls)) {
+
+ separatorLF.setSelection(true);
+ }
+ else if (ILocalTerminalSettings.LINE_SEPARATOR_CRLF.equals(ls)) {
+
+ separatorCRLF.setSelection(true);
+ }
+ else if (ILocalTerminalSettings.LINE_SEPARATOR_CR.equals(ls)) {
+
+ separatorCR.setSelection(true);
+ }
+ else {
+
+ separatorDefault.setSelection(true);
+ }
+ }
+
+ /**
+ * Copies values from this tab into the given launch configuration.
+ *
+ * @param configuration the launch configuration
+ * @see AbstractLaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
+ **/
+ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
+
+ boolean echo = buttonEcho.getSelection();
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_LOCAL_ECHO, echo);
+ boolean ctrlC = buttonCtrlC.getSelection();
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_CTRL_C, ctrlC);
+ String lineSeparator = null;
+ if (separatorCRLF.getSelection()) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_CRLF;
+ }
+ else if (separatorCR.getSelection()) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_CR;
+ }
+ else if (separatorLF.getSelection()) {
+
+ lineSeparator = ILocalTerminalSettings.LINE_SEPARATOR_LF;
+ }
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_LINE_SEPARATOR, lineSeparator);
+ }
+
+ /**
+ * Initializes the given launch configuration with default values for this tab. This method is
+ * called when a new launch configuration is created such that the configuration can be
+ * initialized with meaningful values. This method may be called before the tab's control is
+ * created.
+ *
+ * @param configuration the launch configuration
+ * @see AbstractLaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
+ **/
+ public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
+
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_LOCAL_ECHO, false);
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_CTRL_C, false);
+ configuration.setAttribute(LocalTerminalLaunchUtilities.ATTR_LINE_SEPARATOR, NULL);
+ }
+
+ /**
+ * Prevents Terminal launch configurations from being started directly from the launch
+ * configuration dialog. The Run button in the dialog will only be enabled if all tabs
+ * consider a launch configuration valid.
+ *
+ * TODO: previously used launches can still be launched via the launch history
+ * (see {@code ExternalToolMenuDelegate#fillMenu(Menu)})
+ *
+ * @param configuration the {@link ILaunchConfiguration}
+ * @return always {@code false}
+ * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(ILaunchConfiguration)
+ */
+ public boolean isValid(ILaunchConfiguration configuration) {
+
+ return false;
+ }
+
+ /**
+ * Handles selection of any of the buttons in the tab.
+ *
+ * @param event the {@link SelectionEvent}
+ * @see SelectionListener#widgetSelected(SelectionEvent)
+ **/
+ public void widgetSelected(SelectionEvent event) {
+
+ setDirty(true);
+ getLaunchConfigurationDialog().updateButtons();
+ }
+
+ /**
+ * Handles default selection of any of the buttons in the tab.
+ *
+ * @param event the {@link SelectionEvent}
+ * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
+ **/
+ public void widgetDefaultSelected(SelectionEvent event) {
+
+ widgetSelected(event);
+ }
+
+ //-------------------------------------- PRIVATE SECTION -------------------------------------//
+
+ private Button button(Composite parent, String label, int buttonType) {
+
+ Button button = new Button(parent, buttonType);
+ button.addSelectionListener(this);
+ button.setText(label);
+ return button;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/launch/ui/LocalTerminalStillRunningDialog.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,298 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.launch.ui;
+
+import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchesListener2;
+import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalMessages;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalUtilities;
+import org.eclipse.tm.internal.terminal.local.launch.LocalTerminalLaunchUtilities;
+import org.eclipse.tm.internal.terminal.local.process.LocalTerminalProcessRegistry;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
+
+/**
+ * The class {@link LocalTerminalStillRunningDialog} is a dialog that is shown when the workbench is
+ * about to exit and one or more terminal launches are still running. It gives the user a choice
+ * between aborting the workbench shut-down, proceeding, or terminating the outstanding launches
+ * individually. When no more launches are running the dialog will automatically disappear and
+ * workbench shut-down will proceed.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.1 $
+ */
+public class LocalTerminalStillRunningDialog extends MessageDialog
+implements Runnable, SelectionListener, ILaunchesListener2 {
+
+ private final static String TITLE = LocalTerminalMessages.warningTitleTerminalsStillRunning;
+ private final static String MESSAGE = LocalTerminalMessages.warningMessageTerminalsStillRunning;
+ private final static String QUIT_ANYWAY = LocalTerminalMessages.quitWorkbenchAnyway;
+ private final static String DO_NOT_QUIT = LocalTerminalMessages.doNoQuitWorkbench;
+ private final static String[] BUTTONS = {QUIT_ANYWAY, DO_NOT_QUIT};
+ private final static RGB WHITE = new RGB(255, 255, 255);
+ private final static int SCROLLABLE_HEIGHT = 100;
+
+ // Image key copied from IInternalDebugUIConstants:
+ //
+ private final static String IMG_LCL_TERMINATE = "IMG_LCL_TERMINATE"; //$NON-NLS-1$
+
+ private ILaunch[] unterminated;
+ private Composite content;
+
+ private LocalTerminalStillRunningDialog(Shell parentShell, ILaunch[] launches) {
+
+ super(parentShell, TITLE, null, MESSAGE, WARNING, BUTTONS, 0);
+ setShellStyle(SWT.BORDER|SWT.TITLE|SWT.APPLICATION_MODAL|SWT.RESIZE|SWT.MAX);
+ unterminated = launches;
+ }
+
+ /**
+ * Opens a dialog that lists all terminal launches that have not yet terminated.
+ *
+ * @param shell the parent {@link Shell} for the dialog
+ * @param launches the launches that have not yet terminated
+ * @return true
to allow the workbench to proceed with shutdown, false
+ * to prevent a shutdown (only for non-forced shutdown)
+ */
+ public static boolean openDialog(Shell shell, ILaunch[] launches) {
+
+ LocalTerminalStillRunningDialog dialog;
+ dialog = new LocalTerminalStillRunningDialog(shell, launches);
+ dialog.setBlockOnOpen(true);
+ try {
+
+ LocalTerminalUtilities.LAUNCH_MANAGER.addLaunchListener(dialog);
+ return dialog.open() == 0;
+ }
+ finally {
+
+ LocalTerminalUtilities.LAUNCH_MANAGER.removeLaunchListener(dialog);
+ }
+ }
+
+ /**
+ * Creates the dialog buttons and sets the focus on the default button. This is done because
+ * otherwise the focus might land on one of the stop buttons of the unterminated launches, which
+ * looks somewhat funny.
+ *
+ * @param parent the parent {@link Composite}
+ */
+ protected void createButtonsForButtonBar(Composite parent) {
+
+ super.createButtonsForButtonBar(parent);
+ getButton(1).forceFocus();
+ }
+
+ /**
+ * Creates the custom area of the dialog that shows the list of terminal launches that have not
+ * yet been terminated.
+ *
+ * @param parent the parent {@link Composite} into which the custom area is inserted
+ * @return the {@link ScrolledComposite} for the custom area
+ *
+ * @see MessageDialog#createCustomArea(Composite)
+ */
+ protected Control createCustomArea(Composite parent) {
+
+ ScrolledComposite scrollable = new ScrolledComposite(parent, SWT.BORDER|SWT.V_SCROLL);
+ GridData gridData = new GridData(GridData.FILL_BOTH);
+ gridData.heightHint = SCROLLABLE_HEIGHT;
+ scrollable.setLayoutData(gridData);
+ scrollable.setExpandHorizontal(true);
+ scrollable.setExpandVertical(true);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.marginWidth = gridLayout.marginHeight = gridLayout.verticalSpacing = 0;
+ content = new Composite(scrollable, SWT.NONE);
+ content.setLayout(gridLayout);
+ content.setBackground(new Color(parent.getDisplay(), WHITE));
+ scrollable.setContent(content);
+ for (int index = 0; index < unterminated.length; index++) {
+
+ Composite item = createItem(content, unterminated[index]);
+ item.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ }
+ content.pack();
+ scrollable.setMinHeight(content.getBounds().height);
+ return scrollable;
+ }
+
+ /**
+ * Handles the {@link SelectionEvent}s that are sent when the user clicks the stop button of a
+ * launch. The stop button will immediately be disabled to indicate that the stop request is
+ * being processed. The actual launch termination will be confirmed in an asynchronous fashion
+ * by the {@link #launchesTerminated(ILaunch[])} method.
+ *
+ * @param event the {@link SelectionEvent}
+ *
+ * @see #launchesTerminated(ILaunch[])
+ */
+ public void widgetSelected(SelectionEvent event) {
+
+ ToolItem item = (ToolItem)event.widget;
+ ILaunch launch = (ILaunch)item.getParent().getParent().getData();
+ item.setEnabled(false);
+ try {
+
+ LocalTerminalProcessRegistry.addProcessBackToFinishedLaunch(launch);
+ launch.terminate();
+ }
+ catch (DebugException exception) {
+
+ Logger.logException(exception);
+ }
+ }
+
+ /**
+ * Handles default selection events by passing them to {@link #widgetSelected(SelectionEvent)}.
+ *
+ * @param event the {@link SelectionEvent}
+ *
+ * @see #widgetSelected(SelectionEvent)
+ * @see SelectionListener#widgetSelected(SelectionEvent)
+ */
+ public void widgetDefaultSelected(SelectionEvent event) {
+
+ widgetSelected(event);
+ }
+
+ /**
+ * Removes terminated launches from the list displayed by the dialog and closes the dialog once
+ * all outstanding launches have been terminated.
+ *
+ * @see #launchesTerminated(ILaunch[])
+ */
+ public void run() {
+
+ boolean allLaunchesTerminated = true;
+ Control[] child = content.getChildren();
+ int numberOfChildren = child.length;
+ for (int number = 0; number < numberOfChildren; number++) {
+
+ ILaunch launch = (ILaunch)child[number].getData();
+ if (launch != null && launch.isTerminated()) {
+
+ child[number].setData(null);
+ String exitValue;
+ try {
+
+ exitValue = String.valueOf(launch.getProcesses()[0].getExitValue());
+ }
+ catch (DebugException couldNotGetExitValue) {
+
+ exitValue = '(' + couldNotGetExitValue.getMessage() + ')';
+ }
+ Label label = (Label)((Composite)child[number]).getChildren()[1];
+ String process = label.getText();
+ process = NLS.bind(LocalTerminalMessages.terminatedProcess, process, exitValue);
+ label.setText(process);
+
+ // In case the launch terminated by itself (and not because the user pressed the
+ // stop button) disable the stop button so that no attempt can be made to stop the
+ // process twice:
+ //
+ ((Composite)child[number]).getChildren()[2].setEnabled(false);
+ }
+ if (child[number].getData() != null) {
+
+ allLaunchesTerminated = false;
+ }
+ }
+ if (allLaunchesTerminated) {
+
+ setReturnCode(0);
+ close();
+ }
+ }
+
+ /**
+ * Removes a recently terminated launch from the list displayed by the dialog. The actual work
+ * needs to be done in the UI thread and is performed by the {@link #run()} method.
+ *
+ * @param terminated a list of terminated launches
+ *
+ * @see #run()
+ */
+ public void launchesTerminated(ILaunch[] terminated) {
+
+ Display.getDefault().syncExec(this);
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesAdded(ILaunch[])
+ */
+ public void launchesAdded(ILaunch[] launches) {
+
+ // Not implemented...
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesChanged(ILaunch[])
+ */
+ public void launchesChanged(ILaunch[] launches) {
+
+ // Not implemented...
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesRemoved(ILaunch[])
+ */
+ public void launchesRemoved(ILaunch[] launches) {
+
+ // Not implemented...
+ }
+
+ //-------------------------------------- PRIVATE SECTION -------------------------------------//
+
+ private Composite createItem(Composite parent, ILaunch launch) {
+
+ Composite item = new Composite(parent, SWT.NULL);
+ GridLayout gridLayout = new GridLayout(3, false);
+ item.setData(launch);
+ item.setLayout(gridLayout);
+ Image processImage = LocalTerminalLaunchUtilities.getImage(launch.getLaunchConfiguration());
+ Label icon = new Label(item, SWT.NULL);
+ icon.setImage(processImage);
+ Label label = new Label(item, SWT.NULL);
+ label.setText(launch.getLaunchConfiguration().getName());
+ ToolItem stopButton = new ToolItem(new ToolBar(item, SWT.FLAT), SWT.PUSH);
+ stopButton.addSelectionListener(this);
+ Image deleteImage = DebugUITools.getImage(IMG_LCL_TERMINATE);
+ stopButton.setImage(deleteImage);
+ GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ gridData.verticalAlignment = GridData.CENTER;
+ gridData.grabExcessHorizontalSpace = true;
+ label.setLayoutData(gridData);
+ return item;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcess.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,190 @@
+/***************************************************************************************************
+ * Copyright (c) 2008, 2010 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ * Mirko Raner - [314607] Launching a terminal also pops up the console view
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.process;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.eclipse.cdt.utils.pty.PTY;
+import org.eclipse.cdt.utils.spawner.Spawner;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.core.model.IStreamsProxy;
+import org.eclipse.debug.core.model.RuntimeProcess;
+
+/**
+ * The class {@link LocalTerminalProcess} is a customized {@link RuntimeProcess} for use by the
+ * {@link org.eclipse.tm.internal.terminal.local.LocalTerminalConnector}. It serves the purpose of
+ * preventing the {@link org.eclipse.debug.internal.ui.DebugUIPlugin DebugUIPlugin}'s
+ * {@link org.eclipse.debug.internal.ui.views.console.ProcessConsoleManager ProcessConsoleManager}
+ * from allocating a Console view in addition to the Terminal view that serves as the program's main
+ * I/O device.
+ * Unfortunately, the Process Console Manager determines the need for a Console view by checking the
+ * {@link IStreamsProxy} of the process for null
. If the process has a non-null
+ * {@link IStreamsProxy} a console will be automatically allocated. This is problematic because
+ * the Local Terminal Connector requires an {@link IStreamsProxy} but obviously not an additional
+ * console view. It would have been better if the Process Console Manager would check the
+ * corresponding attributes in the launch configuration rather than checking the
+ * {@link IStreamsProxy} of the process. The work-around for now is to remove the underlying
+ * process from the launch. No console will be allocated for a launch that doesn't have a process
+ * associated with it. Consequently, a currently running terminal launch will appear in the Debug
+ * view's list of active launches but the view will not show any child elements (and the element
+ * cannot be expanded, either). The {@link LocalTerminalProcessRegistry} keeps track of which
+ * {@link LocalTerminalProcess} is associated with a particular launch. Client code that needs to
+ * find the process of a launch can obtain it through that registry.
+ * However, for a launch to be properly terminated it needs to have at least one process that can
+ * be terminated. Launches that do not have any processes associated with them are not considered
+ * terminated and actually terminating them is not possible. To work around this secondary issue,
+ * the process is added back to its launch just before the launch is terminated. This activity is
+ * performed by {@link LocalTerminalProcessRegistry#addProcessBackToFinishedLaunch(ILaunch)}. To
+ * prevent a console allocation during this last step, the {@link #resetStreamsProxy()} method will
+ * be invoked, which will cause subsequent calls to {@link IProcess#getStreamsProxy()} to return
+ * null
. After the launch is terminated it will appear in the Debug view with the
+ * terminated process as its child element. The exit value of the terminal process can also be seen
+ * in that view.
+ * {@link #getStreamsProxy()} will also return null
during initialization of a
+ * {@link LocalTerminalProcess} object until after the
+ * {@link RuntimeProcess#RuntimeProcess(ILaunch, Process, String, Map) super constructor} invocation
+ * has been completed. This disables a code path that caused a Console view to pop up when the
+ * {@link org.eclipse.debug.core.model.IStreamMonitor IStreamMonitor} already contained data (like,
+ * for example, a shell's initial prompt) when the ProcessConsoleManager
received an
+ * {@link org.eclipse.debug.core.ILaunchListener#launchChanged(ILaunch)} notification (which cannot
+ * be avoided). See https://bugs.eclipse.org/314607
+ * for additional details.
+ *
+ * This solution for preventing standard consoles from being opened does certainly not deserve the
+ * cleanliness award for straightforward coding, but at least it doesn't rely on internal API at
+ * this point. Ideally, the whole issue should be resolved with some sort of console renderer
+ * extension point as proposed in bug 242373 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=242373).
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public final class LocalTerminalProcess extends RuntimeProcess {
+
+ /**
+ * The process type ID of processes produced by this factory.
+ */
+ public final static String PROCESS_TYPE = "org.eclipse.tm.terminal.localProcess"; //$NON-NLS-1$
+
+ private boolean enableStreamsProxy;
+ private boolean resetStreamsProxy;
+ private PTY pty;
+
+ /**
+ * Creates a new {@link LocalTerminalProcess}.
+ *
+ * @param launch the current {@link ILaunch}
+ * @param process the underlying low-level {@link Process}
+ * @param name the process name
+ * @param attributes additional attributes of the process
+ */
+ protected LocalTerminalProcess(ILaunch launch, Process process, String name, Map attributes) {
+
+ super(launch, process, name, setProcessType(attributes));
+ enableStreamsProxy = true;
+ LocalTerminalProcessRegistry.registerWithLaunch(launch, this);
+ launch.removeProcess(this);
+ }
+
+ /**
+ * Sends a SIGINT
signal to the underlying system {@link Process}. This is roughly
+ * equivalent to the user pressing Ctrl-C.
+ *
+ * @return true
if the interrupt signal was sent successfully; false
+ * if the signal was not sent successfully or if no signal was sent because the underlying
+ * process is not a CDT {@link Spawner}
+ */
+ public boolean interrupt() {
+
+ Process process = getSystemProcess();
+ if (process instanceof Spawner) {
+
+ return ((Spawner)process).interrupt() == 0;
+ }
+ return false;
+ }
+
+ /**
+ * Returns the {@link IStreamsProxy} of the process.
+ *
+ * @return the original result of {@link RuntimeProcess#getStreamsProxy()}, or null
+ * after {@link #resetStreamsProxy()} has been called.
+ */
+ public IStreamsProxy getStreamsProxy() {
+
+ if (resetStreamsProxy || !enableStreamsProxy) {
+
+ return null;
+ }
+ return super.getStreamsProxy();
+ }
+
+ /**
+ * Resets the {@link IStreamsProxy} of this process. After calling this method,
+ * {@link #getStreamsProxy()} will always return null
.
+ */
+ protected void resetStreamsProxy() {
+
+ resetStreamsProxy = true;
+ }
+
+ /**
+ * Sets the pseudo-terminal associated with this process.
+ *
+ * @param pty the {@link PTY}
+ */
+ public void setPTY(PTY pty) {
+
+ this.pty = pty;
+ }
+
+ /**
+ * Gets the pseudo-terminal associated with this process.
+ *
+ * @return the {@link PTY}
+ */
+ public PTY getPTY() {
+
+ return pty;
+ }
+
+ /**
+ * Re-attaches the process to its launch and completes termination of the process. This ensures
+ * that the launch can properly terminate.
+ *
+ * @see RuntimeProcess#terminated()
+ */
+ protected void terminated() {
+
+ LocalTerminalProcessRegistry.addProcessBackToFinishedLaunch(getLaunch());
+ super.terminated();
+ }
+
+ //------------------------------------- PRIVATE SECTION --------------------------------------//
+
+ private static Map setProcessType(Map attributes) {
+
+ // The process type used to be set by the LocalTerminalProcessFactory. However, if some
+ // client code managed to instantiate a LocalTerminalProcess directly (instead of going
+ // through the factory) this would result in IProcess objects with an incorrect process type
+ // attribute. A better solution is to set the process type attribute at the time when the
+ // LocalTerminalProcess object is actually created:
+ //
+ if (attributes == null) {
+
+ attributes = new HashMap(1);
+ }
+ attributes.put(IProcess.ATTR_PROCESS_TYPE, PROCESS_TYPE);
+ return attributes;
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessFactory.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,40 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.process;
+
+import java.util.Map;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.IProcessFactory;
+import org.eclipse.debug.core.model.IProcess;
+
+/**
+ * The class {@link LocalTerminalProcessFactory} is an {@link IProcessFactory} that produces
+ * {@link LocalTerminalProcess} objects.
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.2 $
+ */
+public class LocalTerminalProcessFactory implements IProcessFactory {
+
+ /**
+ * The ID of this factory (as used in plugin.xml
).
+ */
+ public final static String ID = "org.eclipse.tm.terminal.localProcess.factory"; //$NON-NLS-1$
+
+ /**
+ * @see IProcessFactory#newProcess(ILaunch, Process, String, Map)
+ */
+ public IProcess newProcess(ILaunch launch, Process process, String label, Map attributes) {
+
+ return new LocalTerminalProcess(launch, process, label, attributes);
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/process/LocalTerminalProcessRegistry.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,158 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.process;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchesListener2;
+import org.eclipse.tm.internal.terminal.local.LocalTerminalUtilities;
+
+/**
+ * The {@link LocalTerminalProcessRegistry} keeps a map between {@link ILaunch} objects and the
+ * {@link LocalTerminalProcess} objects that were associated with them. To prevent standard consoles
+ * from being opened, a {@link LocalTerminalProcess} is immediately removed from its {@link ILaunch}
+ * when the process is created (see {@link LocalTerminalProcess} for details).
+ * {@link LocalTerminalProcessRegistry} is a singleton (without lazy initialization).
+ *
+ * @author mirko
+ * @version $Revision: 1.1 $
+ */
+public class LocalTerminalProcessRegistry implements ILaunchesListener2 {
+
+ private final static LocalTerminalProcessRegistry INSTANCE = new LocalTerminalProcessRegistry();
+
+ private Map processes;
+
+ private LocalTerminalProcessRegistry() {
+
+ // The ILaunch interface does not make any statements about the suitability of implementing
+ // objects as hash keys. There might be ILaunch implementations that return a different
+ // hash code value if the object changes internally. To be safe in those cases, an
+ // IdentityHashMap is used:
+ //
+ processes = new IdentityHashMap();
+ }
+
+ /**
+ * Gets the {@link LocalTerminalProcess} that was originally associated with a given
+ * {@link ILaunch} object.
+ *
+ * @param launch the {@link ILaunch} that was used for creating the process
+ * @return the corresponding {@link LocalTerminalProcess}, or null
if no process
+ * could be found
+ */
+ public static LocalTerminalProcess getFromLaunch(ILaunch launch) {
+
+ return (LocalTerminalProcess)INSTANCE.processes.get(launch);
+ }
+
+ /**
+ * Adds a {@link LocalTerminalProcess} object back to its original {@link ILaunch}. This method
+ * will also perform a {@link LocalTerminalProcess#resetStreamsProxy()} on the process.
+ * The {@link #addProcessBackToFinishedLaunch(ILaunch)} method is necessary for properly
+ * terminating the launch of a terminal application (see {@link LocalTerminalProcess} for
+ * details).
+ *
+ * @param launch the {@link ILaunch} whose original process is to be re-attached
+ */
+ public static void addProcessBackToFinishedLaunch(ILaunch launch) {
+
+ LocalTerminalProcess process = getFromLaunch(launch);
+ if (process == null) {
+
+ // Maybe the process wasn't actually started in a terminal (can happen when a Terminal
+ // is launched from the External Tools menu):
+ //
+ return;
+ }
+ process.resetStreamsProxy();
+ if (launch.getProcesses().length == 0) {
+
+ launch.addProcess(process);
+ }
+ }
+
+ /**
+ * Registers a {@link LocalTerminalProcess} with a given {@link ILaunch} so that the process can
+ * be safely removed from the launch.
+ *
+ * @param launch the {@link ILaunch}
+ * @param process the {@link LocalTerminalProcess} originally associated with that launch
+ */
+ public static void registerWithLaunch(ILaunch launch, LocalTerminalProcess process) {
+
+ synchronized (INSTANCE) {
+
+ if (INSTANCE.processes.isEmpty()) {
+
+ // Start listening to terminated launches as soon as the first launch/process pair
+ // is registered:
+ //
+ LocalTerminalUtilities.LAUNCH_MANAGER.addLaunchListener(INSTANCE);
+ }
+ INSTANCE.processes.put(launch, process);
+ }
+ }
+
+ /**
+ * Handles the termination of launches. The {@link LocalTerminalProcessRegistry} acts as a
+ * {@link ILaunchesListener2} if there are monitored launches outstanding. It will automatically
+ * de-register itself (as a listener) when the last monitored launch was terminated.
+ *
+ * @param terminated the launches that were terminated
+ */
+ public void launchesTerminated(ILaunch[] terminated) {
+
+ synchronized (INSTANCE) {
+
+ int numberOfTerminatedLaunches = terminated.length;
+ for (int launch = 0; launch < numberOfTerminatedLaunches; launch++) {
+
+ INSTANCE.processes.remove(terminated[launch]);
+ }
+ if (INSTANCE.processes.isEmpty()) {
+
+ // If there are no more outstanding launches the listener can be removed again:
+ //
+ LocalTerminalUtilities.LAUNCH_MANAGER.removeLaunchListener(INSTANCE);
+ }
+ }
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesAdded(ILaunch[])
+ */
+ public void launchesAdded(ILaunch[] launches) {
+
+ // Not implemented.
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesRemoved(ILaunch[])
+ */
+ public void launchesRemoved(ILaunch[] launches) {
+
+ // Not implemented.
+ }
+
+ /**
+ * Not implemented.
+ * @see ILaunchesListener2#launchesChanged(ILaunch[])
+ */
+ public void launchesChanged(ILaunch[] launches) {
+
+ // Not implemented.
+ }
+}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/src/org/eclipse/tm/internal/terminal/local/ui/DependentHeightComposite.java 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,88 @@
+/***************************************************************************************************
+ * Copyright (c) 2008 Mirko Raner.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mirko Raner - initial implementation for Eclipse Bug 196337
+ **************************************************************************************************/
+
+package org.eclipse.tm.internal.terminal.local.ui;
+
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * The class {@link DependentHeightComposite} is a special kind of SWT {@link Composite} whose
+ * height depends on the height of some master {@link Composite} that does not have to be a direct
+ * parent or child of it. This class was introduced as a work-around for UI resizing problems with
+ * the Terminal API's PageBook class (which uses a StackLayout).
+ *
+ * @author Mirko Raner
+ * @version $Revision: 1.1 $
+ */
+public class DependentHeightComposite extends Composite implements ControlListener {
+
+ private Composite master;
+ private int preferredHeight = -1;
+ private int extraHeight;
+
+ /**
+ * Creates a new {@link DependentHeightComposite}.
+ *
+ * @param parent the parent {@link Composite}
+ * @param style the SWT style
+ * @param master the master {@link Composite} that determines the height
+ * @param extra the additional height in pixels (may be negative, to create a smaller height
+ * than the master {@link Composite})
+ */
+ public DependentHeightComposite(Composite parent, int style, Composite master, int extra) {
+
+ super(parent, style);
+ this.master = master;
+ this.extraHeight = extra;
+ master.addControlListener(this);
+ }
+
+ /**
+ * This method does nothing.
+ *
+ * @see ControlListener#controlMoved(ControlEvent)
+ */
+ public void controlMoved(ControlEvent event) {
+
+ // Does nothing...
+ }
+
+ /**
+ * Adjusts the {@link DependentHeightComposite} height if the master {@link Composite}'s size
+ * changed.
+ *
+ * @param event the {@link ControlEvent}
+ */
+ public void controlResized(ControlEvent event) {
+
+ setSize(getSize().x, master.getClientArea().height+extraHeight);
+ preferredHeight = master.getClientArea().height+extraHeight;
+ master.layout();
+ }
+
+ /**
+ * Computes the preferred size of this {@link DependentHeightComposite}.
+ *
+ * @see Composite#computeSize(int, int, boolean)
+ */
+ public Point computeSize(int widthHint, int heightHint, boolean changed) {
+
+ Point size = super.computeSize(widthHint, heightHint, changed);
+ if (preferredHeight != -1) {
+
+ size.y = preferredHeight;
+ }
+ return size;
+ }
+}
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.local/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.local/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/.project eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/.project 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/.project 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,17 @@
+
+
+ org.eclipse.tm.terminal.local-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/build.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,17 @@
+####################################################################################################
+# Copyright (c) 2008, 2011 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ license.html,\
+ eclipse_update_120.jpg
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/eclipse_update_120.jpg differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/epl-v10.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/epl-v10.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/epl-v10.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/epl-v10.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+Eclipse Public License - Version 1.0
+
+
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,170 @@
+####################################################################################################
+# Copyright (c) 2008, 2012 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Local Terminal (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse TM Project
+
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 3.4 Updates
+
+# "description" property - description of the feature
+description=A terminal emulation for local shells and external tools.\n\
+Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2008, 2012 Mirko Raner and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,57 @@
+
+
+
+
+
+ %description
+
+
+
+ %copyright
+
+
+
+ %license
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/license.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,108 @@
+
+
+
+
+
+Eclipse Foundation Software User Agreement
+
+
+
+Eclipse Foundation Software User Agreement
+February 1, 2011
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+ For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
+
+ - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.local
+ 0.2.200.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/.project eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/.project
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/.project 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/.project 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,17 @@
+
+
+ org.eclipse.tm.terminal.local.sdk-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/build.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,18 @@
+####################################################################################################
+# Copyright (c) 2008, 2011 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+
+bin.includes = feature.xml,\
+ feature.properties,\
+ epl-v10.html,\
+ license.html,\
+ eclipse_update_120.jpg
+generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/eclipse_update_120.jpg differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/epl-v10.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+Eclipse Public License - Version 1.0
+
+
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes
+the Program.
+
+"Licensed Patents" mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance
+with this Agreement.
+
+"Recipient" means anyone who receives the Program under
+this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.
+
+b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.
+
+c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this
+Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and
+
+iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each
+copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained
+within the Program.
+
+Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and
+indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses")
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.
+
+
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/feature.properties 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,171 @@
+####################################################################################################
+# Copyright (c) 2008, 2012 Mirko Raner 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
+#
+# Contributors:
+# Mirko Raner - initial implementation for Eclipse Bug 196337
+# Martin Oberhuber (Wind River) - Import to Eclipse TM
+####################################################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Local Terminal SDK (Incubation)
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse TM Project
+
+# "tmUpdateSiteName" property - label for the update site
+tmUpdateSiteName=Target Management 3.4 Updates
+
+# "description" property - description of the feature
+description=A terminal emulation for local shells and external tools.\n\
+Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac. Includes Source,\
+and the Terminal View required to drive the plugin.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2008, 2012 Mirko Raner and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/feature.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,64 @@
+
+
+
+
+
+ %description
+
+
+
+ %copyright
+
+
+
+ %license
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/license.html 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,108 @@
+
+
+
+
+
+Eclipse Foundation Software User Agreement
+
+
+
+Eclipse Foundation Software User Agreement
+February 1, 2011
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+ For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
+
+ - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
+The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.local.sdk-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.local.sdk-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.local.sdk
+ 0.3.1.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/feature.properties 2009-05-13 22:22:51.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -22,14 +22,14 @@
plug-ins for Serial, SSH and Telnet connections. Includes Source Code.
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -43,8 +43,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -52,42 +52,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -96,47 +92,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/feature.xml 2009-11-05 17:37:50.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,8 +1,19 @@
-
+
+
@@ -19,8 +30,8 @@
-
-
+
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/license.html 2007-06-04 16:09:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.sdk-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.sdk-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.sdk
+ 3.3.2.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/.cvsignore 2007-02-08 23:50:32.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF 2009-02-01 15:15:25.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 2.1.200.qualifier
Bundle-Localization: plugin
Import-Package: gnu.io;resolution:=optional
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)"
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Eclipse-BuddyPolicy: ext
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/README.txt eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/README.txt
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/README.txt 2008-07-09 14:46:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/README.txt 2013-02-12 20:26:45.000000000 +0000
@@ -3,7 +3,7 @@
This README is for terminal.serial version 1.0.0 and later, corresponding
to RSE downloads after 2.0M4. Instructions for previous versions (using
Sun javacomm / javax.comm package instead of gnu.io) are still available from
-http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?root=DSDP_Project&view=markup&pathrev=R1_0_1
+http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?root=Tools_Project&view=markup&pathrev=R1_0_1
Prerequisites:
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/about.ini 2009-05-13 22:22:35.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/about.properties 2009-02-01 15:15:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/build.properties 2009-05-13 22:43:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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
@@ -22,6 +22,6 @@
plugin.properties,\
README.txt,\
about.html,about.ini,about.mappings,about.properties,\
- dsdp32.png
+ tm32.png
src.includes = README.txt,\
about.html
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/plugin.properties 2009-05-13 22:43:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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,5 +15,5 @@
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
###############################################################################
pluginName = Target Management Terminal Serial Connector
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
serialConnection = Serial
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal.serial
+ 2.1.200.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java 2008-07-15 22:40:47.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/SerialSettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2013 Wind River Systems, Inc. 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
@@ -21,15 +21,19 @@
import java.util.List;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
-public class SerialSettingsPage implements ISettingsPage {
+public class SerialSettingsPage extends AbstractSettingsPage {
private Combo fSerialPortCombo;
private Combo fBaudRateCombo;
private Combo fDataBitsCombo;
@@ -137,6 +141,11 @@
new Label(composite, SWT.RIGHT).setText(SerialMessages.TIMEOUT + ":"); //$NON-NLS-1$
fTimeout = new Text(composite, SWT.BORDER);
fTimeout.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ fTimeout.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(fTimeout);
+ }
+ });
loadSettings();
}
@@ -148,8 +157,20 @@
int flags=SWT.DROP_DOWN;
if(readonly)
flags|=SWT.READ_ONLY;
- Combo combo = new Combo(composite, flags);
+ final Combo combo = new Combo(composite, flags);
combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ if (!readonly) {
+ combo.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(combo);
+ }
+ });
+ }
+ combo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ fireListeners(combo);
+ }
+ });
return combo;
}
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/feature.properties 2009-05-13 22:22:18.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Serial Connector
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/feature.xml 2009-05-13 22:43:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,8 +1,18 @@
-
+
+
@@ -18,14 +28,14 @@
-
-
+
+
-
+
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.serial
+ 2.1.200.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties 2009-05-13 22:22:20.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Serial Connector Source
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=A serial line connector for the Terminal using RXTX API
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html 2007-06-04 16:09:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplateFeature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:22:19.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:14:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties 2009-05-13 22:43:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -8,5 +8,5 @@
# Contributors:
# Martin Oberhuber - initial API and implementation
################################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/
sourcePlugin = true
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:43:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@
# Martin Oberhuber - initial API and implementation
################################################################################
pluginName=Target Management Terminal Serial Connector Source
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.serial-feature/sourceTemplatePlugin/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/.cvsignore 2007-02-08 23:50:36.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF 2009-02-01 15:15:18.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 2.1.200.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
+ org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)",
com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)",
org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/about.ini 2009-05-13 22:23:13.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/about.properties 2009-02-01 15:15:18.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2000, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/build.properties 2009-05-13 22:43:47.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -16,5 +16,5 @@
plugin.xml,\
plugin.properties,\
about.html,about.ini,about.mappings,about.properties,\
- dsdp32.png
+ tm32.png
src.includes = about.html
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/plugin.properties 2009-05-13 22:43:47.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,5 +9,5 @@
# Martin Oberhuber (Wind River) - initial API and implementation
###############################################################################
pluginName = Target Management Terminal SSH Connector
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
sshConnection = SSH
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal.ssh
+ 2.1.200.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java 2008-03-12 12:07:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2010 Wind River Systems, Inc. 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
@@ -10,6 +10,7 @@
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Mikhail Kalugin - [201867] Improve Terminal SSH connection summary string
* Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives
+ * Bryan Hunt - [313991] cannot programatically pass password to SshConnector
*******************************************************************************/
package org.eclipse.tm.internal.terminal.ssh;
@@ -41,6 +42,10 @@
public void load(ISettingsStore store) {
fHost = store.get("Host");//$NON-NLS-1$
fUser = store.get("User");//$NON-NLS-1$
+ // ISettingsStore providers have to make sure that
+ // the password is not saved in some as plain text
+ // on disk. [bug 313991]
+ fPassword = store.get("Password");//$NON-NLS-1$
fPort = store.get("Port");//$NON-NLS-1$
fTimeout = store.get("Timeout");//$NON-NLS-1$
fKeepalive = store.get("Keepalive");//$NON-NLS-1$
@@ -51,6 +56,9 @@
store.put("Host", fHost);//$NON-NLS-1$
store.put("User", fUser);//$NON-NLS-1$
store.put("Port", fPort);//$NON-NLS-1$
+ // We do *not* store the password in the settings because
+ // this can cause the password to be stored as plain text
+ // in some settings file
store.put("Timeout", fTimeout);//$NON-NLS-1$
store.put("Keepalive", fKeepalive);//$NON-NLS-1$
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java 2008-07-15 22:40:34.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2013 Wind River Systems, Inc. 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
@@ -13,15 +13,19 @@
*******************************************************************************/
package org.eclipse.tm.internal.terminal.ssh;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
-public class SshSettingsPage implements ISettingsPage {
+public class SshSettingsPage extends AbstractSettingsPage {
private Text fHostText;
private Text fUser;
private Text fTimeout;
@@ -58,34 +62,76 @@
return value;
}
public boolean validateSettings() {
+ String message = null;
+ int messageType = IMessageProvider.NONE;
+ boolean valid = true;
+
if (fHostText.getText().trim().length() == 0) {
- return false;
+ String m = "Please enter a host IP or name."; //$NON-NLS-1$
+ int mt = IMessageProvider.INFORMATION;
+ updateControlDecoration(fHostText, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fHostText, null, IMessageProvider.NONE);
}
if (fUser.getText().trim().length() == 0) {
- return false;
+ String m = "Please enter a username."; //$NON-NLS-1$
+ int mt = IMessageProvider.INFORMATION;
+ updateControlDecoration(fUser, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fUser, null, IMessageProvider.NONE);
}
try {
int p = Integer.parseInt(fPort.getText().trim());
if (p <= 0 || p > 65535) {
- return false;
+ String m = "Invalid network port. Must be between 0 and 65535."; //$NON-NLS-1$
+ int mt = IMessageProvider.ERROR;
+ updateControlDecoration(fPort, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fPort, null, IMessageProvider.NONE);
}
p = Integer.parseInt(fTimeout.getText().trim());
if (p < 0) {
- return false;
+ String m = "Invalid timeout. Must be greater than 0."; //$NON-NLS-1$
+ int mt = IMessageProvider.ERROR;
+ updateControlDecoration(fTimeout, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fTimeout, null, IMessageProvider.NONE);
}
p = Integer.parseInt(fKeepalive.getText().trim());
if (p < 0) {
- return false;
+ String m = "Invalid keep alive. Must be greater than 0."; //$NON-NLS-1$
+ int mt = IMessageProvider.ERROR;
+ updateControlDecoration(fKeepalive, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fKeepalive, null, IMessageProvider.NONE);
}
} catch (Exception e) {
- return false;
+ valid = false;
}
- return true;
+
+ setMessage(message, messageType);
+ return valid;
}
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
GridLayout gridLayout = new GridLayout(2, false);
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
composite.setLayout(gridLayout);
composite.setLayoutData(gridData);
@@ -107,8 +153,14 @@
// Add control
gridData = new GridData(GridData.FILL_HORIZONTAL);
- Text text= new Text(composite, SWT.BORDER | textOptions);
+ final Text text= new Text(composite, SWT.BORDER | textOptions);
text.setLayoutData(gridData);
+ text.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(text);
+ }
+ });
+ createControlDecoration(text);
return text;
}
private Text createTextField(Composite composite, String labelTxt) {
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/feature.properties 2009-05-13 22:21:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal SSH Connector
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=An SSH connector implementation for the Terminal.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2000, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/feature.xml 2009-07-10 12:45:34.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,6 @@
-
-
@@ -28,14 +28,14 @@
-
-
+
+
-
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/license.html 2007-06-04 16:09:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.ssh
+ 2.1.200.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties 2009-05-13 22:21:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal SSH Connector Source
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=An SSH connector implementation for the Terminal.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2000, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2000, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html 2007-06-04 16:09:27.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplateFeature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:21:22.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:14:26.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2000, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties 2009-05-13 22:43:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -8,5 +8,5 @@
# Contributors:
# Martin Oberhuber - initial API and implementation
################################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/
sourcePlugin = true
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:43:10.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@
# Martin Oberhuber - initial API and implementation
################################################################################
pluginName=Target Management Terminal SSH Connector Source
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/.cvsignore 2007-06-05 12:48:23.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF 2009-07-09 16:47:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.telnet;singleton:=true
-Bundle-Version: 2.0.101.qualifier
+Bundle-Version: 2.1.200.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)"
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/about.ini 2009-05-13 22:20:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/about.properties 2009-02-01 15:15:21.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/build.properties 2009-05-13 22:43:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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
@@ -19,9 +19,12 @@
plugin.xml,\
plugin.properties,\
about.html,about.ini,about.mappings,about.properties,\
- dsdp32.png
+ tm32.png
source.. = src/
output.. = bin/
src.includes = about.html
+javacTarget = 1.4
+javacSource = 1.4
+javacErrors.. = -assertIdentifier
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/plugin.properties 2009-05-13 22:43:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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,5 +15,5 @@
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
###############################################################################
pluginName = Target Management Terminal Telnet Connector
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
telnetConnection = Telnet
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal.telnet
+ 2.1.200.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java 2009-08-19 09:51:41.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetConnection.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2005, 2011 Wind River Systems, Inc. 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
@@ -14,6 +14,7 @@
* Michael Scharf (Wind River) - [209665] Add ability to log byte streams from terminal
* Alex Panchenko (Xored) - [277061] TelnetConnection.isConnected() should check if socket was not closed
* Uwe Stieber (Wind River) - [281329] Telnet connection not handling "SocketException: Connection reset" correct
+ * Nils Hagge (Siemens AG) - [276023] close socket streams after connection is disconnected
*******************************************************************************/
package org.eclipse.tm.internal.terminal.telnet;
@@ -336,11 +337,13 @@
Logger.logException(ex);
}
- // Tell the ITerminalControl object that the connection is
- // closed.
- terminalControl.setState(TerminalState.CLOSED);
} catch (Exception ex) {
Logger.logException(ex);
+ } finally {
+ // Tell the ITerminalControl object that the connection is closed.
+ terminalControl.setState(TerminalState.CLOSED);
+ try { inputStream.close(); } catch(IOException ioe) { /*ignore*/ }
+ try { outputStream.close(); } catch(IOException ioe) { /*ignore*/ }
}
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java 2008-07-15 22:40:40.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/src/org/eclipse/tm/internal/terminal/telnet/TelnetSettingsPage.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2013 Wind River Systems, Inc. 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
@@ -21,16 +21,22 @@
import java.util.Iterator;
import java.util.List;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.tm.internal.terminal.provisional.api.ISettingsPage;
+import org.eclipse.tm.internal.terminal.provisional.api.AbstractSettingsPage;
-public class TelnetSettingsPage implements ISettingsPage {
+public class TelnetSettingsPage extends AbstractSettingsPage {
private Text fHostText;
private Combo fNetworkPortCombo;
private Text fTimeout;
@@ -89,28 +95,59 @@
}
public boolean validateSettings() {
+ String message = null;
+ int messageType = IMessageProvider.NONE;
+ boolean valid = true;
+
if (fHostText.getText().trim().length() == 0) {
- return false;
+ String m = "Please enter a host IP or name."; //$NON-NLS-1$
+ int mt = IMessageProvider.INFORMATION;
+ updateControlDecoration(fHostText, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fHostText, null, IMessageProvider.NONE);
}
+
try {
int p = Integer.parseInt(getNetworkPort().trim());
if (p <= 0 || p > 65535) {
- return false;
+ String m = "Invalid network port. Must be between 0 and 65535."; //$NON-NLS-1$
+ int mt = IMessageProvider.ERROR;
+ updateControlDecoration(fNetworkPortCombo, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fNetworkPortCombo, null, IMessageProvider.NONE);
}
+
p = Integer.parseInt(fTimeout.getText().trim());
if (p < 0) {
- return false;
+ String m = "Invalid timeout. Must be greater than 0."; //$NON-NLS-1$
+ int mt = IMessageProvider.ERROR;
+ updateControlDecoration(fTimeout, m, mt);
+ if (mt > messageType) { message = m; messageType = mt; }
+
+ valid = false;
+ } else {
+ updateControlDecoration(fTimeout, null, IMessageProvider.NONE);
}
+
} catch (Exception e) {
- return false;
+ valid = false;
}
- return true;
+
+ setMessage(message, messageType);
+ return valid;
}
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
GridLayout gridLayout = new GridLayout(2, false);
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ gridData.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
composite.setLayout(gridLayout);
composite.setLayoutData(gridData);
@@ -123,6 +160,12 @@
gridData = new GridData(GridData.FILL_HORIZONTAL);
fHostText = new Text(composite, SWT.BORDER);
fHostText.setLayoutData(gridData);
+ fHostText.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(fHostText);
+ }
+ });
+ createControlDecoration(fHostText);
// Add label
ctlLabel = new Label(composite, SWT.RIGHT);
@@ -131,8 +174,18 @@
// Add control
gridData = new GridData(GridData.FILL_HORIZONTAL);
fNetworkPortCombo = new Combo(composite, SWT.DROP_DOWN);
-
fNetworkPortCombo.setLayoutData(gridData);
+ fNetworkPortCombo.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(fNetworkPortCombo);
+ }
+ });
+ fNetworkPortCombo.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ fireListeners(fNetworkPortCombo);
+ }
+ });
+ createControlDecoration(fNetworkPortCombo);
List table = getNetworkPortMap().getNameTable();
Collections.sort(table);
@@ -141,6 +194,12 @@
new Label(composite, SWT.RIGHT).setText(TelnetMessages.TIMEOUT + ":"); //$NON-NLS-1$
fTimeout = new Text(composite, SWT.BORDER);
fTimeout.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ fTimeout.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ fireListeners(fTimeout);
+ }
+ });
+ createControlDecoration(fTimeout);
loadSettings();
}
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/feature.properties 2009-05-13 22:21:02.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Telnet Connector
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=A Telnet connector implementation for the Terminal.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/feature.xml 2009-07-10 12:45:31.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,18 @@
-
+
+
@@ -17,14 +28,14 @@
-
-
+
+
-
+
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.telnet
+ 2.1.200.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties 2009-05-13 22:21:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Telnet Connector Source
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=A Telnet connector implementation for the Terminal.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html 2008-02-13 14:04:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplateFeature/license.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini 2009-05-13 22:21:01.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties 2009-02-01 15:14:56.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties 2009-05-13 22:42:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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
@@ -8,5 +8,5 @@
# Contributors:
# Martin Oberhuber - initial API and implementation
################################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
+bin.includes = about.html, about.ini, about.mappings, about.properties, tm32.png, plugin.properties, plugin.xml, src/, META-INF/
sourcePlugin = true
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:42:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@
# Martin Oberhuber - initial API and implementation
################################################################################
pluginName=Target Management Terminal Telnet Connector Source
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.telnet-feature/sourceTemplatePlugin/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/.cvsignore 2008-04-11 19:33:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF 2009-07-10 12:48:02.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,15 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true
-Bundle-Version: 2.0.101.qualifier
+Bundle-Version: 2.2.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.junit,
- org.eclipse.tm.terminal;bundle-version="[3.0.1,3.1.0)",
+ org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)",
org.eclipse.core.runtime,
org.eclipse.ui
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.tm.internal.terminal.connector;x-internal:=true,
org.eclipse.tm.internal.terminal.emulator;x-internal:=true,
org.eclipse.tm.internal.terminal.model;x-internal:=true,
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/about.ini 2009-05-13 22:22:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/about.properties 2009-02-01 15:14:52.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2007, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2007, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2007, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/build.properties 2009-05-13 22:43:42.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2007, 2011 Wind River Systems, Inc. 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
@@ -17,7 +17,7 @@
about.properties,\
about.mappings,\
about.ini,\
- dsdp32.png,\
+ tm32.png,\
test.xml,\
about.html
javacSource=1.4
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/plugin.properties 2009-05-13 22:43:43.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2007, 2011 Wind River Systems, Inc. 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
@@ -14,4 +14,4 @@
# Michael Scharf (Wind River) - initial API and implementation
###############################################################################
pluginName = Target Management Terminal Tests
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/plugin.xml 2009-07-09 10:59:55.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,7 @@
+
+
-
+
+
-
+
+
@@ -39,13 +43,20 @@
+
+
+
+
+
+
+
+
+
-
+
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.test/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.test/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/feature.properties 2009-05-13 22:21:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal Unit Tests
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=TM Terminal Unit Tests. Includes Source.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2007, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/feature.xml 2009-05-13 22:43:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,18 @@
-
+
+
@@ -17,14 +28,14 @@
-
-
+
+
-
+
@@ -33,8 +44,7 @@
id="org.eclipse.tm.terminal.test"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -17,37 +18,37 @@
OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
-
-Applicable Licenses
-
+
+Applicable Licenses
+
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
-
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
+
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
-
-
+ Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm.features
+ org.eclipse.tm.terminal.test
+ 2.1.1.qualifier
+ eclipse-feature
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html 2008-02-13 14:01:48.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/rootfiles/notice.html 2013-02-12 20:26:45.000000000 +0000
@@ -1,13 +1,14 @@
-
-
+
+
+
-
-Eclipse.org Software User Agreement
+
+Eclipse Foundation Software User Agreement
-
+
Eclipse Foundation Software User Agreement
-March 17, 2005
+February 1, 2011
Usage Of Content
@@ -24,15 +25,15 @@
("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
For purposes of the EPL, "Program" will mean the Content.
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").
+Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+ repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").
- - Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+
- Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
and/or Fragments associated with that Feature.
- - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
+ - Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.
The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
@@ -40,14 +41,14 @@
including, but not limited to the following locations:
- - The top-level (root) directory
- - Plug-in and Fragment directories
- - Inside Plug-ins and Fragments packaged as JARs
- - Sub-directories of the directory named "src" of certain Plug-ins
- - Feature directories
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
-Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+
Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
@@ -57,23 +58,51 @@
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+ Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
+ other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
+ install, extend and update Eclipse-based products. Information about packaging Installable Software is available at http://eclipse.org/equinox/p2/repository_packaging.html
+ ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+ applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+ in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+ Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:
+
+
+ - A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
+ on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
+ product.
+ - During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+ accessed and copied to the Target Machine.
+ - Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+ Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
+ Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+ the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.
+
+
Cryptography
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties 2009-05-13 22:43:39.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.test-feature/sourceTemplatePlugin/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2011 Wind River Systems, Inc. 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,4 +9,4 @@
# Martin Oberhuber - initial API and implementation
################################################################################
pluginName=Target Management Terminal Unit Tests Source
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/.cvsignore eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/.cvsignore
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/.cvsignore 2007-02-08 23:50:28.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/.cvsignore 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF 2009-07-10 12:48:05.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF 2013-02-12 20:26:45.000000000 +0000
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true
-Bundle-Version: 2.0.101.qualifier
+Bundle-Version: 2.4.1.qualifier
Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[3.0.1,3.1.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)"
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/about.ini eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/about.ini
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/about.ini 2009-05-13 22:22:29.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/about.ini 2013-02-12 20:26:45.000000000 +0000
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
+featureImage=tm32.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/about.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/about.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/about.properties 2009-02-01 15:15:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/about.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -21,5 +21,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
+(c) Copyright Wind River Systems, Inc. and others 2003, 2012. All rights reserved.\n\
+Visit http://www.eclipse.org/tm
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/build.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/build.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/build.properties 2009-05-13 22:43:19.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/build.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2011 Wind River Systems, Inc. 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
@@ -25,7 +25,7 @@
about.ini,\
about.mappings,\
about.properties,\
- dsdp32.png,\
+ tm32.png,\
HelpContexts.xml,\
doc/,\
toc.xml,\
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html 2008-07-16 00:05:05.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html 2013-02-12 20:26:45.000000000 +0000
@@ -4,12 +4,12 @@
-
+
Terminal View Quick Reference
Legal Notice
-The material in this guide is Copyright (c) Wind River Systems, Inc. and others 2004, 2008.
+The material in this guide is Copyright (c) Wind River Systems, Inc. and others 2004, 2012.
Terms and conditions regarding the use of this guide.
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/dsdp32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/dsdp32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/plugin.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/plugin.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/plugin.properties 2009-05-13 22:43:20.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/plugin.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
##########################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -13,10 +13,9 @@
# Contributors:
# Michael Scharf (Wind River) - split into core, view and connector plugins
# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
+# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
##########################################################################
pluginName = Target Management Terminal View
-providerName = Eclipse.org - DSDP
+providerName = Eclipse TM Project
terminal.views.category.name = Terminal
terminal.views.view.name = Terminal
-terminal.views.view.font.description = The font for the terminal console.
-terminal.views.view.font.label = Terminal Console Font
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/plugin.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/plugin.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/plugin.xml 2008-07-15 21:56:58.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/plugin.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
- %terminal.views.view.font.description
-
-
-
-
-
-
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/pom.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/pom.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/pom.xml 1970-01-01 00:00:00.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/pom.xml 2013-02-12 20:26:45.000000000 +0000
@@ -0,0 +1,15 @@
+
+
+ 4.0.0
+
+ tm-parent
+ org.eclipse.tm
+ 3.8.0-SNAPSHOT
+ ../../../
+
+ org.eclipse.tm
+ org.eclipse.tm.terminal.view
+ 2.4.1.qualifier
+ eclipse-plugin
+
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java 2008-07-08 20:18:15.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalView.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -10,19 +10,33 @@
* Martin Oberhuber (Wind River) - [227537] moved actions from terminal.view to terminal plugin
* Michael Scharf (Wind River) - [172483] switch between connections
* Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button
+ * Kris De Volder (VMWare) - [392092] Extend ITerminalView API to allow programmatically opening a UI-less connector
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
+import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+
public interface ITerminalView {
/**
* Create a new terminal connection within the view.
*/
void onTerminalNewTerminal();
+
+ /**
+ * Programmatically create a new terminal connection within the view. This method
+ * does the same thing as onTerminalNewTerminal, but instead of popping up a settings
+ * dialog to allow the user fill in connection details, a connector is provided as
+ * a parameter. The connector should have all of its details pre-configured so it can
+ * be opened without requiring user input.
+ */
+ void newTerminal(ITerminalConnector c);
+
/**
- * Create a new Terminal view.
+ * Create a new Terminal view.
*/
void onTerminalNewView();
+
void onTerminalConnect();
void onTerminalDisconnect();
void onTerminalSettings();
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java 2008-07-07 20:38:03.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ITerminalViewConnection.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2012 Wind River Systems, Inc. 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
@@ -75,4 +76,13 @@
* @param summary
*/
void setSummary(String summary);
+ /**
+ * @param encoding the encoding of this connection
+ */
+ void setEncoding(String encoding);
+
+ /**
+ * @return the encoding of this connection
+ */
+ String getEncoding();
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferenceInitializer.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferenceInitializer.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferenceInitializer.java 2007-10-13 02:19:54.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferenceInitializer.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. 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
- *
- * Contributors:
- * Michael Scharf (Wind River) - initial API and implementation
- * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
- *******************************************************************************/
-package org.eclipse.tm.internal.terminal.view;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-public class TerminalPreferenceInitializer extends AbstractPreferenceInitializer {
-
- public TerminalPreferenceInitializer() {
- }
-
- public void initializeDefaultPreferences() {
- Preferences store = TerminalViewPlugin.getDefault().getPluginPreferences();
- store.setDefault(TerminalPreferencePage.PREF_LIMITOUTPUT, TerminalPreferencePage.DEFAULT_LIMITOUTPUT);
- store.setDefault(TerminalPreferencePage.PREF_INVERT_COLORS, TerminalPreferencePage.DEFAULT_INVERT_COLORS);
- store.setDefault(TerminalPreferencePage.PREF_BUFFERLINES, TerminalPreferencePage.DEFAULT_BUFFERLINES);
- store.setDefault(TerminalPreferencePage.PREF_TIMEOUT_SERIAL, TerminalPreferencePage.DEFAULT_TIMEOUT_SERIAL);
- store.setDefault(TerminalPreferencePage.PREF_TIMEOUT_NETWORK, TerminalPreferencePage.DEFAULT_TIMEOUT_NETWORK);
- }
-
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferencePage.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferencePage.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferencePage.java 2007-10-13 03:29:53.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalPreferencePage.java 1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 Wind River Systems, Inc. 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
- *
- * Initial Contributors:
- * The following Wind River employees contributed to the Terminal component
- * that contains this file: Chris Thew, Fran Litterio, Stephen Lamb,
- * Helmut Haigermoser and Ted Williams.
- *
- * Contributors:
- * Michael Scharf (Wind River) - split into core, view and connector plugins
- * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
- *******************************************************************************/
-package org.eclipse.tm.internal.terminal.view;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class TerminalPreferencePage extends FieldEditorPreferencePage implements
- IWorkbenchPreferencePage {
- public static final String PREF_LIMITOUTPUT = "TerminalPrefLimitOutput"; //$NON-NLS-1$
- public static final String PREF_BUFFERLINES = "TerminalPrefBufferLines"; //$NON-NLS-1$
- public static final String PREF_TIMEOUT_SERIAL = "TerminalPrefTimeoutSerial"; //$NON-NLS-1$
- public static final String PREF_TIMEOUT_NETWORK = "TerminalPrefTimeoutNetwork"; //$NON-NLS-1$
- public static final String PREF_INVERT_COLORS = "TerminalPrefInvertColors"; //$NON-NLS-1$
- public static final boolean DEFAULT_LIMITOUTPUT = true;
- public static final int DEFAULT_BUFFERLINES = 1000;
- public static final int DEFAULT_TIMEOUT_SERIAL = 5;
- public static final int DEFAULT_TIMEOUT_NETWORK = 5;
- public static final boolean DEFAULT_INVERT_COLORS = false;
-
-
- protected BooleanFieldEditor fInvertColors;
-
- protected IntegerFieldEditor fEditorBufferSize;
-
- protected IntegerFieldEditor fEditorSerialTimeout;
-
- protected IntegerFieldEditor fEditorNetworkTimeout;
- public TerminalPreferencePage() {
- super(GRID);
- }
- protected void createFieldEditors() {
- setupPage();
- }
- public void init(IWorkbench workbench) {
- // do nothing
- }
- protected void setupPage() {
- setupData();
- setupEditors();
- }
- protected void setupData() {
- TerminalViewPlugin plugin;
- IPreferenceStore preferenceStore;
-
- plugin = TerminalViewPlugin.getDefault();
- preferenceStore = plugin.getPreferenceStore();
- setPreferenceStore(preferenceStore);
- }
- protected void setupEditors() {
- fInvertColors = new BooleanFieldEditor(
- PREF_INVERT_COLORS, ViewMessages.INVERT_COLORS,
- getFieldEditorParent());
- fEditorBufferSize = new IntegerFieldEditor(PREF_BUFFERLINES,
- ViewMessages.BUFFERLINES, getFieldEditorParent());
- fEditorSerialTimeout = new IntegerFieldEditor(
- PREF_TIMEOUT_SERIAL, ViewMessages.SERIALTIMEOUT,
- getFieldEditorParent());
- fEditorNetworkTimeout = new IntegerFieldEditor(
- PREF_TIMEOUT_NETWORK, ViewMessages.NETWORKTIMEOUT,
- getFieldEditorParent());
-
- fEditorBufferSize.setValidRange(0, Integer.MAX_VALUE);
- fEditorSerialTimeout.setValidRange(0, Integer.MAX_VALUE);
- fEditorNetworkTimeout.setValidRange(0, Integer.MAX_VALUE);
-
- addField(fInvertColors);
- addField(fEditorBufferSize);
- addField(fEditorSerialTimeout);
- addField(fEditorNetworkTimeout);
- }
-}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java 2009-07-09 11:00:06.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalSettingsDlg.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -19,9 +19,13 @@
* Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button
* Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings
* Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point
+ * Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
+
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -51,6 +55,7 @@
import org.eclipse.ui.PlatformUI;
class TerminalSettingsDlg extends Dialog {
+ private Combo fEncodingCombo;
private Combo fCtlConnTypeCombo;
private Text fTerminalTitleText;
private final ITerminalConnector[] fConnectors;
@@ -65,6 +70,7 @@
private IDialogSettings fDialogSettings;
private String fTerminalTitle;
private String fTitle=ViewMessages.TERMINALSETTINGS;
+ private String fEncoding;
public TerminalSettingsDlg(Shell shell, ITerminalConnector[] connectors, ITerminalConnector connector) {
super(shell);
@@ -116,6 +122,8 @@
public void loadSettings() {}
public void saveSettings() {}
public boolean validateSettings() {return false;}
+ public void addListener(Listener listener) {}
+ public void removeListener(Listener listener) {}
};
} else {
fPages[i]=fConnectors[i].makeSettingsPage();
@@ -151,17 +159,18 @@
protected void okPressed() {
if (!validateSettings()) {
- String strTitle = ViewMessages.TERMINALSETTINGS;
- MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK);
- mb.setText(strTitle);
- mb.setMessage(ViewMessages.INVALID_SETTINGS);
- mb.open();
+ showErrorMessage(ViewMessages.INVALID_SETTINGS);
+ return;
+ }
+ if (!updateValidState()) {
+ showErrorMessage(ViewMessages.ENCODING_NOT_AVAILABLE);
return;
}
if(fSelectedConnector>=0) {
getPage(fSelectedConnector).saveSettings();
}
fTerminalTitle=fTerminalTitleText.getText();
+ fEncoding = fEncodingCombo.getText();
super.okPressed();
}
protected void cancelPressed() {
@@ -202,6 +211,8 @@
fCtlConnTypeCombo.select(selectedConnector);
selectPage(selectedConnector);
}
+ doLoad();
+ setCombo(fEncodingCombo, fEncoding);
}
/**
* @return the connector to show when the dialog opens
@@ -227,6 +238,7 @@
}
private void setupPanel(Composite wndParent) {
setupSettingsTypePanel(wndParent);
+ //setupEncodingPanel(wndParent);
if(fConnectors.length>0) {
setupConnTypePanel(wndParent);
setupSettingsGroup(wndParent);
@@ -250,6 +262,13 @@
fTerminalTitleText = new Text(wndGroup, SWT.BORDER);
fTerminalTitleText.setText(fTerminalTitle);
fTerminalTitleText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ Label encodingLabel=new Label(wndGroup,SWT.NONE);
+ encodingLabel.setText(ViewMessages.ENCODING);
+ encodingLabel.setLayoutData(new GridData(GridData.BEGINNING));
+
+ fEncodingCombo = new Combo(wndGroup, SWT.DROP_DOWN);
+ fEncodingCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
private void setupConnTypePanel(Composite wndParent) {
Group wndGroup;
@@ -278,6 +297,7 @@
fPageBook=new PageBook(group,SWT.NONE);
fPageBook.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
+
private void setupListeners() {
if(fCtlConnTypeCombo==null)
return;
@@ -331,4 +351,73 @@
public String getTerminalTitle() {
return fTerminalTitle;
}
+ private void doLoad() {
+ if (fEncodingCombo != null) {
+ List encodings = new ArrayList();
+ encodings.add("ISO-8859-1"); //$NON-NLS-1$
+ encodings.add("UTF-8"); //$NON-NLS-1$
+ //TODO when moving to J2SE-1.5, restore the simpler way getting the default encoding
+ //String hostEncoding =Charset.defaultCharset().displayName();
+ String hostEncoding = new java.io.InputStreamReader(new java.io.ByteArrayInputStream(new byte[0])).getEncoding();
+ if (!encodings.contains(hostEncoding))
+ encodings.add(hostEncoding);
+ populateEncodingsCombo(encodings);
+
+ }
+ }
+ private void populateEncodingsCombo(List encodings) {
+ String[] encodingStrings = new String[encodings.size()];
+ encodings.toArray(encodingStrings);
+ fEncodingCombo.setItems(encodingStrings);
+ }
+ private boolean isEncodingValid() {
+ return isValidEncoding(fEncodingCombo.getText());
+ }
+ private boolean isValidEncoding(String enc) {
+ try {
+ return Charset.isSupported(enc);
+ } catch (IllegalCharsetNameException e) {
+ return false;
+ }
+
+ }
+ private boolean updateValidState() {
+ boolean isValid = true;
+ boolean isValidNow = isEncodingValid();
+ if (isValidNow != isValid) {
+ isValid = isValidNow;
+ }
+ return isValid;
+ }
+ private void showErrorMessage(String message) {
+ String strTitle = ViewMessages.TERMINALSETTINGS;
+ MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK);
+ mb.setText(strTitle);
+ mb.setMessage(message);
+ mb.open();
+ return;
+ }
+
+ private void setCombo(Combo combo,String value) {
+ if(value==null)
+ return;
+ int nIndex = combo.indexOf(value);
+ if (nIndex == -1) {
+ if((combo.getStyle() & SWT.READ_ONLY)==0) {
+ combo.add(value);
+ nIndex = combo.indexOf(value);
+ } else {
+ return;
+ }
+ }
+
+ combo.select(nIndex);
+
+ }
+ public String getEncoding() {
+ return fEncoding;
+ }
+ public void setEncoding(String fEncoding) {
+ this.fEncoding = fEncoding;
+ }
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java 2009-02-01 12:40:14.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -22,15 +22,18 @@
* Michael Scharf (Wind River) - [172483] switch between connections
* Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button
* Michael Scharf (Wind River) - [196454] Initial connection settings dialog should not be blank
- * Michael Scharf (Wind River) - [241096] Secondary terminals in same view do not observe the "invert colors" Preference
+ * Michael Scharf (Wind River) - [241096] Secondary terminals in same view do not observe the "invert colors" Preference
* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
+ * Martin Oberhuber (Wind River) - [205486] Enable ScrollLock
+ * Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
+ * Kris De Volder (VMWare) - [392092] Extend ITerminalView API to allow programmatically opening a UI-less connector
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.core.runtime.Preferences;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -44,7 +47,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MenuEvent;
import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -54,6 +56,7 @@
import org.eclipse.tm.internal.terminal.actions.TerminalActionDisconnect;
import org.eclipse.tm.internal.terminal.actions.TerminalActionNewTerminal;
import org.eclipse.tm.internal.terminal.actions.TerminalActionRemove;
+import org.eclipse.tm.internal.terminal.actions.TerminalActionScrollLock;
import org.eclipse.tm.internal.terminal.actions.TerminalActionSelectionDropDown;
import org.eclipse.tm.internal.terminal.actions.TerminalActionSettings;
import org.eclipse.tm.internal.terminal.actions.TerminalActionToggleCommandInputField;
@@ -65,6 +68,7 @@
import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCut;
import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste;
import org.eclipse.tm.internal.terminal.control.actions.TerminalActionSelectAll;
+import org.eclipse.tm.internal.terminal.preferences.ITerminalConstants;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
import org.eclipse.tm.internal.terminal.provisional.api.LayeredSettingsStore;
@@ -89,22 +93,22 @@
private static final String STORE_CONNECTION_TYPE = "ConnectionType"; //$NON-NLS-1$
private static final String STORE_SETTING_SUMMARY = "SettingSummary"; //$NON-NLS-1$
-
+
private static final String STORE_TITLE = "Title"; //$NON-NLS-1$
- public static final String FONT_DEFINITION = "terminal.views.view.font.definition"; //$NON-NLS-1$
+ public static final String FONT_DEFINITION = ITerminalConstants.FONT_DEFINITION;
protected ITerminalViewControl fCtlTerminal;
// TODO (scharf): this decorator is only there to deal wit the common
// actions. Find a better solution.
TerminalViewControlDecorator fCtlDecorator=new TerminalViewControlDecorator();
-
+
protected TerminalAction fActionTerminalNewTerminal;
protected TerminalAction fActionTerminalConnect;
-// private TerminalAction fActionTerminalScrollLock;
+ private TerminalAction fActionTerminalScrollLock;
protected TerminalAction fActionTerminalDisconnect;
@@ -132,23 +136,11 @@
private SettingsStore fStore;
private final ITerminalViewConnectionManager fMultiConnectionManager=new TerminalViewConnectionManager();
- /**
- * Listens to changes in the preferences
- */
- private final IPropertyChangeListener fPreferenceListener=new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
- if(event.getProperty().equals(TerminalPreferencePage.PREF_LIMITOUTPUT)
- || event.getProperty().equals(TerminalPreferencePage.PREF_BUFFERLINES)
- || event.getProperty().equals(TerminalPreferencePage.PREF_INVERT_COLORS)) {
- updatePreferences();
- }
- }
- };
private PageBook fPageBook;
/**
- * This listener updates both, the view and the
+ * This listener updates both, the view and the
* ITerminalViewConnection.
*
*/
@@ -189,9 +181,9 @@
PlatformUI.getWorkbench().getDisplay().syncExec(runnable);
// else should not happen and we ignore it...
}
-
+
}
-
+
public TerminalView() {
Logger
.log("==============================================================="); //$NON-NLS-1$
@@ -227,23 +219,7 @@
uniqueTitle=title+" "+i++; //$NON-NLS-1$
}
}
- /**
- * Update the text limits from the preferences
- */
- private void updatePreferences() {
- Preferences preferences = TerminalViewPlugin.getDefault().getPluginPreferences();
-// boolean limitOutput = preferences.getBoolean(TerminalPreferencePage.PREF_LIMITOUTPUT);
-// if(!limitOutput)
-// bufferLineLimit=-1;
- int bufferLineLimit = preferences.getInt(TerminalPreferencePage.PREF_BUFFERLINES);
- boolean invert=preferences.getBoolean(TerminalPreferencePage.PREF_INVERT_COLORS);
- // update the preferences for all controls
- ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
- for (int i = 0; i < conn.length; i++) {
- conn[i].getCtlTerminal().setBufferLineLimit(bufferLineLimit);
- conn[i].getCtlTerminal().setInvertedColors(invert);
- }
- }
+
/**
* Display a new Terminal view. This method is called when the user clicks the New
* Terminal button in any Terminal view's toolbar.
@@ -256,6 +232,21 @@
}
}
+ /**
+ * Programmatically create a new terminal connection within the view. This method
+ * does the same thing as onTerminalNewTerminal, but instead of popping up a settings
+ * dialog to allow the user fill in connection details, a connector is provided as
+ * a parameter. The connector should have all of its details pre-configured so it can
+ * be opened without requiring user input.
+ */
+ public void newTerminal(ITerminalConnector c) {
+ this.setupControls();
+ if(c!=null) {
+ this.setConnector(c);
+ this.onTerminalConnect();
+ }
+ }
+
public void onTerminalNewView() {
try {
// The second argument to showView() is a unique String identifying the
@@ -282,13 +273,14 @@
}
}
-
+
public void onTerminalConnect() {
//if (isConnected())
if (fCtlTerminal.getState()!=TerminalState.CLOSED)
return;
if(fCtlTerminal.getTerminalConnector()==null)
setConnector(showSettingsDialog(ViewMessages.TERMINALSETTINGS));
+ setEncoding(getActiveConnection().getEncoding());
fCtlTerminal.connectTerminal();
}
@@ -297,6 +289,7 @@
updateTerminalDisconnect();
updateTerminalSettings();
fActionToggleCommandInputField.setChecked(hasCommandInputField());
+ fActionTerminalScrollLock.setChecked(isScrollLock());
updateSummary();
}
@@ -343,11 +336,12 @@
// load the state from the settings
// first load from fStore and then from the preferences.
ITerminalConnector c = loadSettings(new LayeredSettingsStore(fStore,getPreferenceSettingsStore()), connectors);
- // if we have no connector show the one from the settings
+ // if we have no connector show the one from the settings
if(fCtlTerminal.getTerminalConnector()!=null)
c=fCtlTerminal.getTerminalConnector();
TerminalSettingsDlg dlgTerminalSettings = new TerminalSettingsDlg(getViewSite().getShell(),connectors,c);
dlgTerminalSettings.setTerminalTitle(getActiveConnection().getPartName());
+ dlgTerminalSettings.setEncoding(getActiveConnection().getEncoding());
if(title!=null)
dlgTerminalSettings.setTitle(title);
Logger.log("opening Settings dialog."); //$NON-NLS-1$
@@ -366,9 +360,15 @@
saveSettings(getPreferenceSettingsStore(), dlgTerminalSettings.getConnector());
setViewTitle(dlgTerminalSettings.getTerminalTitle());
+ setEncoding(dlgTerminalSettings.getEncoding());
return dlgTerminalSettings.getConnector();
}
+ private void setEncoding(String encoding) {
+ getActiveConnection().setEncoding(encoding);
+ updateSummary();
+ }
+
private void setConnector(ITerminalConnector connector) {
fCtlTerminal.setConnector(connector);
}
@@ -385,19 +385,14 @@
getViewSite().getActionBars().getStatusLineManager().setMessage(
summary);
setTitleToolTip(getPartName()+": "+summary); //$NON-NLS-1$
-
+
}
public void updateSummary() {
setViewSummary(getActiveConnection().getFullSummary());
}
public void onTerminalFontChanged() {
- // set the font for all
- Font font=JFaceResources.getFont(FONT_DEFINITION);
- ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
- for (int i = 0; i < conn.length; i++) {
- conn[i].getCtlTerminal().setFont(font);
- }
+ // set the font for all - empty hook for extenders
}
// ViewPart interface
@@ -436,8 +431,6 @@
legacyLoadState();
legacySetTitle();
- // make sure we take the values defined in the preferences
- updatePreferences();
refresh();
onTerminalFontChanged();
@@ -447,10 +440,8 @@
public void dispose() {
Logger.log("entered."); //$NON-NLS-1$
- TerminalViewPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPreferenceListener);
-
JFaceResources.getFontRegistry().removeListener(fPropertyChangeHandler);
-
+
// dispose all connections
ITerminalViewConnection[] conn=fMultiConnectionManager.getConnections();
for (int i = 0; i < conn.length; i++) {
@@ -473,14 +464,12 @@
fMultiConnectionManager.addConnection(conn);
fMultiConnectionManager.setActiveConnection(conn);
setupContextMenus(fCtlTerminal.getControl());
- // make sure we take the values defined in the preferences
- updatePreferences();
}
private ITerminalViewConnection makeViewConnection() {
ITerminalConnector[] connectors = makeConnectors();
TerminalListener listener=new TerminalListener();
- ITerminalViewControl ctrl = TerminalViewControlFactory.makeControl(listener, fPageBook, connectors);
+ ITerminalViewControl ctrl = TerminalViewControlFactory.makeControl(listener, fPageBook, connectors, true);
setTerminalControl(ctrl);
ITerminalViewConnection conn = new TerminalViewConnection(fCtlTerminal);
listener.setConnection(conn);
@@ -490,8 +479,6 @@
// set the connector....
ctrl.setConnector(connector);
- TerminalViewPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPreferenceListener);
-
return conn;
}
@@ -521,9 +508,9 @@
/**
* The preference setting store is used to save the settings that are
- * shared between all views.
+ * shared between all views.
* @return the settings store for the connection based on the preferences.
- *
+ *
*/
private PreferenceSettingStore getPreferenceSettingsStore() {
return new PreferenceSettingStore(TerminalViewPlugin.getDefault().getPluginPreferences(),PREF_CONNECTORS);
@@ -538,7 +525,7 @@
// the last saved connector becomes the default
store.put(STORE_CONNECTION_TYPE,connector.getId());
}
-
+
}
public void init(IViewSite site, IMemento memento) throws PartInitException {
super.init(site, memento);
@@ -558,7 +545,7 @@
fActionTerminalDropDown = new TerminalActionSelectionDropDown(fMultiConnectionManager);
fActionTerminalRemove=new TerminalActionRemove(fMultiConnectionManager);
fActionTerminalNewTerminal = new TerminalActionNewTerminal(this);
-// fActionTerminalScrollLock = new TerminalActionScrollLock(this);
+ fActionTerminalScrollLock = new TerminalActionScrollLock(this);
fActionTerminalConnect = new TerminalActionConnect(this);
fActionTerminalDisconnect = new TerminalActionDisconnect(this);
fActionTerminalSettings = new TerminalActionSettings(this);
@@ -572,11 +559,11 @@
protected void setupLocalToolBars() {
IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();
-// toolBarMgr.add(fActionTerminalScrollLock);
toolBarMgr.add(fActionTerminalConnect);
toolBarMgr.add(fActionTerminalDisconnect);
toolBarMgr.add(fActionTerminalSettings);
toolBarMgr.add(fActionToggleCommandInputField);
+ toolBarMgr.add(fActionTerminalScrollLock);
toolBarMgr.add(new Separator("fixedGroup")); //$NON-NLS-1$
toolBarMgr.add(fActionTerminalDropDown);
toolBarMgr.add(fActionTerminalNewTerminal);
@@ -606,7 +593,7 @@
menuMgr.add(fActionEditSelectAll);
menuMgr.add(new Separator());
menuMgr.add(fActionToggleCommandInputField);
-// menuMgr.add(fActionTerminalScrollLock);
+ menuMgr.add(fActionTerminalScrollLock);
// Other plug-ins can contribute there actions here
@@ -679,7 +666,7 @@
setTerminalControl(ctrl);
refresh();
}
- }
+ }
}
/**
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java 2009-02-01 12:40:14.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2012 Wind River Systems, Inc. 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,19 +9,25 @@
* Michael Scharf (Wind River) - initial API and implementation
* Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button
* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
+ * Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
+ * Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
*******************************************************************************/
-/**
- *
- */
package org.eclipse.tm.internal.terminal.view;
+import java.io.UnsupportedEncodingException;
+
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
import org.eclipse.tm.internal.terminal.control.ITerminalViewControl;
import org.eclipse.tm.internal.terminal.provisional.api.ISettingsStore;
import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector;
+import org.eclipse.tm.internal.terminal.provisional.api.Logger;
import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
/**
@@ -35,22 +41,32 @@
private static final String STORE_CONNECTION_TYPE = "ConnectionType"; //$NON-NLS-1$
private static final String STORE_HAS_COMMAND_INPUT_FIELD = "HasCommandInputField"; //$NON-NLS-1$
private static final String STORE_COMMAND_INPUT_FIELD_HISTORY = "CommandInputFieldHistory"; //$NON-NLS-1$
-
+ private static final String STORE_ENCODING="Encoding"; //$NON-NLS-1$
final private ITerminalViewControl fCtlTerminal;
private String fTitle;
private String fSummary;
private String fHistory;
private CommandInputFieldWithHistory fCommandInputField;
private String fPartName;
-
+ private String fEncoding;
+
public TerminalViewConnection(ITerminalViewControl ctl) {
fCtlTerminal = ctl;
fCtlTerminal.getControl().addMouseListener(new MouseAdapter(){
- public void mouseUp(MouseEvent e) {
+ public void mouseDown(MouseEvent e) {
// paste when the middle button is clicked
- if(e.button==2) // middle button
- fCtlTerminal.paste();
- }});
+ if (e.button == 2) { // middle button
+ int clipboardType = DND.SELECTION_CLIPBOARD;
+ Clipboard clipboard = fCtlTerminal.getClipboard();
+ if (clipboard.getAvailableTypes(clipboardType).length == 0)
+ // use normal clipboard if selection clipboard is not available
+ clipboardType = DND.CLIPBOARD;
+ String text = (String) clipboard.getContents(TextTransfer.getInstance(), clipboardType);
+ if (text != null && text.length() > 0)
+ fCtlTerminal.pasteString(text);
+ }
+ }
+ });
}
/* (non-Javadoc)
@@ -80,7 +96,7 @@
fPartName=store.get(STORE_PART_NAME);
fSummary=store.get(STORE_SUMMARY);
fHistory=store.get(STORE_COMMAND_INPUT_FIELD_HISTORY);
-
+ fEncoding=store.get(STORE_ENCODING);
// load the state of the connection types
ITerminalConnector[] connectors=fCtlTerminal.getConnectors();
String connectionType=store.get(STORE_CONNECTION_TYPE);
@@ -99,6 +115,7 @@
store.put(STORE_PART_NAME, fPartName);
store.put(STORE_SUMMARY,fSummary);
store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fHistory);
+ store.put(STORE_ENCODING, fEncoding);
if(fCommandInputField!=null)
store.put(STORE_COMMAND_INPUT_FIELD_HISTORY, fCommandInputField.getHistory());
else
@@ -163,6 +180,7 @@
// display in the content description line.
String strConnected = getStateDisplayName(fCtlTerminal.getState());
String summary = getSettingsSummary();
+ String encoding=getEncoding();
//TODO Title should use an NLS String and com.ibm.icu.MessageFormat
//In order to make the logic of assembling, and the separators, better adapt to foreign languages
if(summary.length()>0)
@@ -171,7 +189,11 @@
if(name.length()>0) {
name+=": "; //$NON-NLS-1$
}
- strTitle = name + "("+ summary + strConnected + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ if (encoding.length()>0) {
+ encoding = NLS.bind(ViewMessages.ENCODING_WITH_PARENTHESES, encoding);
+ //encoding=ViewMessages.ENCODING+" "+"("+encoding+")"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ }
+ strTitle = name + "("+ summary + strConnected + ")"+" - "+encoding; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return strTitle;
}
@@ -199,5 +221,17 @@
fPartName=name;
}
+ public String getEncoding() {
+ return fEncoding==null?fCtlTerminal.getEncoding():fEncoding;
+ }
+ public void setEncoding(String fEncoding) {
+ try {
+ fCtlTerminal.setEncoding(fEncoding);
+ this.fEncoding = fEncoding;
+ } catch (UnsupportedEncodingException uex) {
+ Logger.logException(uex);
+ }
+
+ }
}
\ No newline at end of file
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java 2008-07-08 16:28:33.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewControlDecorator.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008, 2012 Wind River Systems, Inc. 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Michael Scharf (Wind River) - initial API and implementation
+ * Martin Oberhuber (Wind River) - [265352][api] Allow setting fonts programmatically
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
@@ -149,6 +150,10 @@
fViewContoler.setFont(font);
}
+ public void setFont(String fontName) {
+ fViewContoler.setFont(fontName);
+ }
+
public void setInvertedColors(boolean invert) {
fViewContoler.setInvertedColors(invert);
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java 2009-02-01 12:40:14.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.java 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -16,6 +16,8 @@
* Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button
* Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings
* Martin Oberhuber (Wind River) - [262996] get rid of TerminalState.OPENED
+ * Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
+ * Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
*******************************************************************************/
package org.eclipse.tm.internal.terminal.view;
@@ -36,11 +38,8 @@
public static String VIEW_TITLE;
public static String VIEW_SETTINGS;
public static String INVALID_SETTINGS;
-
- public static String INVERT_COLORS;
- public static String BUFFERLINES;
- public static String SERIALTIMEOUT;
- public static String NETWORKTIMEOUT;
+ public static String ENCODING;
+ public static String ENCODING_WITH_PARENTHESES;
public static String STATE_CONNECTED;
public static String STATE_CONNECTING;
@@ -48,5 +47,5 @@
public static String CANNOT_INITIALIZE;
public static String CONNECTOR_NOT_AVAILABLE;
-
+ public static String ENCODING_NOT_AVAILABLE;
}
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties 2009-02-01 12:40:14.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/ViewMessages.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012 Wind River Systems, Inc. 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
@@ -16,6 +16,8 @@
# Michael Scharf (Wind River) - [240023] Get rid of the terminal's "Pin" button
# Martin Oberhuber (Wind River) - [206917] Add validation for Terminal Settings
# Martin Oberhuber (Wind River) - [262996] get rid of TerminalState.OPENED
+# Ahmet Alptekin (Tubitak) - [244405] Add a UI Control for setting the Terminal's encoding
+# Martin Oberhuber (Wind River) - [378691][api] push Preferences into the Widget
###############################################################################
NO_CONNECTION_SELECTED = No Connection Selected
PROP_TITLE = Terminal
@@ -28,15 +30,13 @@
VIEW_TITLE = View Title:
VIEW_SETTINGS = View Settings:
INVALID_SETTINGS = The specified settings are invalid, please review or cancel.
-
-INVERT_COLORS = Invert terminal colors
-BUFFERLINES = Terminal buffer lines:
-SERIALTIMEOUT = Serial timeout (seconds):
-NETWORKTIMEOUT = Network timeout (seconds):
+ENCODING = Encoding:
+ENCODING_WITH_PARENTHESES = Encoding: ({0})
STATE_CONNECTED = CONNECTED
STATE_CONNECTING = CONNECTING...
STATE_CLOSED = CLOSED
CANNOT_INITIALIZE = Cannot initialize {0}:\n{1}
-CONNECTOR_NOT_AVAILABLE = Connector {0} not available!
+CONNECTOR_NOT_AVAILABLE = Connector {0} is not available!
+ENCODING_NOT_AVAILABLE = Encoding is not available!
\ No newline at end of file
Binary files /tmp/0BBfBDFTtF/eclipse-rse-3.1.2/org.eclipse.tm.terminal.view/tm32.png and /tmp/vOjMoYHP4e/eclipse-rse-3.4.2/org.eclipse.tm.terminal.view/tm32.png differ
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view-feature/feature.properties eclipse-rse-3.4.2/org.eclipse.tm.terminal.view-feature/feature.properties
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view-feature/feature.properties 2009-05-13 22:22:04.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view-feature/feature.properties 2013-02-12 20:26:45.000000000 +0000
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2012 Wind River Systems, Inc. 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
@@ -18,17 +18,17 @@
featureName=Target Management Terminal View
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org - DSDP
+providerName=Eclipse TM Project
# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management Updates
+tmUpdateSiteName=Target Management 3.4 Updates
# "description" property - description of the feature
description=An Eclipse Workbench standalone view for the Terminal widget.
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.\n\
+Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
@@ -42,8 +42,8 @@
# "license" property - text of the "Feature Update License"
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
+Eclipse Foundation Software User Agreement\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -51,42 +51,38 @@
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+Unless otherwise indicated, all Content made available by the\n\
+Eclipse Foundation is provided to you under the terms and conditions of\n\
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
+documentation and other files maintained in the Eclipse Foundation source code\n\
+repository ("Repository") in software modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
@@ -95,47 +91,78 @@
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
+Update License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
+the "license" property of files named "feature.properties" found within a Feature.\n\
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
+terms and conditions (or references to such terms and conditions) that\n\
+govern your use of the associated Content in that directory.\n\
\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
+\n\Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which include,\n\
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
+the purpose of allowing users to install software, documentation, information and/or\n\
+other materials (collectively "Installable Software"). This capability is provided with\n\
+the intent of allowing such users to install, extend and update Eclipse-based products.\n\
+Information about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install Installable Software.\n\
+You shall be responsible for enabling the applicable license agreements relating to the\n\
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
+making it available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the following:\n\
+\n\
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
+ extending or updating the functionality of an Eclipse-based product.\n\
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
+ govern the use of the Installable Software ("Installable Software Agreement") and such\n\
+ Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
+ with the Specification. Such Installable Software Agreement must inform the user of the\n\
+ terms and conditions that govern the Installable Software and must solicit acceptance by\n\
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
+ indication of agreement by the user, the provisioning Technology will complete installation\n\
+ of the Installable Software.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
+regulations and policies concerning the import, possession, or use, and\n\
+re-export of encryption software, to see if this is permitted.\n\
\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
########### end of license property ##########################################
diff -Nru eclipse-rse-3.1.2/org.eclipse.tm.terminal.view-feature/feature.xml eclipse-rse-3.4.2/org.eclipse.tm.terminal.view-feature/feature.xml
--- eclipse-rse-3.1.2/org.eclipse.tm.terminal.view-feature/feature.xml 2009-07-09 16:46:51.000000000 +0000
+++ eclipse-rse-3.4.2/org.eclipse.tm.terminal.view-feature/feature.xml 2013-02-12 20:26:45.000000000 +0000
@@ -1,6 +1,6 @@